Fix the switchChain error encountered when using the "metaMask" conne…

…ctor (#4227) * fix: metaMask switchChain * chore: changeset --------- Co-authored-by: Tom Meagher <[email protected]>
wevm · Sep 16, 2024 · d07ad7f · d07ad7f
1 parent b0eb89c
commit d07ad7f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/.changeset/tiny-crabs-hug.md b/.changeset/tiny-crabs-hug.md
@@ -0,0 +1,5 @@
+---
+"@wagmi/connectors": patch
+---
+
+Fixed MetaMask Connector throwing error after switching to a chain that was just added via `'wallet_addEthereumChain'`.
diff --git a/packages/connectors/src/metaMask.ts b/packages/connectors/src/metaMask.ts
@@ -17,13 +17,15 @@ import type {
 import {
   type AddEthereumChainParameter,
   type Address,
+  type Hex,
   type ProviderConnectInfo,
   type ProviderRpcError,
   ResourceUnavailableRpcError,
   type RpcError,
   SwitchChainError,
   UserRejectedRequestError,
   getAddress,
+  hexToNumber,
   numberToHex,
   withRetry,
   withTimeout,
@@ -288,7 +290,10 @@ export function metaMask(parameters: MetaMaskParameters = {}) {
               params: [addEthereumChain],
             })
 
-            const currentChainId = await this.getChainId()
+            const currentChainId = hexToNumber(
+              // Call `'eth_chainId'` directly to guard against `this.state.chainId` (via `provider.getChainId`) being stale.
+              (await provider.request({ method: 'eth_chainId' })) as Hex,
+            )
             if (currentChainId !== chainId)
               throw new UserRejectedRequestError(
                 new Error('User rejected switch after adding network.'),