@b3dotfun/sdk 0.1.69-alpha.0 → 0.1.69-alpha.10

package/dist/esm/global-account/react/components/SignInWithB3/steps/LoginStepCustom.js

@@ -1,38 +1,52 @@
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { AuthButton, Button, getConnectOptionsFromStrategy, isWalletType, LoginStepContainer, useAuthentication, useAuthStore, useB3Config, useConnect, WalletRow, } from "../../../../../global-account/react/index.js";
+import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
+import { AuthButton, Button, getConnectOptionsFromStrategy, Input, isWalletType, LoginStepContainer, useAuthentication, useAuthStore, useB3Config, useConnect, WalletRow, } from "../../../../../global-account/react/index.js";
+import { ecosystemWalletId } from "../../../../../shared/constants/index.js";
 import { debugB3React } from "../../../../../shared/utils/debug.js";
 import { client } from "../../../../../shared/utils/thirdweb.js";
 import { useState } from "react";
-import { useConnect as useConnectTW } from "thirdweb/react";
-import { createWallet } from "thirdweb/wallets";
+import { useConnectedWallets, useConnect as useConnectTW } from "thirdweb/react";
+import { createWallet, preAuthenticate, } from "thirdweb/wallets";
 const debug = debugB3React("LoginStepCustom");
