feat: upgrade @metamask/sdk package to version '0.12.4' (#3237)

* feat: upgrade @metamask/sdk package to version '0.12.2' * chore: code clean * chore: remove the extensionOnly option * fix: sdk is not disconnecting * feat: upgrade @metamask/sdk package to version '0.12.4' * feat: bump version --------- Co-authored-by: Tom Meagher <tom@meagher.co>
wevm · Dec 8, 2023 · 4bc85b1 · 4bc85b1
1 parent d84e11a
commit 4bc85b1
Show file tree

Hide file tree

Showing 4 changed files with 173 additions and 37 deletions.
diff --git a/packages/connectors/package.json b/packages/connectors/package.json
@@ -47,7 +47,7 @@
   "dependencies": {
     "@coinbase/wallet-sdk": "3.9.0-canary.2",
     "@ledgerhq/connect-kit-loader": "^1.1.2",
-    "@metamask/sdk": "^0.8.0",
+    "@metamask/sdk": "^0.14.1",
     "@safe-global/safe-apps-provider": "^0.18.0",
     "@safe-global/safe-apps-sdk": "^8.1.0",
     "@walletconnect/ethereum-provider": "^2.10.1",

diff --git a/packages/connectors/src/metaMask.ts b/packages/connectors/src/metaMask.ts
@@ -143,6 +143,8 @@ export function metaMask(parameters: MetaMaskParameters = {}) {
       provider.removeListener('disconnect', this.onDisconnect.bind(this))
       provider.on('connect', this.onConnect.bind(this) as Listener)
 
+      sdk.terminate()
+
       // Add shim signalling connector is disconnected
       await config.storage?.setItem('metaMaskSDK.disconnected', true)
     },
@@ -174,9 +176,15 @@ export function metaMask(parameters: MetaMaskParameters = {}) {
           })
           await sdk.init()
         }
-        walletProvider = sdk.getProvider()
+        try {
+          walletProvider = sdk.getProvider()
+        } catch (error) {
+          // TODO: SDK sometimes throws errors when MM extension or mobile provider is not detected (don't throw for those errors)
+          const regex = /^SDK state invalid -- undefined( mobile)? provider$/
+          if (!regex.test((error as Error).message)) throw error
+        }
       }
-      return walletProvider
+      return walletProvider!
     },
     async isAuthorized() {
       try {

diff --git a/playgrounds/vite-react/src/wagmi.ts b/playgrounds/vite-react/src/wagmi.ts
@@ -3,7 +3,6 @@ import { http, createConfig } from 'wagmi'
 import { celo, mainnet, optimism, sepolia } from 'wagmi/chains'
 import {
   coinbaseWallet,
-  injected,
   ledger,
   metaMask,
   safe,
@@ -33,8 +32,8 @@ export const config = createConfig({
     ledger({ projectId: import.meta.env.VITE_WC_PROJECT_ID }),
     safe({ debug: true, shimDisconnect: true }),
     metaMask(),
-    injected(),
   ],
+  multiInjectedProviderDiscovery: false,
   transports: {
     [mainnet.id]: http(
       'https://eth-mainnet.g.alchemy.com/v2/StF61Ht3J9nXAojZX-b21LVt9l0qDL38',