Skip to content

Commit d0fd2ca

Browse files
committed
Fix: Sort by functionality not properly working in my rewards in farms page
1 parent 5805cb1 commit d0fd2ca

File tree

1 file changed

+27
-7
lines changed

1 file changed

+27
-7
lines changed

src/pages/FarmPage/V3/MyRewardFarms.tsx

Lines changed: 27 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -226,11 +226,11 @@ const MyRewardFarms: React.FC<Props> = ({
226226
if (sortBy === GlobalConst.utils.v3FarmSortBy.apr) {
227227
return farm1.apr > farm2.apr ? sortMultiplier : -1 * sortMultiplier;
228228
}
229-
// if (sortBy === GlobalConst.utils.v3FarmSortBy.rewards) {
230-
// return farm1.dailyRewardUSD > farm2.dailyRewardUSD
231-
// ? sortMultiplier
232-
// : -1 * sortMultiplier;
233-
// }
229+
if (sortBy === GlobalConst.utils.v3FarmSortBy.rewards) {
230+
return farm1.dailyRewardUSD > farm2.dailyRewardUSD
231+
? sortMultiplier
232+
: -1 * sortMultiplier;
233+
}
234234
return 1;
235235
});
236236

@@ -333,6 +333,26 @@ const MyRewardFarms: React.FC<Props> = ({
333333
);
334334
}, [farmType.link, selectedFarms]);
335335

336+
const sortedSelectedFarms = useMemo(() => {
337+
return [...filteredSelectedFarms].sort((a: any, b: any) => {
338+
if (sortBy === GlobalConst.utils.v3FarmSortBy.pool) {
339+
return a.title > b.title ? sortMultiplier : -1 * sortMultiplier;
340+
}
341+
if (sortBy === GlobalConst.utils.v3FarmSortBy.tvl) {
342+
return a.almTVL > b.almTVL ? sortMultiplier : -1 * sortMultiplier;
343+
}
344+
if (sortBy === GlobalConst.utils.v3FarmSortBy.apr) {
345+
return a.almAPR + a.poolAPR > b.almAPR + b.poolAPR
346+
? sortMultiplier
347+
: -1 * sortMultiplier;
348+
}
349+
if (sortBy === GlobalConst.utils.v3FarmSortBy.rewards) {
350+
return a.rewards > b.rewards ? sortMultiplier : -1 * sortMultiplier;
351+
}
352+
return 1;
353+
});
354+
}, [filteredSelectedFarms]);
355+
336356
return (
337357
<>
338358
<Box pt={2}>
@@ -355,8 +375,8 @@ const MyRewardFarms: React.FC<Props> = ({
355375
</Box>
356376
) : (
357377
<Box px={2}>
358-
{filteredSelectedFarms.length > 0 ? (
359-
filteredSelectedFarms.map((farm, ind) => (
378+
{sortedSelectedFarms.length > 0 ? (
379+
sortedSelectedFarms.map((farm, ind) => (
360380
<Box key={ind} pb={2}>
361381
<MerklPairFarmCard farm={farm} />
362382
</Box>

0 commit comments

Comments
 (0)