diff --git a/public/locales/en.json b/public/locales/en.json index 5900e8f1b..83228ec1b 100755 --- a/public/locales/en.json +++ b/public/locales/en.json @@ -901,5 +901,7 @@ "last24hours": "Last 24 hours", "liquidityhubvolumesincelaunch": "*Quickswap liquidity hub volume since launch.", "mainnets": "Mainnets", - "testnets": "Testnets" + "testnets": "Testnets", + "currentApr": "Current APR", + "7dayApr": "7 Day APR" } diff --git a/src/constants/index.ts b/src/constants/index.ts index 997155844..055700c42 100755 --- a/src/constants/index.ts +++ b/src/constants/index.ts @@ -275,6 +275,7 @@ export const GlobalConst = { tvl: '2', rewards: '3', apr: '4', + sevendayApr: '5' }, v3FarmFilter: { allFarms: '0', diff --git a/src/pages/FarmPage/V3/AllMerklFarms.tsx b/src/pages/FarmPage/V3/AllMerklFarms.tsx index c7b74a09b..f595b814c 100644 --- a/src/pages/FarmPage/V3/AllMerklFarms.tsx +++ b/src/pages/FarmPage/V3/AllMerklFarms.tsx @@ -65,19 +65,25 @@ const AllMerklFarms: React.FC = ({ searchValue, farmStatus }) => { { text: t('pool'), index: GlobalConst.utils.v3FarmSortBy.pool, - width: 0.3, + width: 0.25, justify: 'flex-start', }, { text: t('tvl'), index: GlobalConst.utils.v3FarmSortBy.tvl, - width: 0.2, + width: 0.15, justify: 'flex-start', }, { - text: t('apr'), + text: t('currentApr'), index: GlobalConst.utils.v3FarmSortBy.apr, - width: 0.2, + width: 0.15, + justify: 'flex-start', + }, + { + text: t('7dayApr'), + index: GlobalConst.utils.v3FarmSortBy.sevendayApr, + width: 0.15, justify: 'flex-start', }, { @@ -219,6 +225,9 @@ const AllMerklFarms: React.FC = ({ searchValue, farmStatus }) => { if (sortBy === GlobalConst.utils.v3FarmSortBy.apr) { return farm1.apr > farm2.apr ? sortMultiplier : -1 * sortMultiplier; } + if (sortBy === GlobalConst.utils.v3FarmSortBy.sevendayApr) { + return farm1.apr > farm2.apr ? sortMultiplier : -1 * sortMultiplier; + } if (sortBy === GlobalConst.utils.v3FarmSortBy.rewards) { return farm1.dailyRewardUSD > farm2.dailyRewardUSD ? sortMultiplier diff --git a/src/pages/FarmPage/V3/MerklFarmCard.tsx b/src/pages/FarmPage/V3/MerklFarmCard.tsx index 942ca8ded..ed6414ed2 100644 --- a/src/pages/FarmPage/V3/MerklFarmCard.tsx +++ b/src/pages/FarmPage/V3/MerklFarmCard.tsx @@ -94,7 +94,7 @@ export const MerklFarmCard: React.FC = ({ farm }) => { className='flex items-center flex-wrap' > @@ -117,14 +117,35 @@ export const MerklFarmCard: React.FC = ({ farm }) => { {isMobile &&

{t('tvl')}

}

${formatNumber(farm.tvl)}

+ {isMobile &&

{t('apr')}

} + + {t('upTo')} + + + +

{formatNumber(farm.apr)}%

+ +
+
+
+
+
+ {isMobile &&

{t('apr')}

}