Support full MetaMask disconnection on wallet disconnect

Author: joaquim-verges

.changeset/petite-lizards-create.md

@@ -0,0 +1,5 @@
+---
+"thirdweb": patch
+---
+
+Support fully disconnecting from metamask on disconnect

packages/thirdweb/src/wallets/injected/index.ts

@@ -6,6 +6,7 @@ import {
   serializeTypedData,
   stringify,
   validateTypedData,
+  withTimeout,
 } from "viem";
 import { isInsufficientFundsError } from "../../analytics/track/helpers.js";
 import {
@@ -110,7 +111,7 @@ export async function connectEip1193Wallet({
     }
   } catch {
     console.warn(
-      `Error switching to chain ${chain?.id} - defaulting to wallet chain (${chainId})`,
+      `Error switching to chain ${chain?.id} - defaulting to wallet chain (${chainId})`
     );
   }
 
@@ -309,15 +310,15 @@ function createAccount({
           method: "wallet_watchAsset",
           params: asset,
         },
-        { retryCount: 0 },
+        { retryCount: 0 }
       );
       return result;
     },
     async sendCalls(options) {
       try {
         const { callParams, chain } = await toProviderCallParams(
           options,
-          account,
+          account
         );
         const callId = await provider.request({
           method: "wallet_sendCalls",
@@ -330,7 +331,7 @@ function createAccount({
       } catch (error) {
         if (/unsupport|not support/i.test((error as Error).message)) {
           throw new Error(
-            `${id} errored calling wallet_sendCalls, with error: ${error instanceof Error ? error.message : stringify(error)}`,
+            `${id} errored calling wallet_sendCalls, with error: ${error instanceof Error ? error.message : stringify(error)}`
           );
         }
         throw error;
@@ -346,7 +347,7 @@ function createAccount({
       } catch (error) {
         if (/unsupport|not support/i.test((error as Error).message)) {
           throw new Error(
-            `${id} does not support wallet_getCallsStatus, reach out to them directly to request EIP-5792 support.`,
+            `${id} does not support wallet_getCallsStatus, reach out to them directly to request EIP-5792 support.`
           );
         }
         throw error;
@@ -400,6 +401,20 @@ async function onConnect({
     provider.removeListener("accountsChanged", onAccountsChanged);
     provider.removeListener("chainChanged", onChainChanged);
     provider.removeListener("disconnect", onDisconnect);
+
+    // Experimental support for MetaMask disconnect
+    // https://github.com/MetaMask/metamask-improvement-proposals/blob/main/MIPs/mip-2.md
+    try {
+      // Adding timeout as not all wallets support this method and can hang
+      await withTimeout(
+        () =>
+          provider.request({
+            method: "wallet_revokePermissions",
+            params: [{ eth_accounts: {} }],
+          }),
+        { timeout: 100 }
+      );
+    } catch {}
   }
 
   async function onDisconnect() {