From 90d32c87999ec130c01efbe633bea07d2a40bc08 Mon Sep 17 00:00:00 2001
From: Joaquim Verges <joaquim.verges@gmail.com>
Date: Mon, 17 Feb 2025 22:26:59 +1300
Subject: [PATCH] [wagmi-adapter] fix: Improve autoconnect handling and storage

---
 .changeset/red-eagles-end.md                  |  5 ++++
 .../src/wallets/connection/autoConnect.ts     |  6 ++---
 packages/wagmi-adapter/src/connector.ts       | 26 +++++++++++++++----
 3 files changed, 29 insertions(+), 8 deletions(-)
 create mode 100644 .changeset/red-eagles-end.md

diff --git a/.changeset/red-eagles-end.md b/.changeset/red-eagles-end.md
new file mode 100644
index 00000000000..7a00e5002d8
--- /dev/null
+++ b/.changeset/red-eagles-end.md
@@ -0,0 +1,5 @@
+---
+"@thirdweb-dev/wagmi-adapter": patch
+---
+
+Better autoconnection handling
diff --git a/packages/thirdweb/src/wallets/connection/autoConnect.ts b/packages/thirdweb/src/wallets/connection/autoConnect.ts
index faf097139d6..e88e18832d7 100644
--- a/packages/thirdweb/src/wallets/connection/autoConnect.ts
+++ b/packages/thirdweb/src/wallets/connection/autoConnect.ts
@@ -29,11 +29,11 @@ import type { AutoConnectProps } from "./types.js";
  * @returns {boolean} a promise resolving to true or false depending on whether the auto connect function connected to a wallet or not
  * @walletConnection
  */
-export const autoConnect = async (
+export async function autoConnect(
   props: AutoConnectProps & {
     wallets?: Wallet[];
   },
-) => {
+): Promise<boolean> {
   const wallets = props.wallets || getDefaultWallets(props);
   const manager = createConnectionManager(webLocalStorage);
   const result = await autoConnectCore({
@@ -56,4 +56,4 @@ export const autoConnect = async (
     manager,
   });
   return result;
-};
+}
diff --git a/packages/wagmi-adapter/src/connector.ts b/packages/wagmi-adapter/src/connector.ts
index 821df386b5f..cee0dea7ed5 100644
--- a/packages/wagmi-adapter/src/connector.ts
+++ b/packages/wagmi-adapter/src/connector.ts
@@ -32,7 +32,12 @@ type Properties = {
     chainId: number;
   }>;
 };
-type StorageItem = { "tw.lastChainId": number };
+type StorageItem = {
+  "thirdweb:lastChainId": number;
+};
+
+const activeWalletIdKey = "thirdweb:active-wallet-id";
+const connectedWalletIdsKey = "thirdweb:connected-wallet-ids";
 
 /**
  * Connect to an in-app wallet using the auth strategy of your choice.
@@ -92,7 +97,11 @@ export function inAppWalletConnector(
     name: "In-App wallet",
     type: "in-app",
     connect: async (params) => {
-      const lastChainId = await config.storage?.getItem("tw.lastChainId");
+      const rawStorage =
+        typeof window !== "undefined" && window.localStorage
+          ? window.localStorage
+          : undefined;
+      const lastChainId = await config.storage?.getItem("thirdweb:lastChainId");
       if (params?.isReconnecting) {
         const { autoConnect } = await import("thirdweb/wallets");
         const chainId = lastChainId || args.smartAccount?.chain?.id || 1;
@@ -130,7 +139,10 @@ export function inAppWalletConnector(
         chain,
       } as InAppWalletConnectionOptions;
       const account = await wallet.connect(decoratedOptions);
-      await config.storage?.setItem("tw.lastChainId", chain.id);
+      // setting up raw local storage value for autoConnect
+      rawStorage?.setItem(connectedWalletIdsKey, JSON.stringify([wallet.id]));
+      rawStorage?.setItem(activeWalletIdKey, wallet.id);
+      await config.storage?.setItem("thirdweb:lastChainId", chain.id);
       return { accounts: [getAddress(account.address)], chainId: chain.id };
     },
     disconnect: async () => {
@@ -147,7 +159,7 @@ export function inAppWalletConnector(
       return wallet.getChain()?.id || 1;
     },
     getProvider: async (params) => {
-      const lastChainId = await config.storage?.getItem("tw.lastChainId");
+      const lastChainId = await config.storage?.getItem("thirdweb:lastChainId");
       const chain = defineChain(
         params?.chainId || args.smartAccount?.chain?.id || lastChainId || 1,
       );
@@ -169,9 +181,13 @@ export function inAppWalletConnector(
     switchChain: async (params) => {
       const chain = config.chains.find((x) => x.id === params.chainId);
       if (!chain) {
-        throw new Error(`Chain ${params.chainId} not supported`);
+        throw new Error(`Chain ${params.chainId} not configured`);
       }
       await wallet.switchChain(defineChain(chain.id));
+      config.emitter.emit("change", {
+        chainId: chain.id,
+      });
+      await config.storage?.setItem("thirdweb:lastChainId", chain.id);
       return chain;
     },
     onAccountsChanged: () => {