SOV-3653: Fix LP rewards (#2594)

Fix LP rewards
DistributedCollective · Feb 20, 2024 · 7f8d2aa · 7f8d2aa
1 parent 2af17a6
commit 7f8d2aa
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 22 deletions.
diff --git a/src/app/pages/LiquidityMining/components/RemoveLiquidityDialog/RemoveLiquidityDialogV1.tsx b/src/app/pages/LiquidityMining/components/RemoveLiquidityDialog/RemoveLiquidityDialogV1.tsx
@@ -58,7 +58,7 @@ export const RemoveLiquidityDialogV1: React.FC<IRemoveLiquidityDialogV1Props> =
   const weiAmount = useWeiAmount(amount);
 
   const {
-    value: { amount: poolTokenBalance, accumulatedReward },
+    value: { amount: poolTokenBalance },
     loading,
   } = useLiquidityMining_getUserInfo(pool.poolTokenA);
 
@@ -155,11 +155,6 @@ export const RemoveLiquidityDialogV1: React.FC<IRemoveLiquidityDialogV1Props> =
 
   const rewards = useLiquidityMining_getUserAccumulatedReward(pool.poolTokenA);
 
-  const reward = useMemo(
-    () => bignumber(rewards.value).add(accumulatedReward).toFixed(0),
-    [rewards.value, accumulatedReward],
-  );
-
   const handleConfirm = () => withdraw();
 
   return (
@@ -203,7 +198,7 @@ export const RemoveLiquidityDialogV1: React.FC<IRemoveLiquidityDialogV1Props> =
               value={
                 <LoadableValue
                   loading={rewards.loading || loading}
-                  value={weiToNumberFormat(reward, 6)}
+                  value={weiToNumberFormat(rewards.value, 6)}
                 />
               }
               appendElem={<AssetRenderer asset={Asset.SOV} />}

diff --git a/src/app/pages/LiquidityMining/components/RemoveLiquidityDialog/index.tsx b/src/app/pages/LiquidityMining/components/RemoveLiquidityDialog/index.tsx
@@ -53,7 +53,7 @@ export const RemoveLiquidityDialog: React.FC<IRemoveLiquidityDialogProps> = ({
   const poolTokenAddress = pool.getPoolTokenAddress(asset)!;
 
   const {
-    value: { amount: poolTokenBalance, accumulatedReward },
+    value: { amount: poolTokenBalance },
     loading,
   } = useLiquidityMining_getUserInfo(poolTokenAddress);
   const {
@@ -100,11 +100,6 @@ export const RemoveLiquidityDialog: React.FC<IRemoveLiquidityDialogProps> = ({
 
   const rewards = useLiquidityMining_getUserAccumulatedReward(poolTokenAddress);
 
-  const reward = useMemo(
-    () => bignumber(rewards.value).add(accumulatedReward).toFixed(0),
-    [rewards.value, accumulatedReward],
-  );
-
   const handleConfirm = () => withdraw();
 
   const assets = useMemo(() => [pool.assetA, pool.assetB], [pool]);
@@ -144,7 +139,7 @@ export const RemoveLiquidityDialog: React.FC<IRemoveLiquidityDialogProps> = ({
               value={
                 <LoadableValue
                   loading={rewards.loading || loading}
-                  value={weiToNumberFormat(reward, 6)}
+                  value={weiToNumberFormat(rewards.value, 6)}
                 />
               }
               appendElem={<AssetRenderer asset={Asset.SOV} />}

diff --git a/src/app/pages/LiquidityMining/hooks/useLiquidityMining_getTotalUserAccumulatedReward.ts b/src/app/pages/LiquidityMining/hooks/useLiquidityMining_getTotalUserAccumulatedReward.ts
@@ -1,18 +1,13 @@
-import { bignumber } from 'mathjs';
-import { useLiquidityMining_getUserInfo } from './useLiquidityMining_getUserInfo';
 import { useLiquidityMining_getUserAccumulatedReward } from './useLiquidityMining_getUserAccumulatedReward';
 
 export function useLiquidityMining_getTotalUserAccumulatedReward(
   poolToken: string,
 ) {
-  const info = useLiquidityMining_getUserInfo(poolToken);
   const reward = useLiquidityMining_getUserAccumulatedReward(poolToken);
 
   return {
-    value: bignumber(info.value?.accumulatedReward || '0')
-      .add(reward.value)
-      .toFixed(0),
-    loading: info.loading || reward.loading,
-    error: info.error || reward.error,
+    value: reward.value,
+    loading: reward.loading,
+    error: reward.error,
   };
 }