+const EMAIL_REGEX = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
 export function LoginStepCustom({ onSuccess, onError, chain, strategies, maxInitialWallets = 2, automaticallySetFirstEoa, }) {
     const { partnerId } = useB3Config();
     const [isLoading, setIsLoading] = useState(false);
     const [showAllWallets, setShowAllWallets] = useState(false);
+    const [showEmailFlow, setShowEmailFlow] = useState(false);
+    const [email, setEmail] = useState("");
+    const [verificationCode, setVerificationCode] = useState("");
+    const [emailCodeSent, setEmailCodeSent] = useState(false);
+    const [emailError, setEmailError] = useState(null);
     const { connect } = useConnect(partnerId, chain);
     const setIsAuthenticating = useAuthStore(state => state.setIsAuthenticating);
-    const setIsAuthenticated = useAuthStore(state => state.setIsAuthenticated);
-    const { logout } = useAuthentication(partnerId, { skipAutoConnect: true });
+    const { connect: onAuthConnect, logout } = useAuthentication(partnerId, { skipAutoConnect: true });
     const { connect: connectTW } = useConnectTW();
+    const connectedWallets = useConnectedWallets();
     // Split strategies into auth and wallet types
     const authStrategies = strategies.filter(s => !isWalletType(s));
     const walletStrategies = strategies.filter(isWalletType);
     const initialWallets = walletStrategies.slice(0, maxInitialWallets);
     const additionalWallets = walletStrategies.slice(maxInitialWallets);
-    const handleConnect = async (strategy) => {
+    const authGridColumns = Math.max(1, Math.min(authStrategies.length, 4));
+    const resetEmailFlow = () => {
+        setShowEmailFlow(false);
+        setEmailCodeSent(false);
+        setVerificationCode("");
+        setEmailError(null);
+    };
+    const connectWithOptions = async (strategy, options) => {
         try {
             setIsLoading(true);
             debug("setIsAuthenticating:true:3");
             setIsAuthenticating(true);
-            const options = getConnectOptionsFromStrategy(strategy);
             let connectResult;
-            if (automaticallySetFirstEoa) {
-                if (!options.wallet?.id) {
+            if (automaticallySetFirstEoa && isWalletType(strategy) && options.strategy === "wallet") {
+                const walletId = options.wallet?.id;
+                if (!walletId) {
                     throw new Error("Wallet ID is required");
                 }
                 connectResult = await connectTW(async () => {
-                    const wallet = createWallet(options.wallet?.id);
+                    const wallet = createWallet(walletId);
                     await wallet.connect({
                         client,
                     });
@@ -40,20 +54,27 @@ export function LoginStepCustom({ onSuccess, onError, chain, strategies, maxInit
                 });
             }
             else {
-                // @ts-expect-error we have custom strategies too and we also get things like "apple" isn't assignable to "wallet"
                 connectResult = await connect(options);
             }
             const account = connectResult?.getAccount();
             debug("@@connectResult", { connectResult, account, options });
-            if (!account)
+            if (!account || !connectResult)
                 throw new Error("Failed to connect");
+            const allConnectedWallets = connectedWallets.length > 0 && connectedWallets.some(wallet => wallet.id === connectResult.id)
+                ? connectedWallets
+                : [connectResult, ...connectedWallets.filter(wallet => wallet.id !== connectResult.id)];
+            await onAuthConnect(connectResult, allConnectedWallets);
             await onSuccess(account);
-            setIsAuthenticated(true);
+            if (strategy === "email") {
+                resetEmailFlow();
+            }
         }
         catch (error) {
+            if (strategy === "email") {
+                setEmailError(error instanceof Error ? error.message : "Failed to sign in with email");
+            }
             await onError?.(error);
             await logout();
-            setIsAuthenticated(false);
         }
         finally {
             setIsLoading(false);
@@ -61,8 +82,68 @@ export function LoginStepCustom({ onSuccess, onError, chain, strategies, maxInit
             setIsAuthenticating(false);
         }
     };
-    return (_jsxs(LoginStepContainer, { partnerId: partnerId, children: [authStrategies.length > 0 && (_jsx("div", { className: `mb-6 w-full ${authStrategies.length <= 3 ? "space-y-3 px-3" : "grid grid-cols-4 gap-4"}`, children: authStrategies.map(strategy => {
-                    console.log("strategy", strategy);
-                    return (_jsx(AuthButton, { strategy: strategy, onClick: () => handleConnect(strategy), isLoading: isLoading }, strategy));
-                }) })), _jsx("div", { className: "mb-4 w-full space-y-2", children: initialWallets.map(walletId => (_jsx(WalletRow, { walletId: walletId, onClick: () => handleConnect(walletId), isLoading: isLoading }, walletId))) }), additionalWallets.length > 0 && (_jsxs("div", { className: "w-full", children: [_jsx(Button, { onClick: () => setShowAllWallets(!showAllWallets), className: "mb-2 w-full bg-transparent text-gray-600 hover:bg-gray-100", children: showAllWallets ? "Show less" : "More options" }), showAllWallets && (_jsx("div", { className: "max-h-60 space-y-2 overflow-y-auto", children: additionalWallets.map(walletId => (_jsx(WalletRow, { walletId: walletId, onClick: () => handleConnect(walletId), isLoading: isLoading }, walletId))) }))] }))] }));
+    const handleConnect = async (strategy) => {
+        if (strategy === "email") {
+            setShowEmailFlow(true);
+            setEmailCodeSent(false);
+            setVerificationCode("");
+            setEmailError(null);
+            return;
+        }
+        const options = getConnectOptionsFromStrategy(strategy);
+        await connectWithOptions(strategy, options);
+    };
+    const handleSendEmailCode = async () => {
+        const normalizedEmail = email.trim().toLowerCase();
+        if (!normalizedEmail) {
+            setEmailError("Please enter your email address");
+            return;
+        }
+        if (!EMAIL_REGEX.test(normalizedEmail)) {
+            setEmailError("Please enter a valid email address");
+            return;
+        }
+        try {
+            setIsLoading(true);
+            setEmailError(null);
+            await preAuthenticate({
+                client,
+                strategy: "email",
+                email: normalizedEmail,
+                ecosystem: {
+                    id: ecosystemWalletId,
+                    partnerId,
+                },
+            });
+            setEmail(normalizedEmail);
+            setEmailCodeSent(true);
+        }
+        catch (error) {
+            setEmailError(error instanceof Error ? error.message : "Failed to send verification code");
+            await onError?.(error);
+        }
+        finally {
+            setIsLoading(false);
+        }
+    };
+    const handleEmailLogin = async () => {
+        const normalizedEmail = email.trim().toLowerCase();
+        const normalizedCode = verificationCode.trim();
+        if (!EMAIL_REGEX.test(normalizedEmail)) {
+            setEmailError("Please enter a valid email address");
+            return;
+        }
+        if (!normalizedCode) {
+            setEmailError("Please enter your verification code");
+            return;
+        }
+        await connectWithOptions("email", {
+            strategy: "email",
+            email: normalizedEmail,
+            verificationCode: normalizedCode,
+        });
+    };
+    return (_jsx(LoginStepContainer, { partnerId: partnerId, children: showEmailFlow ? (_jsxs("div", { className: "mb-6 w-full space-y-3 px-3", children: [_jsx("p", { className: "text-center text-sm font-medium text-gray-900 dark:text-gray-100", children: "Sign in with email" }), _jsx(Input, { type: "email", placeholder: "you@example.com", value: email, onChange: event => setEmail(event.target.value), disabled: isLoading || emailCodeSent }), emailCodeSent && (_jsx(Input, { type: "text", placeholder: "Enter verification code", value: verificationCode, onChange: event => setVerificationCode(event.target.value), disabled: isLoading })), emailError && _jsx("p", { className: "text-sm text-red-500", children: emailError }), _jsx(Button, { onClick: emailCodeSent ? handleEmailLogin : handleSendEmailCode, disabled: isLoading, className: "w-full", children: isLoading ? "Loading..." : emailCodeSent ? "Verify code" : "Send code" }), emailCodeSent && (_jsx(Button, { variant: "outline", onClick: handleSendEmailCode, disabled: isLoading, className: "w-full", children: "Resend code" })), _jsx(Button, { variant: "outline", onClick: resetEmailFlow, disabled: isLoading, className: "w-full", children: "Back" })] })) : (_jsxs(_Fragment, { children: [authStrategies.length > 0 && (_jsx("div", { className: `mb-6 grid w-full gap-4 px-3 ${authStrategies.length > 4 ? "grid-cols-4" : ""}`, style: authStrategies.length <= 4
+                        ? { gridTemplateColumns: `repeat(${authGridColumns}, minmax(0, 1fr))` }
+                        : undefined, children: authStrategies.map(strategy => (_jsx(AuthButton, { strategy: strategy, onClick: () => handleConnect(strategy), isLoading: isLoading }, strategy))) })), _jsx("div", { className: "mb-4 w-full space-y-2", children: initialWallets.map(walletId => (_jsx(WalletRow, { walletId: walletId, onClick: () => handleConnect(walletId), isLoading: isLoading }, walletId))) }), additionalWallets.length > 0 && (_jsxs("div", { className: "w-full", children: [_jsx(Button, { onClick: () => setShowAllWallets(!showAllWallets), className: "mb-2 w-full bg-transparent text-gray-600 hover:bg-gray-100", children: showAllWallets ? "Show less" : "More options" }), showAllWallets && (_jsx("div", { className: "max-h-60 space-y-2 overflow-y-auto", children: additionalWallets.map(walletId => (_jsx(WalletRow, { walletId: walletId, onClick: () => handleConnect(walletId), isLoading: isLoading }, walletId))) }))] }))] })) }));
 }

package/dist/esm/global-account/react/components/SignInWithB3/utils/signInUtils.d.ts

@@ -3,15 +3,17 @@ import { SingleStepAuthArgsType, Wallet } from "thirdweb/wallets";
 type WalletType = Wallet["id"];
 type StrategyType = SingleStepAuthArgsType["strategy"];
 type CustomStrategyType = "basement" | "privy";
-type AllowedStrategies = StrategyType | WalletType | CustomStrategyType;
-export declare const allowedStrategies: readonly ["apple", "google", "x", "discord", "guest", "walletConnect", "io.metamask", "com.coinbase.wallet", "basement", "privy"];
+type AllowedStrategies = StrategyType | WalletType | CustomStrategyType | "email";
+type NonWalletStrategyType = Exclude<AllowedStrategies, WalletType>;
+export declare const allowedStrategies: readonly ["apple", "google", "github", "x", "discord", "email", "guest", "walletConnect", "io.metamask", "com.coinbase.wallet", "basement", "privy"];
 export type AllowedStrategy = (typeof allowedStrategies)[number];
 export declare function isWalletType(strategy: AllowedStrategies): strategy is WalletType;
-export declare function isStrategyType(strategy: AllowedStrategies): strategy is StrategyType;
+export declare function isStrategyType(strategy: AllowedStrategies): strategy is NonWalletStrategyType;
 export declare function getConnectOptionsFromStrategy(strategy: AllowedStrategy): {
     strategy: StrategyType;
     wallet?: Wallet;
     chain?: Chain;
 };
 export declare const strategyIcons: Record<string, string>;
+export declare const strategyLabels: Record<string, string>;
 export {};

package/dist/esm/global-account/react/components/SignInWithB3/utils/signInUtils.js

@@ -5,9 +5,10 @@ export const allowedStrategies = [
     // Auth strategies
     "apple",
     "google",
+    "github",
     "x",
     "discord",
-    // "github",
+    "email",
     "guest",
     // Wallet IDs
     "walletConnect",
@@ -29,6 +30,9 @@ export function getConnectOptionsFromStrategy(strategy) {
     if (!allowedStrategies.includes(strategy)) {
         throw new Error(`Invalid strategy: ${strategy}`);
     }
+    if (strategy === "email") {
+        throw new Error("Email strategy requires OTP flow and cannot be connected in a single step");
+    }
     if (isWalletType(strategy)) {
         return { strategy: "wallet", wallet: createWallet(strategy) };
     }
@@ -45,6 +49,15 @@ export const strategyIcons = {
     guest: "https://cdn.b3.fun/incognito.svg",
     // Add more strategies as needed
 };
+export const strategyLabels = {
+    google: "Google",
+    x: "X",
+    discord: "Discord",
+    apple: "Apple",
+    guest: "Guest",
+    github: "GitHub",
+    email: "Email",
+};
 // Test it
 // console.log(getConnectOptionsFromStrategy("io.metamask"));
 // console.log(getConnectOptionsFromStrategy("google"));

package/dist/esm/global-account/react/components/Toast/ToastContext.d.ts

@@ -11,6 +11,9 @@ interface ToastContextType {
     addToast: (type: ToastType, message: string, duration?: number) => string;
     removeToast: (id: string) => void;
     clearAll: () => void;
+    headerMode: boolean;
+    setHeaderMode: (enabled: boolean) => void;
+    latestToast: ToastItem | null;
 }
 export declare function ToastProvider({ children }: {
     children: React.ReactNode;

package/dist/esm/global-account/react/components/Toast/ToastContext.js

@@ -4,6 +4,9 @@ const ToastContext = createContext(undefined);
 let globalToastCounter = 0;
 export function ToastProvider({ children }) {
     const [toasts, setToasts] = useState([]);
+    const [headerMode, setHeaderMode] = useState(false);
+    const headerModeRef = useRef(false);
+    const [latestToast, setLatestToast] = useState(null);
     const timeoutsRef = useRef(new Map());
     const removeToast = useCallback((id) => {
         setToasts(prev => prev.filter(toast => toast.id !== id));
@@ -22,12 +25,23 @@ export function ToastProvider({ children }) {
             duration,
             createdAt: Date.now(),
         };
-        setToasts(prev => [...prev, newToast]);
-        if (duration > 0) {
-            const timeout = setTimeout(() => {
-                removeToast(id);
-            }, duration);
-            timeoutsRef.current.set(id, timeout);
+        if (headerModeRef.current) {
+            setLatestToast(newToast);
+            if (duration > 0) {
+                const timeout = setTimeout(() => {
+                    setLatestToast(null);
+                }, duration);
+                timeoutsRef.current.set(id, timeout);
+            }
+        }
+        else {
+            setToasts(prev => [...prev, newToast]);
+            if (duration > 0) {
+                const timeout = setTimeout(() => {
+                    removeToast(id);
+                }, duration);
+                timeoutsRef.current.set(id, timeout);
+            }
         }
         return id;
     }, [removeToast]);
@@ -36,6 +50,15 @@ export function ToastProvider({ children }) {
         timeoutsRef.current.clear();
         setToasts([]);
     }, []);
+    const setHeaderModeCallback = useCallback((enabled) => {
+        setHeaderMode(enabled);
+        headerModeRef.current = enabled;
+        if (!enabled) {
+            setLatestToast(null);
+            timeoutsRef.current.forEach(timeout => clearTimeout(timeout));
+            timeoutsRef.current.clear();
+        }
+    }, []);
     // Cleanup on unmount
     useEffect(() => {
         const timeouts = timeoutsRef.current;
@@ -44,7 +67,7 @@ export function ToastProvider({ children }) {
             timeouts.clear();
         };
     }, []);
-    return _jsx(ToastContext.Provider, { value: { toasts, addToast, removeToast, clearAll }, children: children });
+    return (_jsx(ToastContext.Provider, { value: { toasts, addToast, removeToast, clearAll, headerMode, setHeaderMode: setHeaderModeCallback, latestToast }, children: children }));
 }
 export function useToastContext() {
     const context = useContext(ToastContext);

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

@@ -5,13 +5,13 @@ import { ecosystemWalletId } from "../../../shared/constants/index.js";
 import { debugB3React } from "../../../shared/utils/debug.js";
 import { client } from "../../../shared/utils/thirdweb.js";
 import { getConnectors } from "@wagmi/core";
-import { useCallback, useContext, useEffect, useRef } from "react";
+import { useCallback, useContext, useEffect, useMemo, useRef } from "react";
 import { useActiveWallet, useAutoConnect, useConnectedWallets, useDisconnect, useSetActiveWallet, } from "thirdweb/react";
 import { ecosystemWallet } from "thirdweb/wallets";
 import { preAuthenticate } from "thirdweb/wallets/in-app";
 import { useAccount, useConnect, useSwitchAccount } from "wagmi";
 import { LocalSDKContext } from "../components/B3Provider/LocalSDKProvider.js";
-import { getCachedWagmiConfig } from "../utils/createWagmiConfig.js";
+import { createWagmiConfig } from "../utils/createWagmiConfig.js";
 import { useSearchParam } from "./useSearchParamsSSR.js";
 import { useUserQuery } from "./useUserQuery.js";
 const debug = debugB3React("useAuth");
@@ -21,7 +21,7 @@ const debug = debugB3React("useAuth");
  * This hook provides 1:1 feature parity with useAuthentication.ts
  */
 export function useAuth() {
-    const { onConnectCallback } = useContext(LocalSDKContext);
+    const { onConnectCallback, disableBSMNTAuthentication } = useContext(LocalSDKContext);
     const { disconnect } = useDisconnect();
     const wallets = useConnectedWallets();
     const activeWallet = useActiveWallet();
@@ -38,7 +38,7 @@ export function useAuth() {
     const useAutoConnectLoadingPrevious = useRef(false);
     const referralCode = useSearchParam("referralCode");
     const { partnerId } = useB3Config();
-    const wagmiConfig = getCachedWagmiConfig({ partnerId });
+    const wagmiConfig = useMemo(() => createWagmiConfig({ partnerId }), [partnerId]);
     const { connect } = useConnect();
     const activeWagmiAccount = useAccount();
     const { switchAccount } = useSwitchAccount();
@@ -63,8 +63,10 @@ export function useAuth() {
             }
             // Authenticate with BSMNT
             try {
-                const b3Jwt = await authenticateWithB3JWT(response.accessToken);
-                debug("BSMNT re-authentication successful", b3Jwt);
+                if (!disableBSMNTAuthentication) {
+                    const b3Jwt = await authenticateWithB3JWT(response.accessToken);
+                    debug("BSMNT re-authentication successful", b3Jwt);
+                }
             }
             catch (bsmntError) {
                 // BSMNT authentication failure shouldn't block the main auth flow
@@ -76,7 +78,7 @@ export function useAuth() {
             debug("Re-authentication failed", err);
             throw err;
         }
-    }, [setUser]);
+    }, [setUser, disableBSMNTAuthentication]);
     const syncWagmi = useCallback(async () => {
         function syncWagmiFunc() {
             const connectors = getConnectors(wagmiConfig);
@@ -120,9 +122,7 @@ export function useAuth() {
             });
         }
         syncWagmiFunc();
-        // wagmi config shouldn't change
-        // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [partnerId, wallets]);
+    }, [wagmiConfig, wallets, connect, switchAccount]);
     useEffect(() => {
         syncWagmi();
     }, [wallets, syncWagmi]);
@@ -139,9 +139,11 @@ export function useAuth() {
             setIsAuthenticated(true);
             setIsAuthenticating(false);
             debug("Re-authenticated successfully", { userAuth });
-            // Authenticate on BSMNT with B3 JWT
-            const b3Jwt = await authenticateWithB3JWT(userAuth.accessToken);
-            debug("@@b3Jwt", b3Jwt);
+            if (!disableBSMNTAuthentication) {
+                // Authenticate on BSMNT with B3 JWT
+                const b3Jwt = await authenticateWithB3JWT(userAuth.accessToken);
+                debug("@@b3Jwt", b3Jwt);
+            }
             return userAuth;
         }
         catch (error) {
@@ -151,7 +153,14 @@ export function useAuth() {
             setIsAuthenticating(false);
             throw new Error("Authentication required. Please authenticate.");
         }
-    }, [reAuthenticate, setIsAuthenticated, setIsAuthenticating, setUser, setHasStartedConnecting]);
+    }, [
+        reAuthenticate,
+        setIsAuthenticated,
+        setIsAuthenticating,
+        setUser,
+        setHasStartedConnecting,
+        disableBSMNTAuthentication,
+    ]);
     /**
      * Authenticate with B3
      *
@@ -181,8 +190,10 @@ export function useAuth() {
             }
             // Step 3: Authenticate with BSMNT for basement integration
             try {
-                const b3Jwt = await authenticateWithB3JWT(response.accessToken);
-                debug("BSMNT authentication successful", b3Jwt);
+                if (!disableBSMNTAuthentication) {
+                    const b3Jwt = await authenticateWithB3JWT(response.accessToken);
+                    debug("BSMNT authentication successful", b3Jwt);
+                }
             }
             catch (bsmntError) {
                 // BSMNT authentication failure shouldn't block the main auth flow
@@ -194,7 +205,7 @@ export function useAuth() {
             debug("Authentication failed", err);
             throw err;
         }
-    }, [referralCode, setUser]);
+    }, [referralCode, setUser, disableBSMNTAuthentication]);
     /**
      * Handle wallet connection
      */

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

@@ -5,7 +5,7 @@ import { ecosystemWalletId } from "../../../shared/constants/index.js";
 import { debugB3React } from "../../../shared/utils/debug.js";
 import { client } from "../../../shared/utils/thirdweb.js";
 import { getConnectors } from "@wagmi/core";
-import { useCallback, useContext, useEffect, useRef } from "react";
+import { useCallback, useContext, useEffect, useMemo, useRef } from "react";
 import { useActiveWallet, useAutoConnect, useConnectedWallets, useDisconnect, useSetActiveWallet, } from "thirdweb/react";
 import { ecosystemWallet } from "thirdweb/wallets";
 import { preAuthenticate } from "thirdweb/wallets/in-app";
@@ -16,7 +16,7 @@ import { useTWAuth } from "./useTWAuth.js";
 import { useUserQuery } from "./useUserQuery.js";
 const debug = debugB3React("useAuthentication");
 export function useAuthentication(partnerId, { skipAutoConnect = false } = {}) {
-    const { onConnectCallback, onLogoutCallback } = useContext(LocalSDKContext);
+    const { onConnectCallback, onLogoutCallback, disableBSMNTAuthentication } = useContext(LocalSDKContext);
     const { disconnect } = useDisconnect();
     const wallets = useConnectedWallets();
     // Keep refs so logout() always disconnects current wallets, not stale closure values.
@@ -48,7 +48,7 @@ export function useAuthentication(partnerId, { skipAutoConnect = false } = {}) {
     const { authenticate } = useTWAuth();
     const { user, setUser } = useUserQuery();
     const useAutoConnectLoadingPrevious = useRef(false);
-    const wagmiConfig = createWagmiConfig({ partnerId });
+    const wagmiConfig = useMemo(() => createWagmiConfig({ partnerId }), [partnerId]);
     const { connect } = useConnect();
     const activeWagmiAccount = useAccount();
     const { switchAccount } = useSwitchAccount();
@@ -99,9 +99,7 @@ export function useAuthentication(partnerId, { skipAutoConnect = false } = {}) {
             });
         }
         syncWagmiFunc();
-        // wagmi config shouldn't change
-        // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [partnerId, wallets]);
+    }, [wagmiConfig, wallets, connect, switchAccount]);
     useEffect(() => {
         syncWagmi();
     }, [wallets, syncWagmi]);
@@ -121,9 +119,11 @@ export function useAuthentication(partnerId, { skipAutoConnect = false } = {}) {
             setIsAuthenticated(true);
             setIsAuthenticating(false);
             debug("Re-authenticated successfully", { userAuth });
-            // Authenticate on BSMNT with B3 JWT
-            const b3Jwt = await authenticateWithB3JWT(userAuth.accessToken);
-            debug("@@b3Jwt", b3Jwt);
+            if (!disableBSMNTAuthentication) {
+                // Authenticate on BSMNT with B3 JWT
+                const b3Jwt = await authenticateWithB3JWT(userAuth.accessToken);
+                debug("@@b3Jwt", b3Jwt);
+            }
             return userAuth;
         }
         catch (error) {
@@ -134,12 +134,23 @@ export function useAuthentication(partnerId, { skipAutoConnect = false } = {}) {
             setIsAuthenticated(true);
             setIsAuthenticating(false);
             debug("Fresh authentication successful", { userAuth });
-            // Authenticate on BSMNT with B3 JWT
-            const b3Jwt = await authenticateWithB3JWT(userAuth.accessToken);
-            debug("@@b3Jwt", b3Jwt);
+            if (!disableBSMNTAuthentication) {
+                // Authenticate on BSMNT with B3 JWT
+                const b3Jwt = await authenticateWithB3JWT(userAuth.accessToken);
+                debug("@@b3Jwt", b3Jwt);
+            }
             return userAuth;
         }
-    }, [activeWallet, partnerId, authenticate, setIsAuthenticated, setIsAuthenticating, setUser, setHasStartedConnecting]);
+    }, [
+        activeWallet,
+        partnerId,
+        authenticate,
+        setIsAuthenticated,
+        setIsAuthenticating,
+        setUser,
+        setHasStartedConnecting,
+        disableBSMNTAuthentication,
+    ]);
     const logout = useCallback(async (callback) => {
         // Disconnect ecosystem/smart wallets from the connected wallets list.
         // EOA wallets (MetaMask, Coinbase Wallet) are left in the list so they can

package/dist/esm/global-account/react/hooks/useAutoSelectWallet.d.ts

@@ -1,7 +1,10 @@
+import { EIP1193 } from "thirdweb/wallets";
 /**
- * Hook to automatically select the first EOA wallet when user is authenticated
- * Only auto-selects if the last auth was via wallet or no previous auth provider
+ * Hook to automatically connect a default EOA provider (if given) and
+ * select the first EOA wallet when user is authenticated.
+ * Only auto-selects if the last auth was via wallet or no previous auth provider.
  */
-export declare function useAutoSelectWallet({ enabled }: {
+export declare function useAutoSelectWallet({ enabled, defaultEoaProvider, }: {
     enabled: boolean;
+    defaultEoaProvider?: EIP1193.EIP1193Provider;
 }): void;

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

@@ -1,16 +1,44 @@
+import { client } from "../../../shared/utils/thirdweb.js";
 import { debugB3React } from "../../../shared/utils/debug.js";
-import { useCallback, useEffect } from "react";
-import { getLastAuthProvider, useConnectedWallets, useSetActiveWallet } from "thirdweb/react";
+import { useCallback, useEffect, useRef } from "react";
+import { getLastAuthProvider, useAddConnectedWallet, useConnectedWallets, useSetActiveWallet } from "thirdweb/react";
+import { EIP1193 } from "thirdweb/wallets";
 import { useAuthStore } from "../stores/index.js";
 const debug = debugB3React("useAutoSelectWallet");
 /**
- * Hook to automatically select the first EOA wallet when user is authenticated
- * Only auto-selects if the last auth was via wallet or no previous auth provider
+ * Hook to automatically connect a default EOA provider (if given) and
+ * select the first EOA wallet when user is authenticated.
+ * Only auto-selects if the last auth was via wallet or no previous auth provider.
  */
-export function useAutoSelectWallet({ enabled }) {
+export function useAutoSelectWallet({ enabled, defaultEoaProvider, }) {
     const isAuthenticated = useAuthStore(state => state.isAuthenticated);
     const wallets = useConnectedWallets();
     const setActiveWallet = useSetActiveWallet();
+    const addConnectedWallet = useAddConnectedWallet();
+    const hasConnectedProvider = useRef(false);
+    // Auto-connect the default EOA provider (e.g. Farcaster frame wallet) on mount.
+    // Uses useAddConnectedWallet instead of useConnect so the wallet is added to
+    // connectedWallets WITHOUT becoming the active wallet. This prevents
+    // useAuthentication's logout/onTimeout from disconnecting it (logout only
+    // disconnects ecosystem wallets and the active wallet).
+    useEffect(() => {
+        if (!defaultEoaProvider || hasConnectedProvider.current)
+            return;
+        hasConnectedProvider.current = true;
+        const connectDefaultProvider = async () => {
+            try {
+                const wallet = EIP1193.fromProvider({ provider: defaultEoaProvider });
+                await wallet.connect({ client });
+                addConnectedWallet(wallet);
+                debug("Auto-connected default EOA provider", wallet.id);
+            }
+            catch (error) {
+                debug("Failed to auto-connect default EOA provider", error);
+                hasConnectedProvider.current = false;
+            }
+        };
+        connectDefaultProvider();
+    }, [defaultEoaProvider, addConnectedWallet]);
     const setWallet = useCallback((wallet) => {
         debug("@@setWallet", wallet.id, wallet.getAccount()?.address);
         setActiveWallet(wallet);

package/dist/esm/global-account/react/hooks/useConnect.d.ts

@@ -1,9 +1,9 @@
 import { Chain } from "thirdweb";
-import { SingleStepAuthArgsType } from "thirdweb/wallets";
+import { MultiStepAuthArgsType, SingleStepAuthArgsType } from "thirdweb/wallets";
 /**
  * This hook is used to connect to a wallet using the thirdweb client.
  */
 export declare function useConnect(partnerId: string, chain?: Chain): {
-    connect: (strategyOptions?: SingleStepAuthArgsType) => Promise<import("thirdweb/wallets").Wallet | null>;
+    connect: (strategyOptions?: MultiStepAuthArgsType | SingleStepAuthArgsType) => Promise<import("thirdweb/wallets").Wallet | null>;
     isLoading: boolean;
 };

package/dist/esm/global-account/react/hooks/useFirstEOA.d.ts

@@ -7451,8 +7451,10 @@ export declare function useFirstEOA(chain?: {
             [x: `bool[${string}]`]: undefined;
             [x: `bytes[${string}]`]: undefined;
             [x: `bytes1[${string}]`]: undefined;
-            [x: `bytes4[${string}]`]: undefined;
+            [x: `bytes7[${string}]`]: undefined;
+            [x: `bytes14[${string}]`]: undefined;
             [x: `bytes30[${string}]`]: undefined;
+            [x: `bytes5[${string}]`]: undefined;
             [x: `bytes18[${string}]`]: undefined;
             [x: `bytes6[${string}]`]: undefined;
             [x: `bytes9[${string}]`]: undefined;
@@ -7460,12 +7462,10 @@ export declare function useFirstEOA(chain?: {
             [x: `bytes10[${string}]`]: undefined;
             [x: `bytes2[${string}]`]: undefined;
             [x: `bytes3[${string}]`]: undefined;
-            [x: `bytes5[${string}]`]: undefined;
-            [x: `bytes7[${string}]`]: undefined;
+            [x: `bytes4[${string}]`]: undefined;
             [x: `bytes11[${string}]`]: undefined;
             [x: `bytes12[${string}]`]: undefined;
             [x: `bytes13[${string}]`]: undefined;
-            [x: `bytes14[${string}]`]: undefined;
             [x: `bytes15[${string}]`]: undefined;
             [x: `bytes16[${string}]`]: undefined;
             [x: `bytes17[${string}]`]: undefined;
@@ -7553,8 +7553,10 @@ export declare function useFirstEOA(chain?: {
             bool?: undefined;
             bytes?: undefined;
             bytes1?: undefined;
-            bytes4?: undefined;
+            bytes7?: undefined;
+            bytes14?: undefined;
             bytes30?: undefined;
+            bytes5?: undefined;
             bytes18?: undefined;
             bytes6?: undefined;
             bytes9?: undefined;
@@ -7562,12 +7564,10 @@ export declare function useFirstEOA(chain?: {
             bytes10?: undefined;
             bytes2?: undefined;
             bytes3?: undefined;
-            bytes5?: undefined;
-            bytes7?: undefined;
+            bytes4?: undefined;
             bytes11?: undefined;
             bytes12?: undefined;
             bytes13?: undefined;
-            bytes14?: undefined;
             bytes15?: undefined;
             bytes16?: undefined;
             bytes17?: undefined;

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

@@ -10,7 +10,6 @@ import { useSearchParam } from "./useSearchParamsSSR.js";
  * @deprecated Use useAuth() instead
  */
 export function useTWAuth() {
-    console.warn("useTWAuth is deprecated. Please migrate to useAuth() for authentication.");
     const referralCode = useSearchParam("referralCode");
     const authenticate = useCallback(async (wallet, partnerId) => {
         if (!wallet || !wallet?.getAuthToken?.())