fix: wevm#4367

Nichebiche · Nov 6, 2024 · d091cf0 · d091cf0
1 parent cb7dd2e
commit d091cf0
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/.changeset/sweet-toys-kick.md b/.changeset/sweet-toys-kick.md
@@ -0,0 +1,5 @@
+---
+"@wagmi/connectors": patch
+---
+
+Fixed MetaMask connector not returning provider in some cases.
diff --git a/packages/connectors/src/metaMask.ts b/packages/connectors/src/metaMask.ts
@@ -9,6 +9,7 @@ import {
   type Connector,
   createConnector,
   extractRpcUrls,
+  ProviderNotFoundError,
 } from '@wagmi/core'
 import type {
   Compute,
@@ -266,8 +267,16 @@ export function metaMask(parameters: MetaMaskParameters = {}) {
               : { name: 'wagmi', url: 'https://wagmi.sh' }),
           useDeeplink: parameters.useDeeplink ?? true,
         })
-        await sdk.init()
-        return sdk.getProvider()!
+        const result = await sdk.init()
+        // On initial load, sometimes `sdk.getProvider` does not return provider.
+        // https://github.com/wevm/wagmi/issues/4367
+        // Use result of `init` call if available.
+        const provider = (() => {
+          if (result?.activeProvider) return result.activeProvider
+          return sdk.getProvider()
+        })()
+        if (!provider) throw new ProviderNotFoundError()
+        return provider
       }
 
       if (!provider) {