From 3e2cfe63df8a002006eadf0fd1c2777bb50b19fb Mon Sep 17 00:00:00 2001 From: MikeDiam Date: Thu, 14 Dec 2023 14:36:41 +0300 Subject: [PATCH] [rewards-chart] add rewards chart --- README.md | 3 ++- .../requests/getUserRewards/modifyUserRewards.spec.ts | 11 ++++++++--- .../requests/getUserRewards/modifyUserRewards.ts | 6 ++++-- src/methods/vault/requests/getUserRewards/types.ts | 3 ++- 4 files changed, 16 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index d0c7106e..d042a579 100644 --- a/README.md +++ b/README.md @@ -223,7 +223,8 @@ Daily rewards for the user who has made a deposit in the vault. With the help of ```ts type UserReward = { - rewards: number + sumRewards: number + dailyRewards: number } type Output = { diff --git a/src/methods/vault/requests/getUserRewards/modifyUserRewards.spec.ts b/src/methods/vault/requests/getUserRewards/modifyUserRewards.spec.ts index f252f1b0..a13413ea 100644 --- a/src/methods/vault/requests/getUserRewards/modifyUserRewards.spec.ts +++ b/src/methods/vault/requests/getUserRewards/modifyUserRewards.spec.ts @@ -8,10 +8,12 @@ describe('modifyUserReward and modifyUserRewards functions', () => { { date: '1694908800', sumRewards: '344379922475148628745', + dailyRewards: '344379922475148628745', }, { date: '1694995200', sumRewards: '344382187878289278175', + dailyRewards: '0', }, ], } @@ -22,7 +24,8 @@ describe('modifyUserReward and modifyUserRewards functions', () => { const result = modifyUserReward(userReward) expect(result).toEqual({ - rewards: 344.37992247514865, + sumRewards: 344.37992247514865, + dailyRewards: 344.37992247514865, }) }) @@ -30,10 +33,12 @@ describe('modifyUserReward and modifyUserRewards functions', () => { const expectedResult = { days: { 1694908800: { - rewards: 344.37992247514865, + sumRewards: 344.37992247514865, + dailyRewards: 344.37992247514865, }, 1694995200: { - rewards: 344.3821878782893, + sumRewards: 344.3821878782893, + dailyRewards: 0, }, }, } diff --git a/src/methods/vault/requests/getUserRewards/modifyUserRewards.ts b/src/methods/vault/requests/getUserRewards/modifyUserRewards.ts index afd06278..47fbd63a 100644 --- a/src/methods/vault/requests/getUserRewards/modifyUserRewards.ts +++ b/src/methods/vault/requests/getUserRewards/modifyUserRewards.ts @@ -5,10 +5,12 @@ import type { UserRewardsQueryPayload } from '../../../../graphql/backend/vault' export const modifyUserReward = (reward: Omit) => { - const totalRewards = String(reward.dailyRewards) || '0' + const sumRewards = String(reward.sumRewards) || '0' + const dailyRewards = String(reward.dailyRewards) || '0' return { - rewards: Number(formatEther(totalRewards)), + sumRewards: Number(formatEther(sumRewards)), + dailyRewards: Number(formatEther(dailyRewards)), } } diff --git a/src/methods/vault/requests/getUserRewards/types.ts b/src/methods/vault/requests/getUserRewards/types.ts index 8352656a..b0dff29b 100644 --- a/src/methods/vault/requests/getUserRewards/types.ts +++ b/src/methods/vault/requests/getUserRewards/types.ts @@ -1,5 +1,6 @@ type UserReward = { - rewards: number + sumRewards: number + dailyRewards: number } export type ModifyUserReward = {