@b3dotfun/sdk 0.1.68 → 0.1.69-alpha.0

package/src/global-account/react/components/ManageAccount/ManageAccount.tsx

@@ -17,8 +17,8 @@ type TabValue = "home" | "tokens" | "nfts" | "apps" | "settings" | "swap";
 //   return (
 //     <svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
 //       <path
-//         fill-rule="evenodd"
-//         clip-rule="evenodd"
+//         fillRule="evenodd"
+//         clipRule="evenodd"
 //         d="M12.5227 1.33636C12.1804 1.24368 11.8196 1.24368 11.4773 1.33636C11.08 1.44395 10.7454 1.7066 10.4784 1.91623L10.4038 1.97465L3.54376 7.31012C3.16713 7.6024 2.83532 7.85991 2.58806 8.19421C2.37107 8.48759 2.20942 8.8181 2.11106 9.1695C1.99898 9.56992 1.99943 9.98993 1.99995 10.4667L2.00002 17.8385C2 18.3657 1.99998 18.8204 2.03059 19.195C2.06289 19.5904 2.1342 19.9836 2.327 20.362C2.61462 20.9264 3.07356 21.3854 3.63805 21.673C4.01643 21.8658 4.40964 21.9371 4.80499 21.9694C5.17956 22 5.63431 22 6.16145 22H17.8386C18.3657 22 18.8205 22 19.195 21.9694C19.5904 21.9371 19.9836 21.8658 20.362 21.673C20.9265 21.3854 21.3854 20.9264 21.673 20.362C21.8658 19.9836 21.9371 19.5904 21.9694 19.195C22.0001 18.8204 22 18.3657 22 17.8386L22.0001 10.4667C22.0006 9.98993 22.0011 9.56992 21.889 9.1695C21.7906 8.8181 21.629 8.48759 21.412 8.19421C21.1647 7.8599 20.8329 7.6024 20.4563 7.31011L13.5963 1.97465L13.5216 1.91623C13.2546 1.7066 12.9201 1.44395 12.5227 1.33636ZM8.00003 16C7.44775 16 7.00003 16.4477 7.00003 17C7.00003 17.5523 7.44775 18 8.00003 18H16C16.5523 18 17 17.5523 17 17C17 16.4477 16.5523 16 16 16H8.00003Z"
 //         fill="currentColor"
 //       />
@@ -32,9 +32,9 @@ type TabValue = "home" | "tokens" | "nfts" | "apps" | "settings" | "swap";
 //       <path
 //         d="M20.4533 12.893C20.1755 15.5029 18.6968 17.9487 16.2498 19.3614C12.1843 21.7086 6.98576 20.3157 4.63855 16.2502L4.38855 15.8172M3.5465 11.107C3.8243 8.49711 5.30309 6.05138 7.75007 4.63862C11.8156 2.29141 17.0141 3.68434 19.3613 7.74983L19.6113 8.18285M3.49353 18.0661L4.22558 15.334L6.95763 16.0661M17.0428 7.93401L19.7748 8.66606L20.5069 5.93401"
 //         stroke="currentColor"
-//         stroke-width="2"
-//         stroke-linecap="round"
-//         stroke-linejoin="round"
+//         strokeWidth="2"
+//         strokeLinecap="round"
+//         strokeLinejoin="round"
 //       />
 //     </svg>
 //   );
@@ -44,8 +44,8 @@ type TabValue = "home" | "tokens" | "nfts" | "apps" | "settings" | "swap";
 //   return (
 //     <svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
 //       <path
