fix: top trader is own wallet and daily points

derivexyz · Apr 13, 2023 · e2ab5b8 · e2ab5b8
1 parent 060c945
commit e2ab5b8
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 6 deletions.
diff --git a/app/src/components/common/TradingLeaderboardTable/index.tsx b/app/src/components/common/TradingLeaderboardTable/index.tsx
@@ -145,7 +145,9 @@ const TradingLeaderboardTable = ({ traders, onClick, onBoostClick, pageSize, ...
     return null
   }
 
-  const sortedRows = rows.sort((a, b) => b.dailyRewards - a.dailyRewards)
+  const sortedRows = accountIsTopWallet
+    ? [rows[0], ...rows.slice(1).sort((a, b) => b.dailyRewards - a.dailyRewards)]
+    : rows.sort((a, b) => b.dailyRewards - a.dailyRewards)
   return (
     <Table
       data={sortedRows}

diff --git a/app/src/hooks/leaderboard/useLeaderboardPageData.ts b/app/src/hooks/leaderboard/useLeaderboardPageData.ts
@@ -4,7 +4,10 @@ import { useCallback } from 'react'
 import { FetchId } from '@/app/constants/fetch'
 import fetchENSNames from '@/app/utils/fetchENSNames'
 import getLyraSDK from '@/app/utils/getLyraSDK'
-import fetchTradingLeaderboard, { TradingRewardToken } from '@/app/utils/rewards/fetchTradingLeaderboard'
+import fetchTradingLeaderboard, {
+  TradingRewardsLeaderboard,
+  TradingRewardToken,
+} from '@/app/utils/rewards/fetchTradingLeaderboard'
 
 import useNetwork from '../account/useNetwork'
 import useWallet from '../account/useWallet'
@@ -32,7 +35,7 @@ export const fetchLeaderboardPageData = async (
   network: Network,
   walletAddress: string | null
 ): Promise<LeaderboardPageData> => {
-  const [globalRewardEpochs, accountRewardEpochs, tradingLeaderboard] = await Promise.all([
+  const [globalRewardEpochs, accountRewardEpochs, tradingLeaderboards] = await Promise.all([
     getLyraSDK(network).globalRewardEpochs(),
     walletAddress ? getLyraSDK(network).accountRewardEpochs(walletAddress) : [],
     fetchTradingLeaderboard(network),
@@ -51,6 +54,8 @@ export const fetchLeaderboardPageData = async (
   const latestAccountRewardEpoch = accountRewardEpochs.find(
     e => e.globalEpoch.startTimestamp === latestGlobalRewardEpoch.startTimestamp
   )
+  const epochNumber = network === Network.Arbitrum ? latestGlobalRewardEpoch.id - 5 : latestGlobalRewardEpoch.id - 18
+  const tradingLeaderboard: TradingRewardsLeaderboard = tradingLeaderboards ? tradingLeaderboards[epochNumber] : {}
 
   const leaderboard = []
   const traders: TradingRewardsTraders = []
@@ -72,7 +77,10 @@ export const fetchLeaderboardPageData = async (
     )
     const latestDaily = dailyRewards[0]
     const boost = Math.max(latestDaily.referralBoost, latestDaily.stakingBoost, latestDaily.tradingBoost)
-    const dailyReward = totalPoints > 0 ? (latestDaily.points / totalPoints) * totalRewards.amount : 0
+    const dailyReward =
+      totalPoints > 0 && latestDaily.points > 0
+        ? (Math.sqrt(latestDaily.points) / totalPoints) * totalRewards.amount
+        : 0
     leaderboard.push({
       trader: trader,
       traderEns: traderENSMap[trader],

diff --git a/app/src/utils/rewards/fetchTradingLeaderboard.ts b/app/src/utils/rewards/fetchTradingLeaderboard.ts
@@ -42,7 +42,7 @@ export type TradingRewardsLeaderboard = {
   }
 }
 
-const fetchTradingLeaderboard = async (network: Network): Promise<TradingRewardsLeaderboard | null> => {
+const fetchTradingLeaderboard = async (network: Network): Promise<TradingRewardsLeaderboard[] | null> => {
   const res = await fetch(`${process.env.REACT_APP_API_URL}/rewards/tradingLeaderboard?network=${network}`, {
     method: 'GET',
     mode: 'cors',
@@ -51,7 +51,7 @@ const fetchTradingLeaderboard = async (network: Network): Promise<TradingRewards
     return null
   }
   const data: TradingRewardsLeaderboard[] = await res.json()
-  return data[0]
+  return data
 }
 
 export default fetchTradingLeaderboard