fixup! Only add or update cached pairs if they successfully return a rate

Author: peachbits

src/actions/ExchangeRateActions.ts

@@ -140,14 +140,23 @@ async function loadExchangeRateCache(): Promise<ExchangeRateCacheFile> {
   const { cryptoPairs, fiatPairs, rates } = asExchangeRateCacheFile(json)
 
   // Keep un-expired asset pairs:
+  const cryptoPairsMap = new Map<string, CryptoFiatPair>()
   for (const pair of cryptoPairs) {
     if (pair.expiration < now) continue
-    out.cryptoPairs.push(pair)
+    const tokenIdStr =
+      pair.asset.tokenId != null ? `_${pair.asset.tokenId}` : ''
+    const key = `${pair.asset.pluginId}${tokenIdStr}_${pair.targetFiat}`
+    cryptoPairsMap.set(key, { ...pair, isoDate: undefined })
   }
+  out.cryptoPairs = Array.from(cryptoPairsMap.values())
+
+  const fiatPairsMap = new Map<string, FiatFiatPair>()
   for (const pair of fiatPairs) {
     if (pair.expiration < now) continue
-    out.fiatPairs.push(pair)
+    const key = `${pair.fiatCode}_${pair.targetFiat}`
+    fiatPairsMap.set(key, { ...pair, isoDate: undefined })
   }
+  out.fiatPairs = Array.from(fiatPairsMap.values())
 
   // Keep un-expired rates:
   for (const [pluginId, tokenObj] of Object.entries(rates.crypto)) {
@@ -415,22 +424,23 @@ async function fetchExchangeRates(
   for (const [pluginId, tokenObj] of Object.entries(rates.crypto)) {
     for (const [tokenId, rateObj] of Object.entries(tokenObj)) {
       for (const targetFiat of Object.keys(rateObj)) {
+        const edgeTokenId = tokenId === '' ? null : tokenId
         const cryptoPairIndex = cryptoPairCache.findIndex(
           pair =>
             pair.asset.pluginId === pluginId &&
-            pair.asset.tokenId === tokenId &&
+            pair.asset.tokenId === edgeTokenId &&
             pair.targetFiat === targetFiat
         )
         if (cryptoPairIndex === -1) {
           cryptoPairCache.push({
-            asset: { pluginId, tokenId },
+            asset: { pluginId, tokenId: edgeTokenId },
             targetFiat,
             isoDate: undefined,
             expiration: pairCacheExpiration
           })
         } else {
           cryptoPairCache[cryptoPairIndex] = {
-            asset: { pluginId, tokenId },
+            asset: { pluginId, tokenId: edgeTokenId },
             targetFiat,
             isoDate: undefined,
             expiration: pairCacheExpiration