fix: Calculate assets correctly on UI on deposit day

credbull · Oct 17, 2024 · 09e8e34 · 09e8e34
1 parent fd63b88
commit 09e8e34
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/spikes/spike-liquid-stone/packages/nextjs/app/vault/_components/ViewSection.tsx b/spikes/spike-liquid-stone/packages/nextjs/app/vault/_components/ViewSection.tsx
@@ -247,7 +247,7 @@ const ViewSection = () => {
                       <>
                         <br/>
                         shares: {request?.shareAmount?.toString()}<br/>
-                        assets: {request?.assetAmount?.toString()}
+                        assets: {request?.assetAmount?.toString()} USDC
                       </>
                   )}
                   onClickHandler={() => setRequestAmountToRedeem(request)}

diff --git a/spikes/spike-liquid-stone/packages/nextjs/hooks/custom/useFetchRedeemRequests.ts b/spikes/spike-liquid-stone/packages/nextjs/hooks/custom/useFetchRedeemRequests.ts
@@ -40,11 +40,15 @@ export const useFetchRedeemRequests = ({
           const depositPeriod = depositPeriods[index];
           const share = shares[index];
 
-          // Call the contract function to convert shares to assets for each deposit period
-          const assetAmount = await contract.convertToAssetsForDepositPeriod(share, depositPeriod);
-
           totalShareAmount += ethers.toBigInt(share);
-          totalAssetAmount += ethers.toBigInt(assetAmount);
+
+          // only yield if the deposit was in the past
+          if (currentPeriod > depositPeriod) {
+            const assetAmount = await contract.convertToAssetsForDepositPeriod(share, depositPeriod);
+            totalAssetAmount += ethers.toBigInt(assetAmount);
+          } else {
+            totalAssetAmount += ethers.toBigInt(share); // yield is 0, assets = shares
+          }
         }
 
         if (totalShareAmount > 0) {