updated connected accounts when switching personal<>smart account

thirdweb-dev · Feb 14, 2024 · 263fe76 · 263fe76
1 parent c934619
commit 263fe76
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 3 deletions.
diff --git a/packages/thirdweb/src/react/ui/ConnectWallet/Details.tsx b/packages/thirdweb/src/react/ui/ConnectWallet/Details.tsx
@@ -9,8 +9,8 @@ import { useState, useEffect } from "react";
 import {
   useActiveAccount,
   useActiveWalletChainId,
+  useConnect,
   useDisconnect,
-  useSetActiveAccount,
 } from "../../providers/wallet-provider.js";
 import { useTWLocale } from "../../providers/locale-provider.js";
 import { Modal } from "../components/Modal.js";
@@ -51,6 +51,7 @@ import {
   type WalletWithPersonalAccount,
   personalAccountToSmartAccountMap,
 } from "../../../wallets/index.js";
+import { connectionManager } from "../../connectionManager.js";
 // import { walletIds } from "../../../wallets/walletIds.js";
 
 // TEMP
@@ -719,14 +720,21 @@ function AccountSwitcher({
   account: Account;
   name: string;
 }) {
-  const setActiveAccount = useSetActiveAccount();
+  const { connect } = useConnect();
   const locale = useTWLocale().connectWallet;
+  const currentActiveAccount = useActiveAccount();
+  const removeConnectedAccount = connectionManager.removeConnectedAccount;
 
   return (
     <MenuButton
       type="button"
       onClick={() => {
-        setActiveAccount(account);
+        // remove the current active account as "connected"
+        if (currentActiveAccount) {
+          removeConnectedAccount(currentActiveAccount);
+        }
+        // set as connected and active
+        connect(account);
       }}
       style={{
         fontSize: fontSize.sm,

diff --git a/packages/thirdweb/src/wallets/manager/index.ts b/packages/thirdweb/src/wallets/manager/index.ts
@@ -54,6 +54,13 @@ export function createConnectionManager(options?: ConnectionManagerOptions) {
     walletIdToConnectedAccountMap.setValue(newValue);
   };
 
+  const removeConnectedAccount = (account: Account) => {
+    const oldValue = walletIdToConnectedAccountMap.getValue();
+    const newValue = new Map(oldValue);
+    newValue.delete(account.wallet.metadata.id);
+    walletIdToConnectedAccountMap.setValue(newValue);
+  };
+
   const onAccountDisconnect = (account: Account) => {
     const currentMap = walletIdToConnectedAccountMap.getValue();
     const newMap = new Map(currentMap);
@@ -210,5 +217,6 @@ export function createConnectionManager(options?: ConnectionManagerOptions) {
     switchActiveWalletChain,
     activeWalletConnectionStatus: activeWalletConnectionStatus,
     isAutoConnecting,
+    removeConnectedAccount,
   };
 }