Tighten type guards for account/timestamp activities

These now explicitly check for the decimals fields that we expect exist.
tahowallet · Oct 13, 2021 · 931c44c · 931c44c
1 parent fe9ebe9
commit 931c44c
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/background/redux-slices/accounts.ts b/background/redux-slices/accounts.ts
@@ -403,12 +403,13 @@ export const selectAccountAndTimestampedActivities = createSelector(
           asset.symbol === assetItem.asset.symbol && asset.recentPrices.USD
       )
 
-      if (rawAsset) {
-        // Does this break if the token is less than 1 USD? Hah...
-        const usdIndex = rawAsset.recentPrices.USD.amounts[1] > 1 ? 1 : 0
+      const usdIndex = rawAsset?.recentPrices?.USD?.amounts?.[1] > 1 ? 1 : 0
+      const usdAsset = rawAsset?.recentPrices?.USD?.pair[usdIndex]
+
+      if (rawAsset && "decimals" in usdAsset && "decimals" in assetItem.asset) {
         const usdNonDecimalValue = rawAsset.recentPrices.USD.amounts[usdIndex]
 
-        const usdDecimals = rawAsset.recentPrices.USD.pair[usdIndex].decimals
+        const usdDecimals = usdAsset.decimals
         const combinedDecimals = assetItem.asset.decimals + usdDecimals
 
         // Choose the precision we actually want