-//         fill-rule="evenodd"
-//         clip-rule="evenodd"
+//         fillRule="evenodd"
+//         clipRule="evenodd"
 //         d="M19.286 15.9606C19.2272 15.6362 19.2669 15.3016 19.4 15C19.5268 14.7042 19.7372 14.452 20.0055 14.2743C20.2738 14.0966 20.5882 14.0013 20.91 14H21C21.5304 14 22.0391 13.7893 22.4142 13.4142C22.7893 13.0391 23 12.5304 23 12C23 11.4696 22.7893 10.9609 22.4142 10.5858C22.0391 10.2107 21.5304 10 21 10H20.83C20.5082 9.99872 20.1938 9.90337 19.9255 9.72569C19.6572 9.54802 19.4468 9.29577 19.32 9V8.92C19.1869 8.61838 19.1472 8.28381 19.206 7.95941C19.2648 7.63502 19.4195 7.33568 19.65 7.1L19.71 7.04C19.896 6.85425 20.0435 6.63368 20.1441 6.39088C20.2448 6.14808 20.2966 5.88783 20.2966 5.625C20.2966 5.36217 20.2448 5.10192 20.1441 4.85912C20.0435 4.61632 19.896 4.39575 19.71 4.21C19.5243 4.02405 19.3037 3.87653 19.0609 3.77588C18.8181 3.67523 18.5578 3.62343 18.295 3.62343C18.0322 3.62343 17.7719 3.67523 17.5291 3.77588C17.2863 3.87653 17.0657 4.02405 16.88 4.21L16.82 4.27C16.5843 4.50054 16.285 4.65519 15.9606 4.714C15.6362 4.77282 15.3016 4.73312 15 4.6C14.7042 4.47324 14.452 4.26276 14.2743 3.99447C14.0966 3.72618 14.0013 3.41179 14 3.09V3C14 2.46957 13.7893 1.96086 13.4142 1.58579C13.0391 1.21071 12.5304 1 12 1C11.4696 1 10.9609 1.21071 10.5858 1.58579C10.2107 1.96086 10 2.46957 10 3V3.17C9.99872 3.49179 9.90337 3.80618 9.72569 4.07447C9.54802 4.34276 9.29577 4.55324 9 4.68H8.92C8.61838 4.81312 8.28381 4.85282 7.95941 4.794C7.63502 4.73519 7.33568 4.58054 7.1 4.35L7.04 4.29C6.85425 4.10405 6.63368 3.95653 6.39088 3.85588C6.14808 3.75523 5.88783 3.70343 5.625 3.70343C5.36217 3.70343 5.10192 3.75523 4.85912 3.85588C4.61632 3.95653 4.39575 4.10405 4.21 4.29C4.02405 4.47575 3.87653 4.69632 3.77588 4.93912C3.67523 5.18192 3.62343 5.44217 3.62343 5.705C3.62343 5.96783 3.67523 6.22808 3.77588 6.47088C3.87653 6.71368 4.02405 6.93425 4.21 7.12L4.27 7.18C4.50054 7.41568 4.65519 7.71502 4.714 8.03941C4.77282 8.36381 4.73312 8.69838 4.6 9C4.48572 9.31074 4.28059 9.5799 4.0113 9.77251C3.742 9.96512 3.42099 10.0723 3.09 10.08H3C2.46957 10.08 1.96086 10.2907 1.58579 10.6658C1.21071 11.0409 1 11.5496 1 12.08C1 12.6104 1.21071 13.1191 1.58579 13.4942C1.96086 13.8693 2.46957 14.08 3 14.08H3.17C3.49179 14.0813 3.80618 14.1766 4.07447 14.3543C4.34276 14.532 4.55324 14.7842 4.68 15.08C4.81312 15.3816 4.85282 15.7162 4.794 16.0406C4.73519 16.365 4.58054 16.6643 4.35 16.9L4.29 16.96C4.10405 17.1457 3.95653 17.3663 3.85588 17.6091C3.75523 17.8519 3.70343 18.1122 3.70343 18.375C3.70343 18.6378 3.75523 18.8981 3.85588 19.1409C3.95653 19.3837 4.10405 19.6043 4.29 19.79C4.47575 19.976 4.69632 20.1235 4.93912 20.2241C5.18192 20.3248 5.44217 20.3766 5.705 20.3766C5.96783 20.3766 6.22808 20.3248 6.47088 20.2241C6.71368 20.1235 6.93425 19.976 7.12 19.79L7.18 19.73C7.41568 19.4995 7.71502 19.3448 8.03941 19.286C8.36381 19.2272 8.69838 19.2669 9 19.4C9.31074 19.5143 9.5799 19.7194 9.77251 19.9887C9.96512 20.258 10.0723 20.579 10.08 20.91V21C10.08 21.5304 10.2907 22.0391 10.6658 22.4142C11.0409 22.7893 11.5496 23 12.08 23C12.6104 23 13.1191 22.7893 13.4942 22.4142C13.8693 22.0391 14.08 21.5304 14.08 21V20.83C14.0813 20.5082 14.1766 20.1938 14.3543 19.9255C14.532 19.6572 14.7842 19.4468 15.08 19.32C15.3816 19.1869 15.7162 19.1472 16.0406 19.206C16.365 19.2648 16.6643 19.4195 16.9 19.65L16.96 19.71C17.1457 19.896 17.3663 20.0435 17.6091 20.1441C17.8519 20.2448 18.1122 20.2966 18.375 20.2966C18.6378 20.2966 18.8981 20.2448 19.1409 20.1441C19.3837 20.0435 19.6043 19.896 19.79 19.71C19.976 19.5243 20.1235 19.3037 20.2241 19.0609C20.3248 18.8181 20.3766 18.5578 20.3766 18.295C20.3766 18.0322 20.3248 17.7719 20.2241 17.5291C20.1235 17.2863 19.976 17.0657 19.79 16.88L19.73 16.82C19.4995 16.5843 19.3448 16.285 19.286 15.9606ZM15 12C15 13.6569 13.6569 15 12 15C10.3431 15 9 13.6569 9 12C9 10.3431 10.3431 9 12 9C13.6569 9 15 10.3431 15 12Z"
 //         fill="currentColor"
 //       />

