:fix fix an issue where adding chains in ethers doesn't work (#3355)

reown-com · Nov 29, 2024 · 2c87bc5 · 2c87bc5
1 parent 824f1df
commit 2c87bc5
Show file tree

Hide file tree

Showing 7 changed files with 48 additions and 14 deletions.
diff --git a/.changeset/curly-cameras-call.md b/.changeset/curly-cameras-call.md
@@ -2,7 +2,6 @@
 '@reown/appkit-siwe': patch
 '@reown/appkit-adapter-ethers': patch
 '@reown/appkit-adapter-ethers5': patch
-'@reown/appkit-adapter-polkadot': patch
 '@reown/appkit-adapter-solana': patch
 '@reown/appkit-adapter-wagmi': patch
 '@reown/appkit': patch

diff --git a/.changeset/long-bags-shave.md b/.changeset/long-bags-shave.md
@@ -1,5 +1,4 @@
 ---
-'@reown/appkit-adapter-polkadot': patch
 '@reown/appkit-adapter-ethers5': patch
 '@reown/appkit-adapter-ethers': patch
 '@reown/appkit-adapter-solana': patch

diff --git a/.changeset/short-comics-allow.md b/.changeset/short-comics-allow.md
@@ -0,0 +1,20 @@
+---
+'@reown/appkit-adapter-ethers5': patch
+'@reown/appkit-adapter-ethers': patch
+'@reown/appkit-utils': patch
+'@reown/appkit-core': patch
+'@reown/appkit-adapter-solana': patch
+'@reown/appkit-adapter-wagmi': patch
+'@reown/appkit': patch
+'@reown/appkit-cdn': patch
+'@reown/appkit-common': patch
+'@reown/appkit-experimental': patch
+'@reown/appkit-polyfills': patch
+'@reown/appkit-scaffold-ui': patch
+'@reown/appkit-siwe': patch
+'@reown/appkit-siwx': patch
+'@reown/appkit-ui': patch
+'@reown/appkit-wallet': patch
+---
+
+Fix a case where adding chains on ethers doesn't work
diff --git a/packages/adapters/ethers/src/client.ts b/packages/adapters/ethers/src/client.ts
@@ -419,10 +419,16 @@ export class EthersAdapter extends AdapterBlueprint {
         name: caipNetwork.name
       })
 
-      const balance = await jsonRpcProvider.getBalance(params.address)
-      const formattedBalance = formatEther(balance)
-
-      return { balance: formattedBalance, symbol: caipNetwork.nativeCurrency.symbol }
+      if (jsonRpcProvider) {
+        try {
+          const balance = await jsonRpcProvider.getBalance(params.address)
+          const formattedBalance = formatEther(balance)
+
+          return { balance: formattedBalance, symbol: caipNetwork.nativeCurrency.symbol }
+        } catch (error) {
+          return { balance: '', symbol: '' }
+        }
+      }
     }
 
     return { balance: '', symbol: '' }

diff --git a/packages/adapters/ethers5/src/client.ts b/packages/adapters/ethers5/src/client.ts
@@ -423,10 +423,16 @@ export class Ethers5Adapter extends AdapterBlueprint {
         }
       )
 
-      const balance = await jsonRpcProvider.getBalance(params.address)
-      const formattedBalance = formatEther(balance)
-
-      return { balance: formattedBalance, symbol: caipNetwork.nativeCurrency.symbol }
+      if (jsonRpcProvider) {
+        try {
+          const balance = await jsonRpcProvider.getBalance(params.address)
+          const formattedBalance = formatEther(balance)
+
+          return { balance: formattedBalance, symbol: caipNetwork.nativeCurrency.symbol }
+        } catch (error) {
+          return { balance: '', symbol: '' }
+        }
+      }
     }
 
     return { balance: '', symbol: '' }

diff --git a/packages/appkit-utils/src/ethers/EthersHelpersUtil.ts b/packages/appkit-utils/src/ethers/EthersHelpersUtil.ts
@@ -41,10 +41,14 @@ export const EthersHelpersUtil = {
       params: [
         {
           chainId: EthersHelpersUtil.numberToHexString(caipNetwork.id),
-          rpcUrls: caipNetwork.rpcUrls.default.http,
+          rpcUrls: [caipNetwork.rpcUrls.default.http[0]],
           chainName: caipNetwork.name,
-          nativeCurrency: caipNetwork.nativeCurrency,
-          blockExplorerUrls: caipNetwork.blockExplorers,
+          nativeCurrency: {
+            name: caipNetwork.nativeCurrency.name,
+            decimals: caipNetwork.nativeCurrency.decimals,
+            symbol: caipNetwork.nativeCurrency.symbol
+          },
+          blockExplorerUrls: [caipNetwork.blockExplorers?.default.url],
           iconUrls: [PresetsUtil.NetworkImageIds[caipNetwork.id]]
         }
       ]

diff --git a/packages/core/src/controllers/ChainController.ts b/packages/core/src/controllers/ChainController.ts
@@ -247,7 +247,7 @@ export const ChainController = {
     )
 
     const unsupportedNetwork = !activeAdapter?.caipNetworks?.some(
-      caipNetwork => caipNetwork.id === network.id
+      caipNetwork => caipNetwork.id === state.activeCaipNetwork?.id
     )
     const networkControllerClient = this.getNetworkControllerClient(network.chainNamespace)