fix: Prime (#1742)

VenusProtocol · Nov 9, 2023 · 5505788 · 5505788
1 parent a77c49f
commit 5505788
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 14 deletions.
diff --git a/src/clients/api/queries/useGetVaults/__snapshots__/index.spec.tsx.snap b/src/clients/api/queries/useGetVaults/__snapshots__/index.spec.tsx.snap
@@ -21,7 +21,7 @@ exports[`api/queries/useGetVaults > fetches and returns vaults correctly 1`] = `
     },
     "stakingAprPercentage": 262800,
     "totalStakedWei": "4000000000",
-    "userStakedWei": "30000000000000000000",
+    "userStakedWei": "29000000000000000000",
   },
   {
     "dailyEmissionWei": "28800000000",
@@ -42,7 +42,7 @@ exports[`api/queries/useGetVaults > fetches and returns vaults correctly 1`] = `
     },
     "stakingAprPercentage": 262800,
     "totalStakedWei": "4000000000",
-    "userStakedWei": "30000000000000000000",
+    "userStakedWei": "29000000000000000000",
   },
   {
     "dailyEmissionWei": "28800000000",
@@ -63,7 +63,7 @@ exports[`api/queries/useGetVaults > fetches and returns vaults correctly 1`] = `
     },
     "stakingAprPercentage": 262800,
     "totalStakedWei": "4000000000",
-    "userStakedWei": "30000000000000000000",
+    "userStakedWei": "29000000000000000000",
   },
   {
     "dailyEmissionWei": "28800000000",
@@ -84,7 +84,7 @@ exports[`api/queries/useGetVaults > fetches and returns vaults correctly 1`] = `
     },
     "stakingAprPercentage": 262800,
     "totalStakedWei": "4000000000",
-    "userStakedWei": "30000000000000000000",
+    "userStakedWei": "29000000000000000000",
   },
   {
     "dailyEmissionWei": "28800000000",
@@ -105,7 +105,7 @@ exports[`api/queries/useGetVaults > fetches and returns vaults correctly 1`] = `
     },
     "stakingAprPercentage": 262800,
     "totalStakedWei": "4000000000",
-    "userStakedWei": "30000000000000000000",
+    "userStakedWei": "29000000000000000000",
   },
   {
     "dailyEmissionWei": "5000000000",

diff --git a/src/clients/api/queries/useGetVaults/useGetVestingVaults/index.ts b/src/clients/api/queries/useGetVaults/useGetVestingVaults/index.ts
@@ -150,7 +150,9 @@ const useGetVestingVaults = ({
         (acc, _item, poolIndex) => {
           const totalStakedWeiData = poolBalances[poolIndex];
           const lockingPeriodMs = poolData[poolIndex]?.poolInfos.lockingPeriodMs;
-          const userStakedWei = poolData[poolIndex]?.userInfos?.stakedAmountWei;
+          const userStakedWei = poolData[poolIndex]?.userInfos?.stakedAmountWei.minus(
+            poolData[poolIndex]?.userInfos?.pendingWithdrawalsTotalAmountWei || 0,
+          );
           const hasPendingWithdrawalsFromBeforeUpgrade =
             poolData[poolIndex]?.hasPendingWithdrawalsFromBeforeUpgrade;
 

diff --git a/src/containers/AccountData/useGetHypotheticalUserPrimeApys.ts b/src/containers/AccountData/useGetHypotheticalUserPrimeApys.ts
@@ -54,15 +54,20 @@ export const useGetHypotheticalUserPrimeApys = ({
     .some(distribution => distribution.type === 'prime');
 
   const { userBorrowBalanceMantissa, userSupplyBalanceMantissa } = useMemo(() => {
-    const hypotheticalUserBorrowBalanceTokens =
-      action === 'borrow' || action === 'repay'
-        ? asset.userBorrowBalanceTokens.plus(toTokenAmountTokens)
-        : asset.userBorrowBalanceTokens;
+    let hypotheticalUserBorrowBalanceTokens = asset.userBorrowBalanceTokens;
+    let hypotheticalUserSupplyBalanceTokens = asset.userSupplyBalanceTokens;
 
-    const hypotheticalUserSupplyBalanceTokens =
-      action === 'supply' || action === 'withdraw'
-        ? asset.userSupplyBalanceTokens.plus(toTokenAmountTokens)
-        : asset.userSupplyBalanceTokens;
+    if (action === 'borrow') {
+      hypotheticalUserBorrowBalanceTokens = asset.userBorrowBalanceTokens.plus(toTokenAmountTokens);
+    } else if (action === 'repay') {
+      hypotheticalUserBorrowBalanceTokens =
+        asset.userBorrowBalanceTokens.minus(toTokenAmountTokens);
+    } else if (action === 'supply') {
+      hypotheticalUserSupplyBalanceTokens = asset.userSupplyBalanceTokens.plus(toTokenAmountTokens);
+    } else if (action === 'withdraw') {
+      hypotheticalUserSupplyBalanceTokens =
+        asset.userSupplyBalanceTokens.minus(toTokenAmountTokens);
+    }
 
     return {
       userBorrowBalanceMantissa: convertTokensToWei({