diff --git a/src/components/AreaChart/AreaChart.tsx b/src/components/AreaChart/AreaChart.tsx index 6add2bfe2..c915449e1 100644 --- a/src/components/AreaChart/AreaChart.tsx +++ b/src/components/AreaChart/AreaChart.tsx @@ -141,34 +141,41 @@ const AreaChart: React.FC = ({ ]; return ( - - - - - {categories.map((val, ind) => ( -

{val}

- ))} -
-
- {yAxisValues && ( - - {yAxisValues.map((value, index) => ( -

- {// this is to show small numbers less than 0.0001 + + + {yAxisValues && ( + + {yAxisValues.map((value, index) => ( +

+ {// this is to show small numbers less than 0.0001 - `${yAxisTicker === '$' ? yAxisTicker : ''}${ - value > 0.0001 ? formatCompact(value) : formatNumber(value) - }${yAxisTicker === '%' ? yAxisTicker : ''}`} -

- ))} + `${yAxisTicker === '$' ? yAxisTicker : ''}${ + value > 0.0001 ? formatCompact(value) : formatNumber(value) + }${yAxisTicker === '%' ? yAxisTicker : ''}`} +

+ ))} +
+ )} + + + + {categories.map((val, ind) => ( +

{val}

+ ))} +
- )} +
); }; diff --git a/src/components/BarChart/BarChart.tsx b/src/components/BarChart/BarChart.tsx index 73ced2eed..40e8a27d6 100755 --- a/src/components/BarChart/BarChart.tsx +++ b/src/components/BarChart/BarChart.tsx @@ -20,9 +20,17 @@ const BarChart: React.FC = ({ onMouseLeave, }) => { const maxValue = Math.max(...data); + const areaWidth = + categories && categories.length > 12 + ? 23 * categories.length + 'px' + : '100%'; + console.log('areaWidth', areaWidth); return ( - - + + {data.map((value, index) => ( = ({ ))} {categories && data.length > 0 && ( - + {categories.map((val, ind) => (

{val}

))} diff --git a/src/components/Header/Header.tsx b/src/components/Header/Header.tsx index 211884dc1..0b1a2ab90 100644 --- a/src/components/Header/Header.tsx +++ b/src/components/Header/Header.tsx @@ -259,11 +259,14 @@ const Header: React.FC<{ onUpdateNewsletter: (val: boolean) => void }> = ({ id: 'dragons-page-link', }); } - menuItems.push({ - link: '/bridge', - text: t('Bridge'), - id: 'bridge-page-link', - }); + + if (isSupportedNetwork) + menuItems.push({ + link: '/bridge', + text: t('Bridge'), + id: 'bridge-page-link', + }); + if (showGamingHub) { menuItems.push({ link: '/gamehub', diff --git a/src/components/styles/AreaChart.scss b/src/components/styles/AreaChart.scss index 8182c89ee..2c097de52 100644 --- a/src/components/styles/AreaChart.scss +++ b/src/components/styles/AreaChart.scss @@ -1,4 +1,12 @@ @use 'styles/variables' as *; +@use "styles/breakpoints" as *; + +.areaChartContainer { + display: flex; + overflow-y: hidden; + overflow-x: hidden; + overflow-x: auto; +} .chartContainer { flex: 1; @@ -9,8 +17,8 @@ display: flex; flex-direction: column; justify-content: space-between; - margin-left: 8px; - margin-bottom: 20px; + margin-right: 8px; + margin-bottom: 32px; & p { font-size: 10px; font-weight: 500; diff --git a/src/pages/BondsPage/BondActions.tsx b/src/pages/BondsPage/BondActions.tsx index ea8d151b1..20b60904f 100644 --- a/src/pages/BondsPage/BondActions.tsx +++ b/src/pages/BondsPage/BondActions.tsx @@ -33,7 +33,11 @@ const BondActions: React.FC = ({ const getBillActionButton = () => { switch (true) { case !account: - return ; + return ( + + ); case purchasePath === PurchasePath.LpPurchase: return ( = ({ search }) => { return ( {showSort && ( - + = ({ const v3Farms = farms .map((item: any) => { - const apr = item.meanAPR; + // const apr = item.meanAPR; + const apr = Math.max( + ...item.alm.map((item_farm) => item_farm.poolAPR + item_farm.almAPR), + ); const title = (item.symbolToken0 ?? '') + (item.symbolToken1 ?? ''); // const rewardItems: any[] = (item?.distributionData ?? []).filter( // (reward: any) => reward.isLive && !reward.isMock, diff --git a/src/pages/styles/bonds.scss b/src/pages/styles/bonds.scss index 03b343035..6f1101521 100644 --- a/src/pages/styles/bonds.scss +++ b/src/pages/styles/bonds.scss @@ -40,7 +40,7 @@ .bondModalWrapper { padding: 16px; max-width: 1136px; - overflow: visible; + overflow: auto; } .bondModalClose { @@ -247,3 +247,17 @@ border-radius: 12px; } } + +.sortBondList { + @include media('screen', '