package/src/global-account/react/components/ManageAccount/channels/TelegramChannel.tsx

@@ -93,7 +93,7 @@ export const TelegramChannel = ({
 
   const icon = (
     <svg width="1000px" height="1000px" viewBox="0 0 1000 1000" version="1.1" xmlns="http://www.w3.org/2000/svg">
-      <g id="Telegram" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+      <g id="Telegram" stroke="none" strokeWidth="1" fill="none" fillRule="evenodd">
         <path
           d="M226.328419,494.722069 C372.088573,431.216685 469.284839,389.350049 517.917216,369.122161 C656.772535,311.36743 685.625481,301.334815 704.431427,301.003532 C708.567621,300.93067 717.815839,301.955743 723.806446,306.816707 C728.864797,310.92121 730.256552,316.46581 730.922551,320.357329 C731.588551,324.248848 732.417879,333.113828 731.758626,340.040666 C724.234007,419.102486 691.675104,610.964674 675.110982,699.515267 C668.10208,736.984342 654.301336,749.547532 640.940618,750.777006 C611.904684,753.448938 589.856115,731.588035 561.733393,713.153237 C517.726886,684.306416 492.866009,666.349181 450.150074,638.200013 C400.78442,605.66878 432.786119,587.789048 460.919462,558.568563 C468.282091,550.921423 596.21508,434.556479 598.691227,424.000355 C599.00091,422.680135 599.288312,417.758981 596.36474,415.160431 C593.441168,412.561881 589.126229,413.450484 586.012448,414.157198 C581.598758,415.158943 511.297793,461.625274 375.109553,553.556189 C355.154858,567.258623 337.080515,573.934908 320.886524,573.585046 C303.033948,573.199351 268.692754,563.490928 243.163606,555.192408 C211.851067,545.013936 186.964484,539.632504 189.131547,522.346309 C190.260287,513.342589 202.659244,504.134509 226.328419,494.722069 Z"
           id="Path-3"

package/src/global-account/react/components/SignInWithB3/SignIn.tsx

@@ -44,7 +44,7 @@ export function SignIn(props: SignInWithB3Props) {
   const { data: walletImage } = useWalletImage(connectedEOAWallet?.id);
 
   const isMobile = useIsMobile();
-  const { logout } = useAuthentication(partnerId);
+  const { logout } = useAuthentication(partnerId, { skipAutoConnect: true });
   const onDisconnect = async (): Promise<void> => {
     await logout();
   };

package/src/global-account/react/components/SignInWithB3/SignInWithB3Flow.tsx

@@ -35,16 +35,23 @@ export function SignInWithB3Flow({
   signersEnabled = false,
 }: SignInWithB3ModalProps) {
   const { automaticallySetFirstEoa } = useB3Config();
-  const { user, logout } = useAuthentication(partnerId);
+  // skipAutoConnect: this component intentionally logs out on mount to show a fresh login screen.
+  // AuthenticationProvider is the sole owner of useAutoConnect to avoid competing auth cycles.
+  const { user, logout } = useAuthentication(partnerId, { skipAutoConnect: true });
 
-  // FIXME Logout before login to ensure a clean state
+  // Tracks whether the pre-login logout has finished.
+  // We must not render ConnectEmbed until logout (wallet disconnect) completes,
+  // otherwise the wallet state disrupts ConnectEmbed causing a blank modal.
+  const [readyToShowLogin, setReadyToShowLogin] = useState(source === "requestPermissions");
   const hasLoggedOutRef = useRef(false);
   useEffect(() => {
     if (hasLoggedOutRef.current) return;
     if (source !== "requestPermissions") {
       debug("Logging out before login");
-      logout();
       hasLoggedOutRef.current = true;
+      logout().finally(() => {
+        setReadyToShowLogin(true);
+      });
     }
   }, [source, logout]);
 
@@ -275,8 +282,9 @@ export function SignInWithB3Flow({
       </LoginStepContainer>
     );
   } else if (step === "login") {
-    // Show loading spinner
-    if (isAuthenticating || (isFetchingSigners && step === "login") || source === "requestPermissions") {
+    // Show loading spinner while: authenticating, waiting for pre-login logout to finish,
+    // or fetching signers.
+    if (!readyToShowLogin || isAuthenticating || isFetchingSigners) {
       content = (
         <LoginStepContainer partnerId={partnerId}>
           <div className="my-8 flex min-h-[350px] items-center justify-center">

package/src/global-account/react/components/SignInWithB3/SignInWithB3Privy.tsx

@@ -23,7 +23,7 @@ export function SignInWithB3Privy({ onSuccess, onError, chain }: SignInWithB3Pri
   const { isLoading, connectTw, fullToken } = useHandleConnectWithPrivy(chain, onSuccess);
   const setIsAuthenticating = useAuthStore(state => state.setIsAuthenticating);
   const setIsAuthenticated = useAuthStore(state => state.setIsAuthenticated);
-  const { logout } = useAuthentication(partnerId);
+  const { logout } = useAuthentication(partnerId, { skipAutoConnect: true });
 
   debug("@@SignInWithB3Privy", {
     isLoading,

package/src/global-account/react/components/SignInWithB3/steps/LoginStep.tsx

@@ -3,6 +3,7 @@ import { ecosystemWalletId } from "@b3dotfun/sdk/shared/constants";
 import { client } from "@b3dotfun/sdk/shared/utils/thirdweb";
 import { Chain } from "thirdweb";
 import { ConnectEmbed, darkTheme, lightTheme } from "thirdweb/react";
+import { useMemo } from "react";
 import { Account, ecosystemWallet, SingleStepAuthArgsType } from "thirdweb/wallets";
 /**
  * Props for the LoginStep component
@@ -49,42 +50,40 @@ export function LoginStepContainer({ children, partnerId }: LoginStepContainerPr
   );
 }
 
-export function LoginStep({ onSuccess, chain }: LoginStepProps) {
-  const { partnerId, theme } = useB3Config();
-  const wallet = ecosystemWallet(ecosystemWalletId, {
-    partnerId: partnerId,
-  });
-  const { onConnect } = useAuthentication(partnerId);
+/** Inner component that only mounts when partnerId is a non-empty string.
+ *  Keeps all hooks unconditional without calling useAuthentication(""). */
+function LoginStepContent({
+  onSuccess,
+  chain,
+  partnerId,
+  theme,
+}: {
+  onSuccess: (account: Account) => Promise<void>;
+  chain: Chain;
+  partnerId: string;
+  theme: string;
+}) {
+  const wallet = useMemo(() => ecosystemWallet(ecosystemWalletId, { partnerId }), [partnerId]);
+  // skipAutoConnect: AuthenticationProvider already owns the auto-connect instance.
+  // Creating another here would cause a second authentication cycle (another 401 attempt)
+  // that makes the modal flash between spinner and blank before finally showing the login form.
+  const { onConnect } = useAuthentication(partnerId, { skipAutoConnect: true });
 
   return (
     <LoginStepContainer partnerId={partnerId}>
       <ConnectEmbed
         showThirdwebBranding={false}
+        autoConnect={false}
         client={client}
         chain={chain}
         wallets={[wallet]}
         theme={
           theme === "light"
-            ? lightTheme({
-                colors: {
-                  modalBg: "hsl(var(--b3-react-background))",
-                },
-              })
-            : darkTheme({
-                colors: {
-                  modalBg: "hsl(var(--b3-react-background))",
-                },
-              })
+            ? lightTheme({ colors: { modalBg: "hsl(var(--b3-react-background))" } })
+            : darkTheme({ colors: { modalBg: "hsl(var(--b3-react-background))" } })
         }
-        style={{
-          width: "100%",
-          height: "100%",
-          border: 0,
-        }}
-        header={{
-          title: "Sign in with B3",
-          titleIcon: "https://cdn.b3.fun/b3_logo.svg",
-        }}
+        style={{ width: "100%", height: "100%", border: 0 }}
+        header={{ title: "Sign in with B3", titleIcon: "https://cdn.b3.fun/b3_logo.svg" }}
         className="b3-login-step"
         onConnect={async (wallet, allConnectedWallets) => {
           await onConnect(wallet, allConnectedWallets);
@@ -96,3 +95,14 @@ export function LoginStep({ onSuccess, chain }: LoginStepProps) {
     </LoginStepContainer>
   );
 }
+
+export function LoginStep({ onSuccess, chain }: LoginStepProps) {
+  const { partnerId, theme } = useB3Config();
+
+  // partnerId may be undefined during the brief B3Provider hydration window.
+  // Return null rather than rendering ConnectEmbed with an invalid ecosystem
+  // wallet config (which causes a blank screen).
+  if (!partnerId) return null;
+
+  return <LoginStepContent onSuccess={onSuccess} chain={chain} partnerId={partnerId} theme={theme} />;
+}

package/src/global-account/react/components/SignInWithB3/steps/LoginStepCustom.tsx

@@ -43,7 +43,7 @@ export function LoginStepCustom({
   const { connect } = useConnect(partnerId, chain);
   const setIsAuthenticating = useAuthStore(state => state.setIsAuthenticating);
   const setIsAuthenticated = useAuthStore(state => state.setIsAuthenticated);
-  const { logout } = useAuthentication(partnerId);
+  const { logout } = useAuthentication(partnerId, { skipAutoConnect: true });
   const { connect: connectTW } = useConnectTW();
 
   // Split strategies into auth and wallet types

package/src/global-account/react/hooks/useAuth.ts

@@ -18,7 +18,7 @@ import { Wallet, ecosystemWallet } from "thirdweb/wallets";
 import { preAuthenticate } from "thirdweb/wallets/in-app";
 import { useAccount, useConnect, useSwitchAccount } from "wagmi";
 import { LocalSDKContext } from "../components/B3Provider/LocalSDKProvider";
-import { createWagmiConfig } from "../utils/createWagmiConfig";
+import { getCachedWagmiConfig } from "../utils/createWagmiConfig";
 import { useSearchParam } from "./useSearchParamsSSR";
 import { useUserQuery } from "./useUserQuery";
 
@@ -47,7 +47,7 @@ export function useAuth() {
   const useAutoConnectLoadingPrevious = useRef(false);
   const referralCode = useSearchParam("referralCode");
   const { partnerId } = useB3Config();
-  const wagmiConfig = createWagmiConfig({ partnerId });
+  const wagmiConfig = getCachedWagmiConfig({ partnerId });
   const { connect } = useConnect();
   const activeWagmiAccount = useAccount();
   const { switchAccount } = useSwitchAccount();

package/src/global-account/react/hooks/useAuthentication.ts

@@ -24,11 +24,26 @@ import { useUserQuery } from "./useUserQuery";
 
 const debug = debugB3React("useAuthentication");
 
-export function useAuthentication(partnerId: string) {
+export function useAuthentication(partnerId: string, { skipAutoConnect = false }: { skipAutoConnect?: boolean } = {}) {
   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);
@@ -153,23 +168,39 @@ export function useAuthentication(partnerId: string) {
 
   const logout = useCallback(
     async (callback?: () => void) => {
-      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");
       }
@@ -179,6 +210,9 @@ export function useAuthentication(partnerId: string) {
 
       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?.();
 
@@ -186,34 +220,57 @@ export function useAuthentication(partnerId: string) {
         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: Wallet, allConnectedWallets: Wallet[]) => {
       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 {
         setIsAuthenticating(false);
@@ -229,6 +286,7 @@ export function useAuthentication(partnerId: string) {
       isAuthenticated,
       isAuthenticating,
       isConnected,
+      disconnect,
       setHasStartedConnecting,
       setIsConnected,
       setIsAuthenticating,
@@ -243,9 +301,13 @@ export function useAuthentication(partnerId: string) {
 
   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 });
       });
@@ -253,14 +315,17 @@ export function useAuthentication(partnerId: string) {
   });
 
   /**
-   * 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;
 

package/src/global-account/react/hooks/useGetAllTWSigners.tsx

@@ -130,7 +130,8 @@ export function useGetAllTWSigners({ chain, accountAddress, queryOptions }: UseG
       });
       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/src/global-account/react/stores/useModalStore.ts

@@ -712,6 +712,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;
 }
 
 /**
@@ -755,4 +759,6 @@ export const useModalStore = create<ModalState>(set => ({
     set(state => ({
       contentType: state.contentType ? { ...state.contentType, closable } : null,
     })),
+  personaActive: false,
+  setPersonaActive: (active: boolean) => set({ personaActive: active }),
 }));

package/src/global-account/react/utils/createWagmiConfig.tsx

@@ -38,3 +38,21 @@ export function createWagmiConfig(options: CreateWagmiConfigOptions) {
     connectors: finalConnectors,
   });
 }
+
+/** Module-level cache — wagmi configs must not be recreated on every render. */
+const wagmiConfigCache = new Map<string, ReturnType<typeof createWagmiConfig>>();
+
+/**
+ * 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: CreateWagmiConfigOptions) {
+  const key = options.partnerId;
+  let config = wagmiConfigCache.get(key);
+  if (!config) {
+    config = createWagmiConfig(options);
+    wagmiConfigCache.set(key, config);
+  }
+  return config;
+}