@b3dotfun/sdk 0.0.87-alpha.2 → 0.0.87-alpha.3

package/dist/esm/global-account/react/components/B3Provider/B3Provider.js

@@ -1,19 +1,18 @@
-import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
-import { RelayKitProviderWrapper, TooltipProvider, useAuthentication, useAuthStore, } from "../../../../global-account/react/index.js";
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { RelayKitProviderWrapper, TooltipProvider, useAuthStore } from "../../../../global-account/react/index.js";
+import { useAutoSelectWallet } from "../../../../global-account/react/hooks/useAutoSelectWallet.js";
 import { createWagmiConfig } from "../../../../global-account/react/utils/createWagmiConfig.js";
 import { loadGA4Script } from "../../../../global-account/utils/analytics.js";
-import { debugB3React } from "../../../../shared/utils/debug.js";
 import "@relayprotocol/relay-kit-ui/styles.css";
 import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
-import { useCallback, useEffect, useMemo, useState } from "react";
-import { getLastAuthProvider, ThirdwebProvider, useActiveAccount, useConnectedWallets, useSetActiveWallet, } from "thirdweb/react";
+import { useEffect, useMemo } from "react";
+import { ThirdwebProvider, useActiveAccount } from "thirdweb/react";
 import { WagmiProvider } from "wagmi";
 import { setClientType } from "../../../client-manager.js";
 import { StyleRoot } from "../StyleRoot.js";
 import { setToastContext, ToastProvider, useToastContext } from "../Toast/index.js";
 import { LocalSDKProvider } from "./LocalSDKProvider.js";
 import { B3Context } from "./types.js";
-const debug = debugB3React("B3Provider");
 /**
  * Default permissions configuration for B3 provider
  */
@@ -47,52 +46,26 @@ toaster: _toaster, clientType = "rest", rpcUrls, partnerId, stripePublishableKey
  */
 export function InnerProvider({ children, accountOverride, environment, defaultPermissions = DEFAULT_PERMISSIONS, automaticallySetFirstEoa, theme = "light", clientType = "socket", partnerId, stripePublishableKey, createClientReferenceId, enableTurnkey, }) {
     const activeAccount = useActiveAccount();
-    const [manuallySelectedWallet, setManuallySelectedWallet] = useState(undefined);
-    const wallets = useConnectedWallets();
     const isAuthenticated = useAuthStore(state => state.isAuthenticated);
-    const isConnected = useAuthStore(state => state.isConnected);
-    const justCompletedLogin = useAuthStore(state => state.justCompletedLogin);
-    const setActiveWallet = useSetActiveWallet();
-    const { user, setUser, refetchUser } = useAuthentication(partnerId);
-    debug("@@B3Provider:isConnected", isConnected);
-    debug("@@wallets", wallets);
-    debug("@@B3Provider:user", user);
-    debug("@@B3Provider:justCompletedLogin", justCompletedLogin);
+    //const isConnected = useAuthStore(state => state.isConnected);
+    //const justCompletedLogin = useAuthStore(state => state.justCompletedLogin);
     // Use given accountOverride or activeAccount from thirdweb
+    // WOJ: why if isAuthenticated is false, we don't use activeAccount, which should be undefined?
+    // skip isAuthenticated check ?
     const effectiveAccount = isAuthenticated ? accountOverride || activeAccount : undefined;
-    const setWallet = useCallback((wallet) => {
-        setManuallySelectedWallet(wallet);
-        const account = wallet.getAccount();
-        debug("@@setWallet", wallet.id, account?.address);
-        setActiveWallet(wallet);
-    }, [setManuallySelectedWallet, setActiveWallet]);
-    useEffect(() => {
-        const autoSelectFirstEOAWallet = async () => {
-            // Only proceed if auto-selection is enabled and user is authenticated
-            if (!automaticallySetFirstEoa || !isAuthenticated) {
-                return;
-            }
-            // Find the first EOA wallet (excluding ecosystem wallets)
-            const isEOAWallet = (wallet) => !wallet.id.startsWith("ecosystem.");
-            const firstEOAWallet = wallets.find(isEOAWallet);
-            if (firstEOAWallet) {
-                // Only auto-select if the last auth was via wallet or no previous auth provider
-                const lastAuthProvider = await getLastAuthProvider();
-                const shouldAutoSelect = lastAuthProvider === null || lastAuthProvider === "wallet";
-                if (shouldAutoSelect) {
-                    setWallet(firstEOAWallet);
-                }
-            }
-        };
-        autoSelectFirstEOAWallet();
-    }, [automaticallySetFirstEoa, isAuthenticated, setWallet, wallets]);
+    // Wrapper to set active wallet via thirdweb
+    // Note: `wallet` in context is deprecated - use useActiveWallet() from thirdweb/react instead
+    // Auto-select first EOA wallet when enabled
+    useAutoSelectWallet({
+        enabled: automaticallySetFirstEoa,
+    });
     return (_jsx(B3Context.Provider, { value: {
             account: effectiveAccount,
-            setWallet,
-            wallet: manuallySelectedWallet,
-            user,
-            setUser,
-            refetchUser,
+            // setWallet,
+            //wallet: undefined, // Deprecated: use useActiveWallet() from thirdweb/react instead
+            //user,
+            //setUser,
+            //refetchUser,
             initialized: true,
             ready: !!effectiveAccount,
             automaticallySetFirstEoa,
@@ -104,11 +77,8 @@ export function InnerProvider({ children, accountOverride, environment, defaultP
             stripePublishableKey,
             createClientReferenceId,
             enableTurnkey,
-        }, children: _jsx(InnerProvider2, { children: children }) }));
+        }, children: children }));
 }
