fix: improve getUnderlyingAssetIdsBalances safety (shapeshift#4437)

rabee198 · May 10, 2023 · 9e362d8 · 9e362d8
1 parent b0ad66e
commit 9e362d8
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 38 deletions.
diff --git a/src/components/EarnDashboard/components/PositionDetails/LpPositionsByProvider.tsx b/src/components/EarnDashboard/components/PositionDetails/LpPositionsByProvider.tsx
@@ -155,7 +155,7 @@ export const LpPositionsByProvider: React.FC<LpPositionsByProviderProps> = ({ id
           return (
             <Flex direction='column'>
               <Flex gap={1}>
-                <Amount.Fiat value={underlyingBalances[assetId].fiatAmount ?? 0} />
+                <Amount.Fiat value={underlyingBalances[assetId].fiatAmount} />
                 <Flex color='gray.500'>
                   {'('} <Amount.Fiat value={row.original.fiatAmount} /> {')'}
                 </Flex>
@@ -165,8 +165,7 @@ export const LpPositionsByProvider: React.FC<LpPositionsByProviderProps> = ({ id
                   variant='sub-text'
                   key={`${assetId}-balance`}
                   size='xs'
-                  // This should never be undefined, but it may
-                  value={underlyingBalances[assetId]?.cryptoBalancePrecision ?? '0'}
+                  value={underlyingBalances[assetId].cryptoBalancePrecision}
                   symbol={assets[assetId]?.symbol ?? ''}
                 />
               ))}

diff --git a/src/components/EarnDashboard/components/ProviderDetails/OpportunityRow.tsx b/src/components/EarnDashboard/components/ProviderDetails/OpportunityRow.tsx
@@ -124,8 +124,7 @@ export const OpportunityRow: React.FC<
     return (
       <List style={{ marginTop: 0 }}>
         {nestedAssetIds.map(assetId => {
-          if (!underlyingAssetBalances[assetId]) return null
-          if (bnOrZero(underlyingAssetBalances[assetId].cryptoBalancePrecision).eq(0)) return null
+          if (bnOrZero(underlyingAssetBalances[assetId]?.cryptoBalancePrecision).eq(0)) return null
           return (
             <NestedAsset
               key={assetId}

diff --git a/src/components/Equity/EquityLpRow.tsx b/src/components/Equity/EquityLpRow.tsx
@@ -122,8 +122,8 @@ export const EquityLpRow: React.FC<EquityLpRowProps> = ({
       onClick={handleClick}
       icon={DefiProviderMetadata[opportunity.provider].icon}
       label={opportunity.provider}
-      fiatAmount={underlyingBalances[assetId]?.fiatAmount}
-      cryptoBalancePrecision={underlyingBalances[assetId]?.cryptoBalancePrecision}
+      fiatAmount={underlyingBalances[assetId].fiatAmount}
+      cryptoBalancePrecision={underlyingBalances[assetId].cryptoBalancePrecision}
       symbol={asset.symbol}
       totalFiatBalance={totalFiatBalance}
       color={color}

diff --git a/...ures/defi/providers/osmosis/components/OsmosisManager/Lp/Withdraw/components/Withdraw.tsx b/...ures/defi/providers/osmosis/components/OsmosisManager/Lp/Withdraw/components/Withdraw.tsx
@@ -368,32 +368,30 @@ export const Withdraw: React.FC<WithdrawProps> = ({
           assets,
           marketData,
         })
-        if (underlyingAssetBalances) {
-          trackOpportunityEvent(
-            MixPanelEvents.WithdrawContinue,
-            {
-              opportunity: osmosisOpportunity,
-              fiatAmounts: [
-                underlyingAssetBalances[underlyingAsset0.assetId].fiatAmount,
-                underlyingAssetBalances[underlyingAsset1.assetId].fiatAmount,
-              ],
-              cryptoAmounts: [
-                { assetId: lpAsset.assetId, amountCryptoHuman: formValues.cryptoAmount },
-                {
-                  assetId: underlyingAsset0.assetId,
-                  amountCryptoHuman:
-                    underlyingAssetBalances[underlyingAsset0.assetId].cryptoBalancePrecision,
-                },
-                {
-                  assetId: underlyingAsset1.assetId,
-                  amountCryptoHuman:
-                    underlyingAssetBalances[underlyingAsset1.assetId].cryptoBalancePrecision,
-                },
-              ],
-            },
-            assets,
-          )
-        }
+        trackOpportunityEvent(
+          MixPanelEvents.WithdrawContinue,
+          {
+            opportunity: osmosisOpportunity,
+            fiatAmounts: [
+              underlyingAssetBalances[underlyingAsset0.assetId].fiatAmount,
+              underlyingAssetBalances[underlyingAsset1.assetId].fiatAmount,
+            ],
+            cryptoAmounts: [
+              { assetId: lpAsset.assetId, amountCryptoHuman: formValues.cryptoAmount },
+              {
+                assetId: underlyingAsset0.assetId,
+                amountCryptoHuman:
+                  underlyingAssetBalances[underlyingAsset0.assetId].cryptoBalancePrecision,
+              },
+              {
+                assetId: underlyingAsset1.assetId,
+                amountCryptoHuman:
+                  underlyingAssetBalances[underlyingAsset1.assetId].cryptoBalancePrecision,
+              },
+            ],
+          },
+          assets,
+        )
       } catch (error) {
         moduleLogger.error({ fn: 'handleContinue', error }, 'Error on continue')
         toast({

diff --git a/src/state/slices/opportunitiesSlice/utils.ts b/src/state/slices/opportunitiesSlice/utils.ts
@@ -95,8 +95,14 @@ export const getUnderlyingAssetIdsBalances: GetUnderlyingAssetIdsBalances = ({
       const underlyingAsset = assets[underlyingAssetId]
       const asset = assets[assetId ?? '']
       const marketDataPrice = marketData[underlyingAssetId]?.price
-      if (!underlyingAsset) return acc
-      if (!asset) return acc
+
+      if (!(underlyingAsset && asset)) {
+        acc[underlyingAssetId] = {
+          fiatAmount: '0',
+          cryptoBalancePrecision: '0',
+        }
+        return acc
+      }
 
       const cryptoBalancePrecision = bnOrZero(cryptoAmountBaseUnit)
         .times(fromBaseUnit(underlyingAssetRatiosBaseUnit[index], underlyingAsset.precision))

diff --git a/src/state/slices/portfolioSlice/selectors.ts b/src/state/slices/portfolioSlice/selectors.ts
@@ -891,9 +891,8 @@ export const selectAssetEquityItemsByFilter = createDeepEqualOutputSelector(
       return {
         id: lpOpportunity.id,
         type: AssetEquityType.LP,
-        // This should never happen but it may whilst data is loading
-        fiatAmount: underlyingBalances[assetId]?.fiatAmount ?? '0',
-        amountCryptoPrecision: underlyingBalances[assetId]?.cryptoBalancePrecision ?? '0',
+        fiatAmount: underlyingBalances[assetId].fiatAmount,
+        amountCryptoPrecision: underlyingBalances[assetId].cryptoBalancePrecision,
         provider: lpOpportunity.provider,
         color: DefiProviderMetadata[lpOpportunity.provider].color,
       }