empty data handle

burrowHQ · Dec 28, 2023 · 23dc0c9 · 23dc0c9
1 parent 6b79d3b
commit 23dc0c9
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 11 deletions.
diff --git a/hooks/useExtraAPY.ts b/hooks/useExtraAPY.ts
@@ -42,11 +42,11 @@ export function useExtraAPY({
   const assetPrice = assets.data[assetId].price?.usd || 0;
 
   const totalBorrowAssetUSD =
-    Number(shrinkToken(portfolio.borrowed[assetId]?.balance || 0, assetDecimals)) * assetPrice;
+    Number(shrinkToken(portfolio.borrowed?.[assetId]?.balance || 0, assetDecimals)) * assetPrice;
   const totalSupplyAssetUSD =
     Number(shrinkToken(portfolio.supplied[assetId]?.balance || 0, assetDecimals)) * assetPrice;
   const totalCollateralAssetUSD =
-    Number(shrinkToken(portfolio.collateral[assetId]?.balance || 0, assetDecimals)) * assetPrice;
+    Number(shrinkToken(portfolio.collateral?.[assetId]?.balance || 0, assetDecimals)) * assetPrice;
 
   const totalUserAssetUSD = isBorrow
     ? totalBorrowAssetUSD

diff --git a/redux/selectors/getAccountRewards.ts b/redux/selectors/getAccountRewards.ts
@@ -115,10 +115,10 @@ export const computePoolsDailyAmount = (
     shrinkToken(portfolio.supplied[asset.token_id]?.shares || 0, assetDecimals),
   );
   const collateralShares = Number(
-    shrinkToken(portfolio.collateral[asset.token_id]?.shares || 0, assetDecimals),
+    shrinkToken(portfolio.collateral?.[asset.token_id]?.shares || 0, assetDecimals),
   );
   const borrowedShares = Number(
-    shrinkToken(portfolio.borrowed[asset.token_id]?.shares || 0, assetDecimals),
+    shrinkToken(portfolio.borrowed?.[asset.token_id]?.shares || 0, assetDecimals),
   );
 
   const shares = type === "supplied" ? suppliedShares + collateralShares : borrowedShares;

diff --git a/redux/selectors/getPortfolioAssets.ts b/redux/selectors/getPortfolioAssets.ts
@@ -74,7 +74,7 @@ export const getPortfolioAssets = createSelector(
         const collateral = shrinkToken(
           (isLpToken
             ? account.portfolio.positions[tokenId]?.collateral?.[tokenId]?.balance || 0
-            : account.portfolio.collateral[tokenId]?.balance) || 0,
+            : account.portfolio.collateral?.[tokenId]?.balance) || 0,
           asset.metadata.decimals + asset.config.extra_decimals,
         );
         const suppliedBalance = account.portfolio.supplied?.[tokenId]?.balance || 0;
@@ -111,7 +111,7 @@ export const getPortfolioAssets = createSelector(
       })
       .filter(app.showDust ? Boolean : emptySuppliedAsset);
     // borrow from regular position
-    const borrowed = Object.keys(account.portfolio.borrowed)
+    const borrowed = Object.keys(account.portfolio.borrowed || {})
       .map((tokenId) => {
         const asset = assets.data[tokenId];
 

diff --git a/redux/utils.ts b/redux/utils.ts
@@ -99,13 +99,13 @@ export const transformAsset = (
       shrinkToken(
         asset.isLpToken
           ? account.portfolio.positions[tokenId]?.collateral?.[tokenId]?.balance || 0
-          : account.portfolio.collateral[tokenId]?.balance || 0,
+          : account.portfolio.collateral?.[tokenId]?.balance || 0,
         decimals,
       ),
     );
     const borrowed = asset.isLpToken
       ? account.portfolio.positions[tokenId]?.borrowed?.[tokenId]?.balance || 0
-      : account.portfolio.borrowed[tokenId]?.balance || 0;
+      : account.portfolio.borrowed?.[tokenId]?.balance || 0;
     const available = account.balances[tokenId] || 0;
     const availableNEAR = account.balances["near"] || 0;
 

diff --git a/store/actions/adjustCollateral.ts b/store/actions/adjustCollateral.ts
@@ -33,7 +33,7 @@ export async function adjustCollateral({
   const suppliedBalance = new Decimal(account.portfolio?.supplied[tokenId]?.balance || 0);
   const collateralBalance = new Decimal(
     asset.isLpToken
-      ? account.portfolio?.positions[tokenId].collateral[tokenId]?.balance || 0
+      ? account.portfolio?.positions[tokenId]?.collateral[tokenId]?.balance || 0
       : account.portfolio?.collateral[tokenId]?.balance || 0,
   );
 

diff --git a/transformers/account.ts b/transformers/account.ts
@@ -51,8 +51,8 @@ export const transformPortfolio = (account) => {
     borrows,
     collaterals,
     supplied: listToMap(supplied),
-    borrowed: positions[DEFAULT_POSITION].borrowed,
-    collateral: positions[DEFAULT_POSITION].collateral,
+    borrowed: positions[DEFAULT_POSITION]?.borrowed,
+    collateral: positions[DEFAULT_POSITION]?.collateral,
     collateralAll,
     positions,
     farms: transformAccountFarms(farms),