Merge branch 'main' into react-to-timeouts

tahowallet · Aug 2, 2023 · 7f4a557 · 7f4a557
2 parents 8a90482 + f56ce73
commit 7f4a557
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/background/services/preferences/db.ts b/background/services/preferences/db.ts
@@ -403,6 +403,20 @@ export class PreferenceDatabase extends Dexie {
         })
     })
 
+    // Remove broken yearn's token list
+    this.version(20).upgrade((tx) => {
+      return tx
+        .table("preferences")
+        .toCollection()
+        .modify((storedPreferences: Preferences) => {
+          const urls = storedPreferences.tokenLists.urls.filter(
+            (url) => !url.includes("meta.yearn.finance")
+          )
+
+          Object.assign(storedPreferences.tokenLists, { urls })
+        })
+    })
+
     // This is the old version for populate
     // https://dexie.org/docs/Dexie/Dexie.on.populate-(old-version)
     // The this does not behave according the new docs, but works

diff --git a/background/services/preferences/defaults.ts b/background/services/preferences/defaults.ts
@@ -12,7 +12,6 @@ const defaultPreferences: Preferences = {
         "ipfs://bafybeihufwj43zej34itf66qyguq35k4f6s4ual4uk3iy643wn3xnff2ka"
       ).href, // the Taho community-curated list
       "https://gateway.ipfs.io/ipns/tokens.uniswap.org", // the Uniswap default list
-      "https://meta.yearn.finance/api/tokens/list", // the Yearn list
       "https://messari.io/tokenlist/messari-verified", // Messari-verified projects
       "https://wrapped.tokensoft.eth.limo", // Wrapped tokens
       "https://tokenlist.aave.eth.limo", // Aave-listed tokens and interest-bearing assets