Merge branch 'main' into feat/locales-fr

ava-labs · Aug 7, 2024 · 1274e3a · 1274e3a
2 parents 55d5629 + 0cf23b2
commit 1274e3a
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 7 deletions.
diff --git a/.github/workflows/e2e_testing.yaml b/.github/workflows/e2e_testing.yaml
@@ -71,9 +71,9 @@ jobs:
           name: extension
           path: extension.zip
   e2e:
+    runs-on: ubuntu-latest-16-cores-core-extension
     needs: build
     name: Run E2E Smoke Tests
-    runs-on: ubuntu-latest-16-cores
     environment: e2e
     env:
       RUNNER: CI

diff --git a/src/background/services/balances/models.ts b/src/background/services/balances/models.ts
@@ -167,7 +167,7 @@ export interface Balances {
   };
 }
 
-export const CLOUDFLARE_IPFS_URL = 'https://cloudflare-ipfs.com';
+export const IPFS_URL = 'https://ipfs.io';
 
 export interface CachedBalancesInfo {
   totalBalance?: TotalBalance;

diff --git a/src/background/services/network/NetworkService.ts b/src/background/services/network/NetworkService.ts
@@ -326,7 +326,8 @@ export class NetworkService implements OnLock, OnStorageReady {
     // At this point the chainlist from Glacier should already be available,
     // as it is fetched when service worker starts (so before extension is unlocked).
     // If it isn't available yet, we'll use the list cached in the storage.
-    const chainlist = await Promise.race([
+
+    const chainlist = await Promise.any([
       this._chainListFetched.promisify(),
       this._getCachedChainList(),
     ]);
@@ -358,7 +359,15 @@ export class NetworkService implements OnLock, OnStorageReady {
   }
 
   private async _getCachedChainList(): Promise<ChainList | undefined> {
-    return this.storageService.load<ChainList>(NETWORK_LIST_STORAGE_KEY);
+    const networkList = await this.storageService.load<ChainList>(
+      NETWORK_LIST_STORAGE_KEY
+    );
+
+    if (!networkList) {
+      throw new Error('No networks cached');
+    }
+
+    return networkList;
   }
 
   private _getPchainNetwork(isTestnet: boolean): Network {

diff --git a/src/utils/ipsfResolverWithFallback.ts b/src/utils/ipsfResolverWithFallback.ts
@@ -1,8 +1,8 @@
 import { ipfsResolver } from '@avalabs/core-utils-sdk';
-import { CLOUDFLARE_IPFS_URL } from '@src/background/services/balances/models';
+import { IPFS_URL } from '@src/background/services/balances/models';
 export function ipfsResolverWithFallback(
   sourceUrl: string | undefined,
-  desiredGatewayPrefix: string = CLOUDFLARE_IPFS_URL
+  desiredGatewayPrefix: string = IPFS_URL
 ) {
   if (!sourceUrl) {
     return '';

diff --git a/tsconfig.json b/tsconfig.json
@@ -13,7 +13,7 @@
     "sourceMap": true,
     "jsx": "react-jsx",
     "esModuleInterop": true,
-    "lib": ["es2015", "dom"],
+    "lib": ["es2015", "es2021", "dom"],
     "experimentalDecorators": true,
     "emitDecoratorMetadata": true,
     "allowSyntheticDefaultImports": true,