@b3dotfun/sdk 0.1.68 → 0.1.69-alpha.0

package/dist/esm/global-account/react/hooks/useAuthentication.js

@@ -15,11 +15,26 @@ import { createWagmiConfig } from "../utils/createWagmiConfig.js";
 import { useTWAuth } from "./useTWAuth.js";
 import { useUserQuery } from "./useUserQuery.js";
 const debug = debugB3React("useAuthentication");
-export function useAuthentication(partnerId) {
+export function useAuthentication(partnerId, { skipAutoConnect = false } = {}) {
     const { onConnectCallback, onLogoutCallback } = useContext(LocalSDKContext);
     const { disconnect } = useDisconnect();
     const wallets = useConnectedWallets();
+    // Keep refs so logout() always disconnects current wallets, not stale closure values.
+    // autoConnectCore captures onConnect (and thus logout) from the first render before wallets
+    // are populated — without these refs, logout() would capture wallets=[] and disconnect nothing.
+    const walletsRef = useRef(wallets);
+    useEffect(() => {
+        walletsRef.current = wallets;
+    }, [wallets]);
     const activeWallet = useActiveWallet();
+    // Track the active wallet by ref so logout() can disconnect the exact reference
+    // stored in thirdweb's activeWalletStore. walletsRef.current (from useConnectedWallets)
+    // may hold a different object reference than what thirdweb considers "active",
+    // causing the identity check in onWalletDisconnect to fail silently.
+    const activeWalletRef = useRef(activeWallet);
+    useEffect(() => {
+        activeWalletRef.current = activeWallet;
+    }, [activeWallet]);
     const isAuthenticated = useAuthStore(state => state.isAuthenticated);
     const setIsAuthenticated = useAuthStore(state => state.setIsAuthenticated);
     const setIsConnected = useAuthStore(state => state.setIsConnected);
@@ -126,21 +141,37 @@ export function useAuthentication(partnerId) {
         }
     }, [activeWallet, partnerId, authenticate, setIsAuthenticated, setIsAuthenticating, setUser, setHasStartedConnecting]);
     const logout = useCallback(async (callback) => {
-        if (activeWallet) {
-            debug("@@logout:activeWallet", activeWallet);
-            disconnect(activeWallet);
-            debug("@@logout:activeWallet", activeWallet);
-        }
-        // Log out of each wallet
-        wallets.forEach(wallet => {
-            console.log("@@logging out", wallet);
-            disconnect(wallet);
+        // Disconnect ecosystem/smart wallets from the connected wallets list.
+        // EOA wallets (MetaMask, Coinbase Wallet) are left in the list so they can
+        // auto-reconnect on next login without requiring a new approval popup.
+        // Use walletsRef.current (not the stale closure value) so we always get current wallets —
+        // autoConnectCore captures logout from the first render when wallets is still [].
+        walletsRef.current.forEach(wallet => {
+            debug("@@logout:wallet", wallet.id);
+            if (wallet.id.startsWith("ecosystem.") || wallet.id === "smart") {
+                disconnect(wallet);
+            }
         });
-        // Delete localStorage thirdweb:connected-wallet-ids
-        // https://npc-labs.slack.com/archives/C070E6HNG85/p1750185115273099
+        // Unconditionally disconnect the active wallet to clear thirdweb's activeAccountStore.
+        // This is separate from the loop above: even if the active wallet is an EOA (e.g.
+        // Coinbase Wallet), we must disconnect it so activeAccount becomes undefined.
+        // Without this, ConnectEmbed renders show=false (blank modal) because it checks
+        // show = !activeAccount. Note: thirdweb's disconnect() is idempotent — calling it
+        // on an already-disconnected wallet (from the loop above) is a no-op.
+        // We use the exact reference from activeWalletRef because thirdweb's
+        // onWalletDisconnect uses strict identity (===) to decide whether to clear
+        // activeAccountStore.
+        // Tradeoff: EOA wallets (MetaMask, Coinbase Wallet) will be removed from
+        // connectedWallets and require a new approval popup on next login.
+        // This is acceptable because a working login form is more critical than
+        // skipping one wallet approval step.
+        if (activeWalletRef.current) {
+            debug("@@logout:disconnecting active wallet", activeWalletRef.current.id);
+            disconnect(activeWalletRef.current);
+        }
+        // Clear user-specific storage (auth tokens, cached user data).
+        // Thirdweb's wallet connection state is managed separately via disconnect() above.
         if (typeof localStorage !== "undefined") {
-            localStorage.removeItem("thirdweb:connected-wallet-ids");
-            localStorage.removeItem("wagmi.store");
             localStorage.removeItem("lastAuthProvider");
             localStorage.removeItem("b3-user");
         }
@@ -148,33 +179,62 @@ export function useAuthentication(partnerId) {
         debug("@@logout:loggedOut");
         setIsAuthenticated(false);
         setIsConnected(false);
+        // Reset isAuthenticating so any in-flight page-load auto-connect that set it true
+        // does not keep the login modal spinner stuck after logout() is called.
+        setIsAuthenticating(false);
         setUser();
         callback?.();
         if (onLogoutCallback) {
             await onLogoutCallback();
         }
-    }, [activeWallet, disconnect, wallets, setIsAuthenticated, setUser, setIsConnected, onLogoutCallback]);
+    }, 
+    // wallets intentionally omitted — we use walletsRef.current so this callback stays stable
+    // and always operates on current wallets even when captured in stale closures.
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    [disconnect, setIsAuthenticated, setIsAuthenticating, setUser, setIsConnected, onLogoutCallback]);
     const onConnect = useCallback(async (_walleAutoConnectedWith, allConnectedWallets) => {
         debug("@@useAuthentication:onConnect", { _walleAutoConnectedWith, allConnectedWallets });
+        const connectedEcosystemWallet = allConnectedWallets.find(w => w.id.startsWith("ecosystem."));
         try {
-            const wallet = allConnectedWallets.find(wallet => wallet.id.startsWith("ecosystem."));
-            if (!wallet) {
+            if (!connectedEcosystemWallet) {
                 throw new Error("No smart wallet found during auto-connect");
             }
-            debug("@@useAuthentication:onConnect", { wallet });
+            debug("@@useAuthentication:onConnect", { wallet: connectedEcosystemWallet });
             setHasStartedConnecting(true);
             setIsConnected(true);
             setIsAuthenticating(true);
-            await setActiveWallet(wallet);
-            const userAuth = await authenticateUser(wallet);
+            await setActiveWallet(connectedEcosystemWallet);
+            const userAuth = await authenticateUser(connectedEcosystemWallet);
             if (userAuth && onConnectCallback) {
-                await onConnectCallback(wallet, userAuth.accessToken);
+                await onConnectCallback(connectedEcosystemWallet, userAuth.accessToken);
             }
         }
         catch (error) {
             debug("@@useAuthentication:onConnect:failed", { error });
             setIsAuthenticated(false);
             setUser(undefined);
+            // Directly disconnect the ecosystem wallet we set active above.
+            // We can't rely on logout()'s activeWalletRef here because it's updated
+            // via useEffect (deferred until after paint), but this callback may run
+            // entirely within a single React commit cycle — before the ref updates.
+            // Note: logout() below may also call disconnect() on the same wallet via
+            // activeWalletRef — thirdweb's disconnect() is idempotent so this is safe.
+            if (connectedEcosystemWallet) {
+                debug("@@useAuthentication:onConnect:disconnecting ecosystem wallet", connectedEcosystemWallet.id);
+                disconnect(connectedEcosystemWallet);
+            }
+            // Also disconnect the wallet that autoConnectCore set as active.
+            // When only a non-ecosystem wallet (e.g. MetaMask) auto-reconnects,
+            // connectedEcosystemWallet is undefined, so the block above is skipped.
+            // But autoConnectCore already set this wallet as thirdweb's activeWallet,
+            // leaving activeAccount set. ConnectEmbed checks show = !activeAccount,
+            // so if we don't clear it, the login form renders blank.
+            // Uses object identity (===) which is safe because thirdweb returns
+            // stable references for connected wallet instances.
+            if (_walleAutoConnectedWith && _walleAutoConnectedWith !== connectedEcosystemWallet) {
+                debug("@@useAuthentication:onConnect:disconnecting auto-connected wallet", _walleAutoConnectedWith.id);
+                disconnect(_walleAutoConnectedWith);
+            }
             await logout();
         }
         finally {
@@ -189,6 +249,7 @@ export function useAuthentication(partnerId) {
         isAuthenticated,
         isAuthenticating,
         isConnected,
+        disconnect,
         setHasStartedConnecting,
         setIsConnected,
         setIsAuthenticating,
@@ -201,23 +262,32 @@ export function useAuthentication(partnerId) {
     ]);
     const { isLoading: useAutoConnectLoading } = useAutoConnect({
         client,
-        wallets: [wallet],
+        // When skipAutoConnect is true (e.g. LoginStepContent, SignInWithB3Flow), pass an empty
+        // wallets array so useAutoConnect completes immediately without firing onConnect.
+        // Only AuthenticationProvider (the primary instance) should own auto-connect.
+        wallets: skipAutoConnect ? [] : [wallet],
         onConnect,
         onTimeout: () => {
+            if (skipAutoConnect)
+                return;
             logout().catch(error => {
                 debug("@@useAuthentication:logout on timeout failed", { error });
             });
         },
     });
     /**
-     * useAutoConnectLoading starts as false
+     * useAutoConnectLoading starts as false.
+     * Only the primary (non-skip) instance manages isAuthenticating via this effect
+     * to avoid race conditions when multiple useAuthentication instances are mounted.
      */
     useEffect(() => {
+        if (skipAutoConnect)
+            return;
         if (!useAutoConnectLoading && useAutoConnectLoadingPrevious.current && !hasStartedConnecting) {
             setIsAuthenticating(false);
         }
         useAutoConnectLoadingPrevious.current = useAutoConnectLoading;
-    }, [useAutoConnectLoading, hasStartedConnecting, setIsAuthenticating]);
+    }, [useAutoConnectLoading, hasStartedConnecting, setIsAuthenticating, skipAutoConnect]);
     const isReady = isAuthenticated && !isAuthenticating;
     return {
         logout,

package/dist/esm/global-account/react/hooks/useGetAllTWSigners.js

@@ -62,7 +62,8 @@ export function useGetAllTWSigners({ chain, accountAddress, queryOptions }) {
             });
             return result;
         },
-        enabled: Boolean(chain && accountAddress),
+        // Respect queryOptions.enabled if explicitly set (e.g. signersEnabled=false from SignInWithB3Flow)
+        enabled: queryOptions?.enabled !== false && Boolean(chain && accountAddress),
         refetchOnMount: true,
         refetchOnWindowFocus: true,
         refetchOnReconnect: true,

package/dist/esm/global-account/react/stores/useModalStore.d.ts

@@ -657,6 +657,10 @@ interface ModalState {
     setLinkingState: (isLinking: boolean, method?: string | null) => void;
     /** Function to update closable property of current content without adding to history */
     setClosable: (closable: boolean) => void;
+    /** Whether a third-party iframe (e.g. Persona KYC) is currently active over the modal */
+    personaActive: boolean;
+    /** Function to mark a third-party iframe as active/inactive */
+    setPersonaActive: (active: boolean) => void;
 }
 /**
  * Zustand store for managing modal state

package/dist/esm/global-account/react/stores/useModalStore.js

@@ -36,4 +36,6 @@ export const useModalStore = create(set => ({
     setClosable: (closable) => set(state => ({
         contentType: state.contentType ? { ...state.contentType, closable } : null,
     })),
+    personaActive: false,
+    setPersonaActive: (active) => set({ personaActive: active }),
 }));

package/dist/esm/global-account/react/utils/createWagmiConfig.d.ts

@@ -25,3 +25,21 @@ export declare function createWagmiConfig(options: CreateWagmiConfigOptions): im
 }, {
     "thirdweb:lastChainId": number;
 }>)[]>;
+/**
+ * Returns a cached wagmi config for the given partnerId.
+ * Use this instead of calling createWagmiConfig() directly inside React components or hooks
+ * to avoid registering duplicate EventEmitter listeners on every render.
+ */
+export declare function getCachedWagmiConfig(options: CreateWagmiConfigOptions): import("wagmi").Config<readonly [import("viem").Chain, ...import("viem").Chain[]], {
+    [k: string]: import("viem").HttpTransport<undefined, false>;
+}, (CreateConnectorFn | CreateConnectorFn<import("thirdweb/dist/types/adapters/eip1193").EIP1193Provider | undefined, {
+    connect<withCapabilities extends boolean = false>(parameters?: import("@thirdweb-dev/wagmi-adapter").ConnectionOptions<withCapabilities> | undefined): Promise<{
+        accounts: withCapabilities extends true ? readonly {
+            address: `0x${string}`;
+            capabilities: Record<string, unknown>;
+        }[] : readonly `0x${string}`[];
+        chainId: number;
+    }>;
+}, {
+    "thirdweb:lastChainId": number;
+}>)[]>;

package/dist/esm/global-account/react/utils/createWagmiConfig.js

@@ -27,3 +27,19 @@ export function createWagmiConfig(options) {
         connectors: finalConnectors,
     });
 }
+/** Module-level cache — wagmi configs must not be recreated on every render. */
+const wagmiConfigCache = new Map();
+/**
+ * Returns a cached wagmi config for the given partnerId.
+ * Use this instead of calling createWagmiConfig() directly inside React components or hooks
+ * to avoid registering duplicate EventEmitter listeners on every render.
+ */
+export function getCachedWagmiConfig(options) {
+    const key = options.partnerId;
+    let config = wagmiConfigCache.get(key);
+    if (!config) {
+        config = createWagmiConfig(options);
+        wagmiConfigCache.set(key, config);
+    }
+    return config;
+}