-const InnerProvider2 = ({ children }) => {
-    return _jsx(_Fragment, { children: children });
-};
 /**
  * Component to connect the toast context to the global toast API
  */

package/dist/esm/global-account/react/components/B3Provider/B3Provider.native.js

@@ -2,7 +2,6 @@ import { jsx as _jsx } from "react/jsx-runtime";
 import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
 import { ThirdwebProvider, useActiveAccount } from "thirdweb/react";
 import { WagmiProvider } from "wagmi";
-import { useAuthentication } from "../../hooks/useAuthentication.js";
 import { createWagmiConfig } from "../../utils/createWagmiConfig.js";
 import { LocalSDKProvider } from "./LocalSDKProvider.js";
 import { B3Context } from "./types.js";
@@ -28,17 +27,17 @@ export function B3Provider({ theme = "light", children, accountOverride, environ
  */
 export function InnerProvider({ children, accountOverride, environment, defaultPermissions = DEFAULT_PERMISSIONS, theme = "light", clientType = "socket", partnerId, rpcUrls, }) {
     const activeAccount = useActiveAccount();
-    const { user, setUser, refetchUser } = useAuthentication(partnerId);
+    //const { user, setUser, refetchUser } = useAuthentication(partnerId);
     const wagmiConfig = createWagmiConfig({ partnerId, rpcUrls });
     // Use given accountOverride or activeAccount from thirdweb
     const effectiveAccount = accountOverride || activeAccount;
     return (_jsx(WagmiProvider, { config: wagmiConfig, children: _jsx(QueryClientProvider, { client: queryClient, children: _jsx(B3Context.Provider, { value: {
-                    account: effectiveAccount,
+                    //account: effectiveAccount,
                     automaticallySetFirstEoa: false,
-                    setWallet: () => { },
+                    //setWallet: () => {},
                     wallet: undefined,
-                    user,
-                    setUser,
+                    //user,
+                    //setUser,
                     initialized: true,
                     ready: !!effectiveAccount,
                     environment,
@@ -46,6 +45,6 @@ export function InnerProvider({ children, accountOverride, environment, defaultP
                     theme,
                     clientType,
                     partnerId,
-                    refetchUser,
+                    //refetchUser,
                 }, children: children }) }) }));
 }

package/dist/esm/global-account/react/components/B3Provider/types.d.ts

@@ -1,4 +1,3 @@
-import { Users } from "@b3dotfun/b3-api";
 import { CreateOnrampOrderParams } from "../../../../anyspend/react/hooks/useAnyspendCreateOnrampOrder";
 import { CreateOrderParams } from "../../../../anyspend/react/hooks/useAnyspendCreateOrder";
 import { PermissionsConfig } from "../../../../global-account/types/permissions";
@@ -10,11 +9,7 @@ import { ClientType } from "../../../client-manager";
 export interface B3ContextType {
     account?: Account;
     automaticallySetFirstEoa: boolean;
-    user?: Users;
-    setWallet: (wallet: Wallet) => void;
     wallet?: Wallet;
-    setUser: (user?: Users) => void;
-    refetchUser: () => Promise<any>;
     initialized: boolean;
     ready: boolean;
     environment?: "development" | "production";

package/dist/esm/global-account/react/components/B3Provider/types.js

@@ -5,11 +5,11 @@ import { createContext } from "react";
 export const B3Context = createContext({
     account: undefined,
     automaticallySetFirstEoa: false,
-    user: undefined,
-    setWallet: () => { },
+    //user: undefined,
+    //setWallet: () => {},
     wallet: undefined,
-    setUser: () => { },
-    refetchUser: async () => { },
+    //setUser: () => {},
+    //refetchUser: async () => {},
     initialized: false,
     ready: false,
     environment: "development",

package/dist/esm/global-account/react/components/B3Provider/useB3.d.ts

@@ -1,5 +1,6 @@
 /**
  * Hook to access the B3 context
  * @throws Error if used outside a B3Provider
+ * @deprecated Use useB3Config or useB3Account instead
  */
 export declare function useB3(): import("./types").B3ContextType;

package/dist/esm/global-account/react/components/B3Provider/useB3.js

@@ -3,6 +3,7 @@ import { B3Context } from "./types.js";
 /**
  * Hook to access the B3 context
  * @throws Error if used outside a B3Provider
+ * @deprecated Use useB3Config or useB3Account instead
  */
 export function useB3() {
     const context = useContext(B3Context);

package/dist/esm/global-account/react/components/B3Provider/useB3Account.d.ts

@@ -0,0 +1 @@
+export declare const useB3Account: () => import("thirdweb/wallets").Account | undefined;

package/dist/esm/global-account/react/components/B3Provider/useB3Account.js

@@ -0,0 +1,6 @@
+import { useActiveAccount } from "thirdweb/react";
+// Wrapper around useActiveAccount
+export const useB3Account = () => {
+    const account = useActiveAccount();
+    return account;
+};

package/dist/esm/global-account/react/components/B3Provider/useB3Config.d.ts

@@ -0,0 +1,9 @@
+export declare const useB3Config: () => {
+    automaticallySetFirstEoa: boolean;
+    environment: "development" | "production" | undefined;
+    theme: "light" | "dark";
+    clientType: import("../../../client-manager").ClientType;
+    partnerId: string;
+    createClientReferenceId: ((params: import("../../../../anyspend/react").CreateOrderParams | import("../../../../anyspend/react").CreateOnrampOrderParams) => Promise<string>) | undefined;
+    enableTurnkey: boolean | undefined;
+};

package/dist/esm/global-account/react/components/B3Provider/useB3Config.js

@@ -0,0 +1,19 @@
+import { useContext, useMemo } from "react";
+import { B3Context } from "./types.js";
+export const useB3Config = () => {
+    const context = useContext(B3Context);
+    if (!context) {
+        throw new Error("useB3 must be used within a B3Provider");
+    }
+    const { automaticallySetFirstEoa, environment, theme, clientType, partnerId, createClientReferenceId, enableTurnkey, } = context;
+    // Return a stable reference
+    return useMemo(() => ({
+        automaticallySetFirstEoa,
+        environment,
+        theme,
+        clientType,
+        partnerId,
+        createClientReferenceId,
+        enableTurnkey,
+    }), [automaticallySetFirstEoa, environment, theme, clientType, partnerId, createClientReferenceId, enableTurnkey]);
+};

package/dist/esm/global-account/react/components/LinkAccount/LinkAccount.js

@@ -1,6 +1,6 @@
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import app from "../../../../global-account/app.js";
-import { Button, toast, useB3, useModalStore, useQueryB3, } from "../../../../global-account/react/index.js";
+import { Button, toast, useAuthentication, useModalStore, useQueryB3, } from "../../../../global-account/react/index.js";
 import { client } from "../../../../shared/utils/thirdweb.js";
 import { Copy, Loader2, Pencil } from "lucide-react";
 import { useEffect, useRef, useState } from "react";
@@ -17,7 +17,7 @@ export const LinkAccount = ({ partnerId, onLogout: _onLogout, chain, }) => {
     const isLinking = useModalStore(state => state.isLinking);
     const setB3ModalOpen = useModalStore(state => state.setB3ModalOpen);
     const contentType = useModalStore(state => state.contentType);
-    const { user, setUser } = useB3();
+    const { user, setUser } = useAuthentication(partnerId);
     const [isUpdatingCode, setIsUpdatingCode] = useState(false);
     const [newReferralCode, setNewReferralCode] = useState("");
     const [isEditingCode, setIsEditingCode] = useState(false);

package/dist/esm/global-account/react/components/LinkAccount/LinkNewAccount.js

@@ -1,6 +1,6 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import app from "../../../../global-account/app.js";
-import { toast } from "../../../../global-account/react/index.js";
+import { toast, useB3Account } from "../../../../global-account/react/index.js";
 import { ecosystemWalletId } from "../../../../shared/constants/index.js";
 import { thirdwebB3Mainnet } from "../../../../shared/constants/chains/b3Chain.js";
 import { client } from "../../../../shared/utils/thirdweb.js";
@@ -11,7 +11,6 @@ import { createWallet, preAuthenticate } from "thirdweb/wallets";
 import { WalletRow } from "../../index.js";
 import { useModalStore } from "../../stores/useModalStore.js";
 import { getProfileDisplayInfo } from "../../utils/profileDisplay.js";
-import { useB3 } from "../B3Provider/useB3.js";
 import { AppleIcon } from "../icons/AppleIcon.js";
 import { DiscordIcon } from "../icons/DiscordIcon.js";
 import { FarcasterIcon } from "../icons/FarcasterIcon.js";
@@ -90,7 +89,7 @@ export function LinkNewAccount({ onSuccess: onSuccessCallback, onError, onClose,
         ...getProfileDisplayInfo(profile),
         originalProfile: profile,
     }));
-    const { account } = useB3();
+    const account = useB3Account();
     const { mutate: linkProfile } = useLinkProfile();
     const onSuccess = useCallback(async () => {
         await onSuccessCallback?.();

package/dist/esm/global-account/react/components/ManageAccount/ProfileSection.js

@@ -1,5 +1,5 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { useAccountWallet, useB3, useModalStore, useProfile, useSimBalance } from "../../../../global-account/react/index.js";
+import { useAccountWallet, useAuthentication, useB3Config, useModalStore, useProfile, useSimBalance, } from "../../../../global-account/react/index.js";
 import { formatUsername } from "../../../../shared/utils/index.js";
 import { formatDisplayNumber } from "../../../../shared/utils/number.js";
 import { Pencil } from "lucide-react";
@@ -15,7 +15,8 @@ const ProfileSection = () => {
         address: eoaAddress || account?.address,
         fresh: true,
     });
-    const { user } = useB3();
+    const { partnerId } = useB3Config();
+    const { user } = useAuthentication(partnerId);
     const setB3ModalOpen = useModalStore(state => state.setB3ModalOpen);
     const setB3ModalContentType = useModalStore(state => state.setB3ModalContentType);
     const navigateBack = useModalStore(state => state.navigateBack);

package/dist/esm/global-account/react/components/ManageAccount/SettingsProfileCard.js

@@ -1,7 +1,7 @@
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import { ens_normalize } from "@adraffy/ens-normalize";
 import app from "../../../../global-account/app.js";
-import { toast, useB3, useModalStore, useProfile } from "../../../../global-account/react/index.js";
+import { toast, useAuthentication, useB3Config, useModalStore, useProfile } from "../../../../global-account/react/index.js";
 import { formatUsername } from "../../../../shared/utils/index.js";
 import { Check, Loader2, Pencil, X } from "lucide-react";
 import { useEffect, useRef, useState } from "react";
@@ -15,7 +15,8 @@ const SettingsProfileCard = () => {
         address: eoaAddress || account?.address,
         fresh: true,
     });
-    const { user, setUser } = useB3();
+    const { partnerId } = useB3Config();
+    const { user, setUser } = useAuthentication(partnerId);
     const setB3ModalOpen = useModalStore(state => state.setB3ModalOpen);
     const setB3ModalContentType = useModalStore(state => state.setB3ModalContentType);
     const navigateBack = useModalStore(state => state.navigateBack);

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

@@ -1,11 +1,12 @@
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
-import { Button, StyleRoot, useAuthStore, useB3, useIsMobile, useModalStore, } from "../../../../global-account/react/index.js";
+import { Button, StyleRoot, useAuthStore, useIsMobile, useModalStore, } from "../../../../global-account/react/index.js";
 import { useEffect } from "react";
+import { useB3Account } from "../B3Provider/useB3Account.js";
 import { ManageAccountButton } from "../custom/ManageAccountButton.js";
 import { Loading } from "../ui/Loading.js";
 export function SignInWithB3(props) {
     const { setB3ModalOpen, setB3ModalContentType, setEcoSystemAccountAddress } = useModalStore();
-    const { account } = useB3();
+    const account = useB3Account();
     const { isAuthenticating, isAuthenticated } = useAuthStore();
     const isMobile = useIsMobile();
     useEffect(() => {

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

@@ -1,5 +1,5 @@
 import { jsx as _jsx } from "react/jsx-runtime";
-import { Loading, useAuthStore, useB3, useGetAllTWSigners, useModalStore, } from "../../../../global-account/react/index.js";
+import { Loading, useAuthentication, useAuthStore, useB3Config, useGetAllTWSigners, useModalStore, } from "../../../../global-account/react/index.js";
 import { debugB3React } from "../../../../shared/utils/debug.js";
 import { useCallback, useEffect, useState } from "react";
 import { useActiveAccount } from "thirdweb/react";
@@ -13,7 +13,8 @@ const MAX_REFETCH_ATTEMPTS = 20;
  * Handles different login providers, authentication steps, and session key management
  */
 export function SignInWithB3Flow({ strategies, onLoginSuccess, onSessionKeySuccess, onError, chain, sessionKeyAddress, partnerId, closeAfterLogin = false, source = "signInWithB3Button", signersEnabled = false, }) {
-    const { automaticallySetFirstEoa, user, refetchUser, enableTurnkey } = useB3();
+    const { automaticallySetFirstEoa, enableTurnkey } = useB3Config();
+    const { user, refetchUser } = useAuthentication(partnerId);
     const [step, setStep] = useState(source === "requestPermissions" ? null : "login");
     const [sessionKeyAdded, setSessionKeyAdded] = useState(source === "requestPermissions" ? true : false);
     const { setB3ModalContentType, setB3ModalOpen, isOpen, contentType } = useModalStore();

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

@@ -3,6 +3,8 @@ export { B3Provider, InnerProvider } from "./B3Provider/B3Provider";
 export { RelayKitProviderWrapper } from "./B3Provider/RelayKitProviderWrapper";
 export { B3Context, type B3ContextType } from "./B3Provider/types";
 export { useB3 } from "./B3Provider/useB3";
+export { useB3Account } from "./B3Provider/useB3Account";
+export { useB3Config } from "./B3Provider/useB3Config";
 export { StyleRoot } from "./StyleRoot";
 export { AuthButton } from "./SignInWithB3/components/AuthButton";
 export { PermissionItem } from "./SignInWithB3/components/PermissionItem";

package/dist/esm/global-account/react/components/index.js

@@ -5,6 +5,8 @@ export { B3Provider, InnerProvider } from "./B3Provider/B3Provider.js";
 export { RelayKitProviderWrapper } from "./B3Provider/RelayKitProviderWrapper.js";
 export { B3Context } from "./B3Provider/types.js";
 export { useB3 } from "./B3Provider/useB3.js";
+export { useB3Account } from "./B3Provider/useB3Account.js";
+export { useB3Config } from "./B3Provider/useB3Config.js";
 export { StyleRoot } from "./StyleRoot.js";
 // SignInWithB3 Components
 export { AuthButton } from "./SignInWithB3/components/AuthButton.js";

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

@@ -1,9 +1,10 @@
-import { useB3, useProfile } from "../../../global-account/react/index.js";
+import { useProfile } from "../../../global-account/react/index.js";
 import { ecosystemWalletId } from "../../../shared/constants/index.js";
 import { debugB3React } from "../../../shared/utils/debug.js";
 import { useEffect, useMemo, useState } from "react";
 import { getLastAuthProvider, useActiveWallet, useConnectedWallets, useWalletImage } from "thirdweb/react";
 import { socialIcons } from "thirdweb/wallets/in-app";
+import { useB3Account } from "../components/B3Provider/useB3Account.js";
 const debug = debugB3React("useAccountWallet");
 function useLastAuthProvider() {
     const [lastAuthProvider, setLastAuthProvider] = useState(null);
@@ -23,7 +24,7 @@ export function useAccountWallet() {
     // const effectiveAccount = isAuthenticated ? accountOverride || activeAccount : undefined;
     // can we possibly just use useActiveAccount here?
     // --------------------
-    const { account } = useB3();
+    const account = useB3Account();
     const activeWallet = useActiveWallet();
     const connectedWallets = useConnectedWallets();
     const connectedSmartWallet = connectedWallets.find(wallet => wallet.id === ecosystemWalletId);
@@ -71,7 +72,7 @@ export function useAccountWallet() {
     return res;
 }
 export function useAccountWalletImage() {
-    const { account } = useB3();
+    const account = useB3Account();
     const activeWallet = useActiveWallet();
     const connectedWallets = useConnectedWallets();
     const connectedSmartWallet = connectedWallets.find(wallet => wallet.id === ecosystemWalletId);

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

@@ -13,8 +13,8 @@ export declare function useAuthentication(partnerId: string): {
     onConnect: (_walleAutoConnectedWith: Wallet, allConnectedWallets: Wallet[]) => Promise<void>;
     user: {
         email?: string | undefined;
-        telNumber?: string | undefined;
         username?: string | undefined;
+        telNumber?: string | undefined;
         ens?: string | undefined;
         avatar?: string | undefined;
         preferences?: {} | undefined;

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

@@ -0,0 +1,7 @@
+/**
+ * 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
+ */
+export declare function useAutoSelectWallet({ enabled }: {
+    enabled: boolean;
+}): void;

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

@@ -0,0 +1,39 @@
+import { debugB3React } from "../../../shared/utils/debug.js";
+import { useCallback, useEffect } from "react";
+import { getLastAuthProvider, useConnectedWallets, useSetActiveWallet } from "thirdweb/react";
+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
+ */
+export function useAutoSelectWallet({ enabled }) {
+    const isAuthenticated = useAuthStore(state => state.isAuthenticated);
+    const wallets = useConnectedWallets();
+    const setActiveWallet = useSetActiveWallet();
+    const setWallet = useCallback((wallet) => {
+        debug("@@setWallet", wallet.id, wallet.getAccount()?.address);
+        setActiveWallet(wallet);
+    }, [setActiveWallet]);
+    useEffect(() => {
+        const autoSelectFirstEOAWallet = async () => {
+            // Only proceed if auto-selection is enabled and user is authenticated
+            if (!enabled || !isAuthenticated) {
+                return;
+            }
+            // Find the first EOA wallet (excluding ecosystem wallets)
+            const isEOAWallet = (wallet) => !wallet.id.startsWith("ecosystem.");
+            const firstEOAWallet = wallets.find(isEOAWallet);
+            if (firstEOAWallet) {
+                // Only auto-select if the last auth was via wallet or no previous auth provider
+                const lastAuthProvider = await getLastAuthProvider();
+                const shouldAutoSelect = lastAuthProvider === null || lastAuthProvider === "wallet";
+                if (shouldAutoSelect) {
+                    debug("Auto-selecting first EOA wallet", firstEOAWallet.id);
+                    setWallet(firstEOAWallet);
+                }
+            }
+        };
+        autoSelectFirstEOAWallet();
+    }, [enabled, isAuthenticated, setWallet, wallets]);
+}

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

@@ -1,8 +1,9 @@
+import { debugB3React } from "../../../shared/utils/debug.js";
+import { useCallback, useState } from "react";
 import app from "../../app.js";
+import { useB3Config } from "../components/index.js";
 import { useAuthStore } from "../stores/index.js";
-import { useCallback, useState } from "react";
-import { useB3 } from "../components/B3Provider/useB3.js";
-import { debugB3React } from "../../../shared/utils/debug.js";
+import { useAuthentication } from "./useAuthentication.js";
 const debug = debugB3React("useTurnkeyAuth");
 /**
  * Hook for Turnkey email-based OTP authentication
@@ -17,7 +18,8 @@ export function useTurnkeyAuth() {
     const [error, setError] = useState(null);
     const setIsAuthenticating = useAuthStore(state => state.setIsAuthenticating);
     const setIsAuthenticated = useAuthStore(state => state.setIsAuthenticated);
-    const { user } = useB3();
+    const { partnerId } = useB3Config();
+    const { user } = useAuthentication(partnerId);
     /**
      * Step 1: Initiate login with email
      * - Calls backend to create sub-org (if needed) and send OTP

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

@@ -8,7 +8,7 @@ import { useCallback, useState } from "react";
 import { prepareTransaction, sendTransaction as twSendTransaction } from "thirdweb";
 import { isAddress } from "viem";
 import { useSwitchChain } from "wagmi";
-import { useB3 } from "../components/index.js";
+import { useB3Account } from "../components/B3Provider/useB3Account.js";
 import { useAccountWallet } from "./useAccountWallet.js";
 const partnerId = String(process.env.PUBLIC_THIRDWEB_PARTNER_ID ||
     process.env.NEXT_PUBLIC_THIRDWEB_PARTNER_ID ||
@@ -19,7 +19,7 @@ export function useUnifiedChainSwitchAndExecute() {
     const { switchChainAsync } = useSwitchChain();
     const [isSwitchingOrExecuting, setIsSwitchingOrExecuting] = useState(false);
     const { isActiveSmartWallet, isActiveEOAWallet, connectedEOAWallet } = useAccountWallet();
-    const { account: aaAccount } = useB3();
+    const aaAccount = useB3Account();
     // Handle EOA wallet chain switch and execute transaction
     const handleEOASwitchChainAndSendTransaction = useCallback(async (targetChainId, params) => {
         if (!connectedEOAWallet) {

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

@@ -8,8 +8,8 @@ import { Users } from "@b3dotfun/b3-api";
 export declare function useUserQuery(): {
     user: {
         email?: string | undefined;
-        telNumber?: string | undefined;
         username?: string | undefined;
+        telNumber?: string | undefined;
         ens?: string | undefined;
         avatar?: string | undefined;
         preferences?: {} | undefined;

package/dist/types/anyspend/react/hooks/useSigMint.d.ts

@@ -48,8 +48,8 @@ export declare const useGenerateSigMintData: ({ recipientAddress, contractAddres
             creatorMap?: {} | undefined;
             chainId: number;
             address: string;
-            _id: string | {};
             title: string;
+            _id: string | {};
         };
     } | null;
     error: Error | null;

package/dist/types/global-account/react/components/B3Provider/types.d.ts

@@ -1,4 +1,3 @@
-import { Users } from "@b3dotfun/b3-api";
 import { CreateOnrampOrderParams } from "@b3dotfun/sdk/anyspend/react/hooks/useAnyspendCreateOnrampOrder";
 import { CreateOrderParams } from "@b3dotfun/sdk/anyspend/react/hooks/useAnyspendCreateOrder";
 import { PermissionsConfig } from "@b3dotfun/sdk/global-account/types/permissions";
@@ -10,11 +9,7 @@ import { ClientType } from "../../../client-manager";
 export interface B3ContextType {
     account?: Account;
     automaticallySetFirstEoa: boolean;
-    user?: Users;
-    setWallet: (wallet: Wallet) => void;
     wallet?: Wallet;
-    setUser: (user?: Users) => void;
-    refetchUser: () => Promise<any>;
     initialized: boolean;
     ready: boolean;
     environment?: "development" | "production";

package/dist/types/global-account/react/components/B3Provider/useB3.d.ts

@@ -1,5 +1,6 @@
 /**
  * Hook to access the B3 context
  * @throws Error if used outside a B3Provider
+ * @deprecated Use useB3Config or useB3Account instead
  */
 export declare function useB3(): import("./types").B3ContextType;

package/dist/types/global-account/react/components/B3Provider/useB3Account.d.ts

@@ -0,0 +1 @@
+export declare const useB3Account: () => import("thirdweb/wallets").Account | undefined;

package/dist/types/global-account/react/components/B3Provider/useB3Config.d.ts

@@ -0,0 +1,9 @@
+export declare const useB3Config: () => {
+    automaticallySetFirstEoa: boolean;
+    environment: "development" | "production" | undefined;
+    theme: "light" | "dark";
+    clientType: import("../../../client-manager").ClientType;
+    partnerId: string;
+    createClientReferenceId: ((params: import("../../../../anyspend/react").CreateOrderParams | import("../../../../anyspend/react").CreateOnrampOrderParams) => Promise<string>) | undefined;
+    enableTurnkey: boolean | undefined;
+};

package/dist/types/global-account/react/components/index.d.ts

@@ -3,6 +3,8 @@ export { B3Provider, InnerProvider } from "./B3Provider/B3Provider";
 export { RelayKitProviderWrapper } from "./B3Provider/RelayKitProviderWrapper";
 export { B3Context, type B3ContextType } from "./B3Provider/types";
 export { useB3 } from "./B3Provider/useB3";
+export { useB3Account } from "./B3Provider/useB3Account";
+export { useB3Config } from "./B3Provider/useB3Config";
 export { StyleRoot } from "./StyleRoot";
 export { AuthButton } from "./SignInWithB3/components/AuthButton";
 export { PermissionItem } from "./SignInWithB3/components/PermissionItem";

package/dist/types/global-account/react/hooks/useAuthentication.d.ts

@@ -13,8 +13,8 @@ export declare function useAuthentication(partnerId: string): {
     onConnect: (_walleAutoConnectedWith: Wallet, allConnectedWallets: Wallet[]) => Promise<void>;
     user: {
         email?: string | undefined;
-        telNumber?: string | undefined;
         username?: string | undefined;
+        telNumber?: string | undefined;
         ens?: string | undefined;
         avatar?: string | undefined;
         preferences?: {} | undefined;

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

@@ -0,0 +1,7 @@
+/**
+ * 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
+ */
+export declare function useAutoSelectWallet({ enabled }: {
+    enabled: boolean;
+}): void;

package/dist/types/global-account/react/hooks/useUserQuery.d.ts

@@ -8,8 +8,8 @@ import { Users } from "@b3dotfun/b3-api";
 export declare function useUserQuery(): {
     user: {
         email?: string | undefined;
-        telNumber?: string | undefined;
         username?: string | undefined;
+        telNumber?: string | undefined;
         ens?: string | undefined;
         avatar?: string | undefined;
         preferences?: {} | undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@b3dotfun/sdk",
-  "version": "0.0.87-alpha.2",
+  "version": "0.0.87-alpha.3",
   "source": "src/index.ts",
   "main": "./dist/cjs/index.js",
   "react-native": "./dist/cjs/index.native.js",