fix: metaMask switchChain

wevm · Aug 25, 2024 · ceadbbe · ceadbbe
1 parent 34df0c8
commit ceadbbe
Showing 1 changed file with 11 additions and 5 deletions.
diff --git a/packages/connectors/src/metaMask.ts b/packages/connectors/src/metaMask.ts
@@ -283,11 +283,17 @@ export function metaMask(parameters: MetaMaskParameters = {}) {
               rpcUrls,
             } satisfies AddEthereumChainParameter
 
-            await provider.request({
-              method: 'wallet_addEthereumChain',
-              params: [addEthereumChain],
-            })
-
+            await Promise.all([
+              provider.request({
+                method: 'wallet_addEthereumChain',
+                params: [addEthereumChain],
+              }),
+              new Promise<void>((resolve) =>
+                config.emitter.once('change', ({ chainId: currentChainId }) => {
+                  if (currentChainId === chainId) resolve()
+                }),
+              ),
+            ])
             const currentChainId = await this.getChainId()
             if (currentChainId !== chainId)
               throw new UserRejectedRequestError(