From 7b58e9ce6d6a42773800bee15ccd6cf23f989d36 Mon Sep 17 00:00:00 2001
From: saml33 {t('today')}
{t('today')}
{t('today')}
{title}
++ {title} +
{mouseData ? (+
{dayjs(mouseData[xKey]).format('DD MMM YY, h:mma')}
+
{dayjs(data[data.length - 1][xKey]).format(
'DD MMM YY, h:mma'
)}
@@ -248,6 +290,7 @@ const DetailedAreaChart: FunctionComponent
{bank?.uiPrice ? formatFixedDecimals(bank.uiPrice, true) : '-'}
@@ -169,7 +169,7 @@ const MobileSpotMarketItem = ({ market }: { market: Serum3Market }) => {
@@ -227,7 +227,7 @@ const SwapTokenChart = () => {
-
diff --git a/components/trade/AdvancedMarketHeader.tsx b/components/trade/AdvancedMarketHeader.tsx index 7b45e34c..605f68ef 100644 --- a/components/trade/AdvancedMarketHeader.tsx +++ b/components/trade/AdvancedMarketHeader.tsx @@ -51,7 +51,7 @@ const AdvancedMarketHeader = () => {
{t('total-deposits')}
-- {formatFixedDecimals(bank.uiDeposits())} -
-{t('token:total-value')}
-- {formatFixedDecimals(bank.uiDeposits() * bank.uiPrice, true)} -
-{t('deposit-rate')}
-- {formatDecimal(bank.getDepositRateUi(), 2, { - fixed: true, - })} - % -
+{t('total-borrows')}
-- {formatFixedDecimals(bank.uiBorrows())} -
-{t('token:total-value')}
-- {formatFixedDecimals(bank.uiBorrows() * bank.uiPrice, true)} -
-{t('borrow-rate')}
-- {formatDecimal(bank.getBorrowRateUi(), 2, { - fixed: true, - })} - % -
+{dayjs(ath_date.usd).format('MMM, D, YYYY')} ( @@ -461,14 +537,14 @@ const Token: NextPage = () => {
{t('token:all-time-low')}
{dayjs(atl_date.usd).format('MMM, D, YYYY')} ( @@ -477,7 +553,7 @@ const Token: NextPage = () => {
{t('token:fdv')}
@@ -500,7 +576,7 @@ const Token: NextPage = () => {{t('token:total-supply')}
diff --git a/public/locales/en/token.json b/public/locales/en/token.json index 617820ee..db1c6a5b 100644 --- a/public/locales/en/token.json +++ b/public/locales/en/token.json @@ -2,8 +2,12 @@ "all-time-high": "All-time High", "all-time-low": "All-time Low", "borrowing": "Borrowing", + "borrows": "Borrows", + "borrow-rates": "Borrow Rates", "chart-unavailable": "Chart Unavailable", "circulating-supply": "Circulating Supply", + "deposits": "Deposits", + "deposit-rates": "Deposit Rates", "fdv": "Fully Diluted Value", "go-to-account": "Go To Account", "lending": "Lending", diff --git a/public/locales/es/token.json b/public/locales/es/token.json index 617820ee..db1c6a5b 100644 --- a/public/locales/es/token.json +++ b/public/locales/es/token.json @@ -2,8 +2,12 @@ "all-time-high": "All-time High", "all-time-low": "All-time Low", "borrowing": "Borrowing", + "borrows": "Borrows", + "borrow-rates": "Borrow Rates", "chart-unavailable": "Chart Unavailable", "circulating-supply": "Circulating Supply", + "deposits": "Deposits", + "deposit-rates": "Deposit Rates", "fdv": "Fully Diluted Value", "go-to-account": "Go To Account", "lending": "Lending", diff --git a/public/locales/ru/token.json b/public/locales/ru/token.json index 617820ee..db1c6a5b 100644 --- a/public/locales/ru/token.json +++ b/public/locales/ru/token.json @@ -2,8 +2,12 @@ "all-time-high": "All-time High", "all-time-low": "All-time Low", "borrowing": "Borrowing", + "borrows": "Borrows", + "borrow-rates": "Borrow Rates", "chart-unavailable": "Chart Unavailable", "circulating-supply": "Circulating Supply", + "deposits": "Deposits", + "deposit-rates": "Deposit Rates", "fdv": "Fully Diluted Value", "go-to-account": "Go To Account", "lending": "Lending", diff --git a/public/locales/zh/token.json b/public/locales/zh/token.json index 617820ee..db1c6a5b 100644 --- a/public/locales/zh/token.json +++ b/public/locales/zh/token.json @@ -2,8 +2,12 @@ "all-time-high": "All-time High", "all-time-low": "All-time Low", "borrowing": "Borrowing", + "borrows": "Borrows", + "borrow-rates": "Borrow Rates", "chart-unavailable": "Chart Unavailable", "circulating-supply": "Circulating Supply", + "deposits": "Deposits", + "deposit-rates": "Deposit Rates", "fdv": "Fully Diluted Value", "go-to-account": "Go To Account", "lending": "Lending", diff --git a/public/locales/zh_tw/token.json b/public/locales/zh_tw/token.json index 617820ee..db1c6a5b 100644 --- a/public/locales/zh_tw/token.json +++ b/public/locales/zh_tw/token.json @@ -2,8 +2,12 @@ "all-time-high": "All-time High", "all-time-low": "All-time Low", "borrowing": "Borrowing", + "borrows": "Borrows", + "borrow-rates": "Borrow Rates", "chart-unavailable": "Chart Unavailable", "circulating-supply": "Circulating Supply", + "deposits": "Deposits", + "deposit-rates": "Deposit Rates", "fdv": "Fully Diluted Value", "go-to-account": "Go To Account", "lending": "Lending", diff --git a/tailwind.config.js b/tailwind.config.js index 4a30a7cf..14665d48 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -253,7 +253,7 @@ module.exports = { }, button: { DEFAULT: 'hsl(156, 55%, 26%)', - hover: 'hsl(202, 5%, 40%)', + hover: 'hsl(156, 55%, 21%)', }, link: { DEFAULT: 'hsl(31, 100%, 57%)', hover: 'hsl(31, 100%, 42%)' }, down: {