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

package/README.md

@@ -267,7 +267,8 @@ function PermissionsExample() {
 import { useB3 } from "@b3dotfun/sdk/global-account/react";
 
 function AccountStatus() {
-  const { account, isAuthenticated } = useB3();
+  const isAuthenticated = useAuthStore(state => state.isAuthenticated);
+  const account = useB3Account();
 
   return <div>{isAuthenticated ? <p>Welcome, {account?.displayName}!</p> : <p>Please sign in</p>}</div>;
 }

package/dist/cjs/anyspend/react/components/AnySpend.js

@@ -840,30 +840,24 @@ function AnySpendInner({ sourceChainId, destinationTokenAddress, destinationToke
                                         else {
                                             setActivePanel(panelIndex);
                                         }
-                                    }, _recipientAddress: effectiveRecipientAddress, destinationToken: selectedDstToken, destinationChainId: selectedDstChainId, destinationAmount: dstAmount, onDestinationTokenChange: setSelectedDstToken, onDestinationChainChange: setSelectedDstChainId, fiatPaymentMethodIndex: PanelView.FIAT_PAYMENT_METHOD, recipientSelectionPanelIndex: PanelView.RECIPIENT_SELECTION, hideDstToken: isBuyMode, anyspendQuote: anyspendQuote, onShowPointsDetail: () => navigateToPanel(PanelView.POINTS_DETAIL, "forward"), onShowFeeDetail: () => navigateToPanel(PanelView.FEE_DETAIL, "forward"), customUsdInputValues: customUsdInputValues }) })), (0, jsx_runtime_1.jsx)(react_2.Button, { variant: "ghost", className: (0, cn_1.cn)("border-as-stroke bg-as-surface-primary absolute left-1/2 top-1/2 z-10 h-10 w-10 -translate-x-1/2 -translate-y-1/2 rounded-xl border-2 sm:h-8 sm:w-8 sm:rounded-xl", isBuyMode && "top-[calc(50%+56px)] cursor-default", activeTab === "fiat" && "hidden", selectedDstChainId === anyspend_1.HYPERLIQUID_CHAIN_ID && "cursor-not-allowed opacity-50"), onClick: () => {
-                                    if (activeTab === "fiat" || isBuyMode) {
-                                        return;
-                                    }
-                                    // Prevent swapping if destination is Hyperliquid (only supported as destination, not source)
-                                    if (selectedDstChainId === anyspend_1.HYPERLIQUID_CHAIN_ID) {
-                                        return;
-                                    }
-                                    // Swap chain selections
-                                    const tempSrcChainId = selectedSrcChainId;
-                                    const tempDstChainId = selectedDstChainId;
-                                    setSelectedSrcChainId(tempDstChainId);
-                                    setSelectedDstChainId(tempSrcChainId);
-                                    // Swap token selections
-                                    const tempSrcToken = selectedSrcToken;
-                                    const tempDstToken = selectedDstToken;
-                                    setSelectedSrcToken(tempDstToken);
-                                    setSelectedDstToken(tempSrcToken);
-                                    // Swap amounts
-                                    const tempSrcAmount = srcAmount;
-                                    const tempDstAmount = dstAmount;
-                                    setSrcAmount(tempDstAmount);
-                                    setDstAmount(tempSrcAmount);
-                                }, children: (0, jsx_runtime_1.jsx)("div", { className: "relative flex items-center justify-center transition-opacity", children: (0, jsx_runtime_1.jsx)(lucide_react_1.ArrowDown, { className: "text-as-primary/50 h-5 w-5" }) }) }), activeTab === "crypto" && ((0, jsx_runtime_1.jsx)(CryptoReceiveSection_1.CryptoReceiveSection, { isDepositMode: false, isBuyMode: isBuyMode, effectiveRecipientAddress: effectiveRecipientAddress, recipientName: recipientName || undefined, onSelectRecipient: () => navigateToPanel(PanelView.RECIPIENT_SELECTION, "forward"), dstAmount: dstAmount, dstToken: selectedDstToken, selectedDstChainId: selectedDstChainId, setSelectedDstChainId: setSelectedDstChainId, setSelectedDstToken: setSelectedDstToken, isSrcInputDirty: isSrcInputDirty, onChangeDstAmount: value => {
+                                    }, _recipientAddress: effectiveRecipientAddress, destinationToken: selectedDstToken, destinationChainId: selectedDstChainId, destinationAmount: dstAmount, onDestinationTokenChange: setSelectedDstToken, onDestinationChainChange: setSelectedDstChainId, fiatPaymentMethodIndex: PanelView.FIAT_PAYMENT_METHOD, recipientSelectionPanelIndex: PanelView.RECIPIENT_SELECTION, hideDstToken: isBuyMode, anyspendQuote: anyspendQuote, onShowPointsDetail: () => navigateToPanel(PanelView.POINTS_DETAIL, "forward"), onShowFeeDetail: () => navigateToPanel(PanelView.FEE_DETAIL, "forward"), customUsdInputValues: customUsdInputValues }) })), activeTab === "crypto" && ((0, jsx_runtime_1.jsx)("div", { className: "z-10 -my-6 flex justify-center", children: (0, jsx_runtime_1.jsx)(react_2.Button, { variant: "ghost", className: (0, cn_1.cn)("border-as-stroke bg-as-surface-primary h-10 w-10 rounded-xl border-2 sm:h-8 sm:w-8 sm:rounded-xl", isBuyMode && "cursor-default", selectedDstChainId === anyspend_1.HYPERLIQUID_CHAIN_ID && "cursor-not-allowed opacity-50"), onClick: () => {
+                                        if (isBuyMode) {
+                                            return;
+                                        }
+                                        // Prevent swapping if destination is Hyperliquid (only supported as destination, not source)
+                                        if (selectedDstChainId === anyspend_1.HYPERLIQUID_CHAIN_ID) {
+                                            return;
+                                        }
+                                        // Swap chain selections
+                                        setSelectedSrcChainId(selectedDstChainId);
+                                        setSelectedDstChainId(selectedSrcChainId);
+                                        // Swap token selections
+                                        setSelectedSrcToken(selectedDstToken);
+                                        setSelectedDstToken(selectedSrcToken);
+                                        // Swap amounts
+                                        setSrcAmount(dstAmount);
+                                        setDstAmount(srcAmount);
+                                    }, children: (0, jsx_runtime_1.jsx)("div", { className: "relative flex items-center justify-center transition-opacity", children: (0, jsx_runtime_1.jsx)(lucide_react_1.ArrowDown, { className: "text-as-primary/50 h-5 w-5" }) }) }) })), activeTab === "crypto" && ((0, jsx_runtime_1.jsx)(CryptoReceiveSection_1.CryptoReceiveSection, { isDepositMode: false, isBuyMode: isBuyMode, effectiveRecipientAddress: effectiveRecipientAddress, recipientName: recipientName || undefined, onSelectRecipient: () => navigateToPanel(PanelView.RECIPIENT_SELECTION, "forward"), dstAmount: dstAmount, dstToken: selectedDstToken, selectedDstChainId: selectedDstChainId, setSelectedDstChainId: setSelectedDstChainId, setSelectedDstToken: setSelectedDstToken, isSrcInputDirty: isSrcInputDirty, onChangeDstAmount: value => {
                                     setIsSrcInputDirty(false);
                                     setDstAmount(value);
                                 }, anyspendQuote: anyspendQuote, onShowPointsDetail: () => navigateToPanel(PanelView.POINTS_DETAIL, "forward"), onShowFeeDetail: () => navigateToPanel(PanelView.FEE_DETAIL, "forward") }))] }), (0, jsx_runtime_1.jsxs)(react_3.motion.div, { initial: { opacity: 0, y: 20, filter: "blur(10px)" }, animate: { opacity: 1, y: 0, filter: "blur(0px)" }, transition: { duration: 0.3, delay: 0.2, ease: "easeInOut" }, className: (0, cn_1.cn)("mt-4 flex w-full max-w-[460px] flex-col gap-2"), children: [(0, jsx_runtime_1.jsx)(react_2.ShinyButton, { accentColor: "hsl(var(--as-brand))", disabled: btnInfo.disable, onClick: onMainButtonClick, className: (0, cn_1.cn)("as-main-button relative w-full", btnInfo.error ? "!bg-as-red" : btnInfo.disable ? "!bg-as-on-surface-2" : "!bg-as-brand"), textClassName: (0, cn_1.cn)(btnInfo.error ? "text-white" : btnInfo.disable ? "text-as-secondary" : "text-white"), children: (0, jsx_runtime_1.jsxs)("div", { className: "flex items-center justify-center gap-2", children: [btnInfo.loading && (0, jsx_runtime_1.jsx)(lucide_react_1.Loader2, { className: "h-4 w-4 animate-spin" }), btnInfo.text] }) }), !hideTransactionHistoryButton && (globalAddress || effectiveRecipientAddress) ? ((0, jsx_runtime_1.jsxs)(react_2.Button, { variant: "link", onClick: onClickHistory, className: "text-as-primary/50 hover:text-as-primary flex items-center gap-1 transition-colors", children: [(0, jsx_runtime_1.jsx)(lucide_react_1.HistoryIcon, { className: "h-4 w-4" }), " ", (0, jsx_runtime_1.jsx)("span", { className: "pr-4", children: "Transaction History" })] })) : null] })] }), (0, jsx_runtime_1.jsx)("div", { className: "w-full", children: (0, jsx_runtime_1.jsx)(react_2.TabsPrimitive, { defaultValue: "swap", onValueChange: value => {

package/dist/cjs/anyspend/react/components/AnySpendCustom.js

@@ -219,7 +219,6 @@ function AnySpendCustomInner({ loadOrder, mode = "modal", activeTab: activeTabPr
             }
         }
     }, [srcChainId, tokenList, getTokenWithBalance, nativeTokens, fungibleTokens, dirtySelectSrcToken, dstToken.address]);
-    // const { account: isAuthenticated } = useB3();
     const getRelayQuoteRequest = (0, react_5.useMemo)(() => {
         return generateGetRelayQuoteRequest({
             orderType: orderType,

package/dist/cjs/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/cjs/global-account/react/components/AvatarEditor/AvatarEditor.js

@@ -43,7 +43,8 @@ function AvatarEditor({ onSetAvatar, className }) {
     const [zoom, setZoom] = (0, react_2.useState)(1);
     const [croppedAreaPixels, setCroppedAreaPixels] = (0, react_2.useState)(null);
     const fileInputRef = (0, react_2.useRef)(null);
-    const { setUser, user, partnerId } = (0, react_1.useB3)();
+    const { partnerId } = (0, react_1.useB3Config)();
+    const { user, setUser } = (0, react_1.useAuthentication)(partnerId);
     const setB3ModalContentType = (0, stores_1.useModalStore)(state => state.setB3ModalContentType);
     const contentType = (0, stores_1.useModalStore)(state => state.contentType);
     const account = (0, react_3.useActiveAccount)();

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

@@ -4,9 +4,9 @@ exports.B3Provider = B3Provider;
 exports.InnerProvider = InnerProvider;
 const jsx_runtime_1 = require("react/jsx-runtime");
 const react_1 = require("../../../../global-account/react");
+const useAutoSelectWallet_1 = require("../../../../global-account/react/hooks/useAutoSelectWallet");
 const createWagmiConfig_1 = require("../../../../global-account/react/utils/createWagmiConfig");
 const analytics_1 = require("../../../../global-account/utils/analytics");
-const debug_1 = require("../../../../shared/utils/debug");
 require("@relayprotocol/relay-kit-ui/styles.css");
 const react_query_1 = require("@tanstack/react-query");
 const react_2 = require("react");
@@ -17,7 +17,6 @@ const StyleRoot_1 = require("../StyleRoot");
 const index_1 = require("../Toast/index");
 const LocalSDKProvider_1 = require("./LocalSDKProvider");
 const types_1 = require("./types");
-const debug = (0, debug_1.debugB3React)("B3Provider");
 /**
  * Default permissions configuration for B3 provider
  */
@@ -51,52 +50,26 @@ toaster: _toaster, clientType = "rest", rpcUrls, partnerId, stripePublishableKey
  */
 function InnerProvider({ children, accountOverride, environment, defaultPermissions = DEFAULT_PERMISSIONS, automaticallySetFirstEoa, theme = "light", clientType = "socket", partnerId, stripePublishableKey, createClientReferenceId, enableTurnkey, }) {
     const activeAccount = (0, react_3.useActiveAccount)();
-    const [manuallySelectedWallet, setManuallySelectedWallet] = (0, react_2.useState)(undefined);
-    const wallets = (0, react_3.useConnectedWallets)();
     const isAuthenticated = (0, react_1.useAuthStore)(state => state.isAuthenticated);
-    const isConnected = (0, react_1.useAuthStore)(state => state.isConnected);
-    const justCompletedLogin = (0, react_1.useAuthStore)(state => state.justCompletedLogin);
-    const setActiveWallet = (0, react_3.useSetActiveWallet)();
-    const { user, setUser, refetchUser } = (0, react_1.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 = (0, react_2.useCallback)((wallet) => {
-        setManuallySelectedWallet(wallet);
-        const account = wallet.getAccount();
-        debug("@@setWallet", wallet.id, account?.address);
-        setActiveWallet(wallet);
-    }, [setManuallySelectedWallet, setActiveWallet]);
-    (0, react_2.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 (0, react_3.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
+    (0, useAutoSelectWallet_1.useAutoSelectWallet)({
+        enabled: automaticallySetFirstEoa,
+    });
     return ((0, jsx_runtime_1.jsx)(types_1.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,
@@ -108,11 +81,8 @@ function InnerProvider({ children, accountOverride, environment, defaultPermissi
             stripePublishableKey,
             createClientReferenceId,
             enableTurnkey,
-        }, children: (0, jsx_runtime_1.jsx)(InnerProvider2, { children: children }) }));
+        }, children: children }));
 }
-const InnerProvider2 = ({ children }) => {
-    return (0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, { children: children });
-};
 /**
  * Component to connect the toast context to the global toast API
  */

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

@@ -6,7 +6,6 @@ const jsx_runtime_1 = require("react/jsx-runtime");
 const react_query_1 = require("@tanstack/react-query");
 const react_1 = require("thirdweb/react");
 const wagmi_1 = require("wagmi");
-const useAuthentication_1 = require("../../hooks/useAuthentication");
 const createWagmiConfig_1 = require("../../utils/createWagmiConfig");
 const LocalSDKProvider_1 = require("./LocalSDKProvider");
 const types_1 = require("./types");
@@ -32,17 +31,17 @@ function B3Provider({ theme = "light", children, accountOverride, environment, c
  */
 function InnerProvider({ children, accountOverride, environment, defaultPermissions = DEFAULT_PERMISSIONS, theme = "light", clientType = "socket", partnerId, rpcUrls, }) {
     const activeAccount = (0, react_1.useActiveAccount)();
-    const { user, setUser, refetchUser } = (0, useAuthentication_1.useAuthentication)(partnerId);
+    //const { user, setUser, refetchUser } = useAuthentication(partnerId);
     const wagmiConfig = (0, createWagmiConfig_1.createWagmiConfig)({ partnerId, rpcUrls });
     // Use given accountOverride or activeAccount from thirdweb
     const effectiveAccount = accountOverride || activeAccount;
     return ((0, jsx_runtime_1.jsx)(wagmi_1.WagmiProvider, { config: wagmiConfig, children: (0, jsx_runtime_1.jsx)(react_query_1.QueryClientProvider, { client: queryClient, children: (0, jsx_runtime_1.jsx)(types_1.B3Context.Provider, { value: {
-                    account: effectiveAccount,
+                    //account: effectiveAccount,
                     automaticallySetFirstEoa: false,
-                    setWallet: () => { },
+                    //setWallet: () => {},
                     wallet: undefined,
-                    user,
-                    setUser,
+                    //user,
+                    //setUser,
                     initialized: true,
                     ready: !!effectiveAccount,
                     environment,
@@ -50,6 +49,6 @@ function InnerProvider({ children, accountOverride, environment, defaultPermissi
                     theme,
                     clientType,
                     partnerId,
-                    refetchUser,
+                    //refetchUser,
                 }, children: children }) }) }));
 }

package/dist/cjs/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/cjs/global-account/react/components/B3Provider/types.js

@@ -8,11 +8,11 @@ const react_1 = require("react");
 exports.B3Context = (0, react_1.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/cjs/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/cjs/global-account/react/components/B3Provider/useB3.js

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

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

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

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

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.useB3Account = void 0;
+const react_1 = require("thirdweb/react");
+// Wrapper around useActiveAccount
+const useB3Account = () => {
+    const account = (0, react_1.useActiveAccount)();
+    return account;
+};
+exports.useB3Account = useB3Account;

package/dist/cjs/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/cjs/global-account/react/components/B3Provider/useB3Config.js

@@ -0,0 +1,23 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.useB3Config = void 0;
+const react_1 = require("react");
+const types_1 = require("./types");
+const useB3Config = () => {
+    const context = (0, react_1.useContext)(types_1.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 (0, react_1.useMemo)(() => ({
+        automaticallySetFirstEoa,
+        environment,
+        theme,
+        clientType,
+        partnerId,
+        createClientReferenceId,
+        enableTurnkey,
+    }), [automaticallySetFirstEoa, environment, theme, clientType, partnerId, createClientReferenceId, enableTurnkey]);
+};
+exports.useB3Config = useB3Config;

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

@@ -23,7 +23,7 @@ const LinkAccount = ({ partnerId, onLogout: _onLogout, chain, }) => {
     const isLinking = (0, react_1.useModalStore)(state => state.isLinking);
     const setB3ModalOpen = (0, react_1.useModalStore)(state => state.setB3ModalOpen);
     const contentType = (0, react_1.useModalStore)(state => state.contentType);
-    const { user, setUser } = (0, react_1.useB3)();
+    const { user, setUser } = (0, react_1.useAuthentication)(partnerId);
     const [isUpdatingCode, setIsUpdatingCode] = (0, react_2.useState)(false);
     const [newReferralCode, setNewReferralCode] = (0, react_2.useState)("");
     const [isEditingCode, setIsEditingCode] = (0, react_2.useState)(false);

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

@@ -17,7 +17,6 @@ const wallets_1 = require("thirdweb/wallets");
 const __1 = require("../..");
 const useModalStore_1 = require("../../stores/useModalStore");
 const profileDisplay_1 = require("../../utils/profileDisplay");
-const useB3_1 = require("../B3Provider/useB3");
 const AppleIcon_1 = require("../icons/AppleIcon");
 const DiscordIcon_1 = require("../icons/DiscordIcon");
 const FarcasterIcon_1 = require("../icons/FarcasterIcon");
@@ -96,7 +95,7 @@ function LinkNewAccount({ onSuccess: onSuccessCallback, onError, onClose, chain,
         ...(0, profileDisplay_1.getProfileDisplayInfo)(profile),
         originalProfile: profile,
     }));
-    const { account } = (0, useB3_1.useB3)();
+    const account = (0, react_1.useB3Account)();
     const { mutate: linkProfile } = (0, react_3.useLinkProfile)();
     const onSuccess = (0, react_2.useCallback)(async () => {
         await onSuccessCallback?.();

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

@@ -17,7 +17,8 @@ const ProfileSection = () => {
         address: eoaAddress || account?.address,
         fresh: true,
     });
-    const { user } = (0, react_1.useB3)();
+    const { partnerId } = (0, react_1.useB3Config)();
+    const { user } = (0, react_1.useAuthentication)(partnerId);
     const setB3ModalOpen = (0, react_1.useModalStore)(state => state.setB3ModalOpen);
     const setB3ModalContentType = (0, react_1.useModalStore)(state => state.setB3ModalContentType);
     const navigateBack = (0, react_1.useModalStore)(state => state.navigateBack);

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

@@ -20,7 +20,8 @@ const SettingsProfileCard = () => {
         address: eoaAddress || account?.address,
         fresh: true,
     });
-    const { user, setUser } = (0, react_1.useB3)();
+    const { partnerId } = (0, react_1.useB3Config)();
+    const { user, setUser } = (0, react_1.useAuthentication)(partnerId);
     const setB3ModalOpen = (0, react_1.useModalStore)(state => state.setB3ModalOpen);
     const setB3ModalContentType = (0, react_1.useModalStore)(state => state.setB3ModalContentType);
     const navigateBack = (0, react_1.useModalStore)(state => state.navigateBack);

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

@@ -4,11 +4,12 @@ exports.SignInWithB3 = SignInWithB3;
 const jsx_runtime_1 = require("react/jsx-runtime");
 const react_1 = require("../../../../global-account/react");
 const react_2 = require("react");
+const useB3Account_1 = require("../B3Provider/useB3Account");
 const ManageAccountButton_1 = require("../custom/ManageAccountButton");
 const Loading_1 = require("../ui/Loading");
 function SignInWithB3(props) {
     const { setB3ModalOpen, setB3ModalContentType, setEcoSystemAccountAddress } = (0, react_1.useModalStore)();
-    const { account } = (0, react_1.useB3)();
+    const account = (0, useB3Account_1.useB3Account)();
     const { isAuthenticating, isAuthenticated } = (0, react_1.useAuthStore)();
     const isMobile = (0, react_1.useIsMobile)();
     (0, react_2.useEffect)(() => {

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

@@ -16,7 +16,8 @@ const MAX_REFETCH_ATTEMPTS = 20;
  * Handles different login providers, authentication steps, and session key management
  */
 function SignInWithB3Flow({ strategies, onLoginSuccess, onSessionKeySuccess, onError, chain, sessionKeyAddress, partnerId, closeAfterLogin = false, source = "signInWithB3Button", signersEnabled = false, }) {
-    const { automaticallySetFirstEoa, user, refetchUser, enableTurnkey } = (0, react_1.useB3)();
+    const { automaticallySetFirstEoa, enableTurnkey } = (0, react_1.useB3Config)();
+    const { user, refetchUser } = (0, react_1.useAuthentication)(partnerId);
     const [step, setStep] = (0, react_2.useState)(source === "requestPermissions" ? null : "login");
     const [sessionKeyAdded, setSessionKeyAdded] = (0, react_2.useState)(source === "requestPermissions" ? true : false);
     const { setB3ModalContentType, setB3ModalOpen, isOpen, contentType } = (0, react_1.useModalStore)();

package/dist/cjs/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/cjs/global-account/react/components/index.js

@@ -3,9 +3,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DialogDescription = exports.DialogContent = exports.DialogClose = exports.Dialog = exports.CommandShortcut = exports.CommandSeparator = exports.CommandList = exports.CommandItem = exports.CommandInput = exports.CommandGroup = exports.CommandEmpty = exports.CommandDialog = exports.Command = exports.buttonVariants = exports.Button = exports.badgeVariants = exports.Badge = exports.WalletConnectorIcon = exports.StaggeredFadeLoader = exports.CopyToClipboard = exports.ClientOnly = exports.customButtonVariants = exports.CustomButton = exports.SendERC20Button = exports.SendETHButton = exports.MintButton = exports.AccountAssets = exports.RequestPermissionsButton = exports.RequestPermissions = exports.IPFSMediaRenderer = exports.Send = exports.Deposit = exports.ManageAccount = exports.TurnkeyAuthModal = exports.isWalletType = exports.getConnectOptionsFromStrategy = exports.LoginStepContainer = exports.SignInWithB3Privy = exports.SignInWithB3Flow = exports.SignInWithB3 = exports.WalletRow = exports.PermissionItem = exports.AuthButton = exports.StyleRoot = exports.useB3 = exports.B3Context = exports.RelayKitProviderWrapper = exports.InnerProvider = exports.B3Provider = exports.B3DynamicModal = void 0;
-exports.toast = exports.AnimatedLottie = exports.TransitionPanel = exports.TooltipTrigger = exports.TooltipProvider = exports.TooltipContent = exports.Tooltip = exports.TextShimmer = exports.TextLoop = exports.TabTrigger = exports.TabsTransitionWrapper = exports.TabsList = exports.TabsContent = exports.Tabs = exports.TabTriggerPrimitive = exports.TabsPrimitive = exports.TabsListPrimitive = exports.TabsContentPrimitive = exports.Skeleton = exports.ShinyButton = exports.ScrollBar = exports.ScrollArea = exports.PopoverTrigger = exports.PopoverContent = exports.Popover = exports.Loading = exports.Input = exports.GlareCardRounded = exports.GlareCard = exports.DropdownMenuTrigger = exports.DropdownMenuSeparator = exports.DropdownMenuItem = exports.DropdownMenuContent = exports.DropdownMenu = exports.DrawerTrigger = exports.DrawerTitle = exports.DrawerPortal = exports.DrawerOverlay = exports.DrawerHeader = exports.DrawerFooter = exports.DrawerDescription = exports.DrawerContent = exports.DrawerClose = exports.Drawer = exports.DialogTrigger = exports.DialogTitle = exports.DialogPortal = exports.DialogOverlay = exports.DialogHeader = exports.DialogFooter = void 0;
-exports.WalletImage = exports.useToastContext = exports.ToastProvider = exports.ToastContainer = exports.Toast = void 0;
+exports.DialogClose = exports.Dialog = exports.CommandShortcut = exports.CommandSeparator = exports.CommandList = exports.CommandItem = exports.CommandInput = exports.CommandGroup = exports.CommandEmpty = exports.CommandDialog = exports.Command = exports.buttonVariants = exports.Button = exports.badgeVariants = exports.Badge = exports.WalletConnectorIcon = exports.StaggeredFadeLoader = exports.CopyToClipboard = exports.ClientOnly = exports.customButtonVariants = exports.CustomButton = exports.SendERC20Button = exports.SendETHButton = exports.MintButton = exports.AccountAssets = exports.RequestPermissionsButton = exports.RequestPermissions = exports.IPFSMediaRenderer = exports.Send = exports.Deposit = exports.ManageAccount = exports.TurnkeyAuthModal = exports.isWalletType = exports.getConnectOptionsFromStrategy = exports.LoginStepContainer = exports.SignInWithB3Privy = exports.SignInWithB3Flow = exports.SignInWithB3 = exports.WalletRow = exports.PermissionItem = exports.AuthButton = exports.StyleRoot = exports.useB3Config = exports.useB3Account = exports.useB3 = exports.B3Context = exports.RelayKitProviderWrapper = exports.InnerProvider = exports.B3Provider = exports.B3DynamicModal = void 0;
+exports.TransitionPanel = exports.TooltipTrigger = exports.TooltipProvider = exports.TooltipContent = exports.Tooltip = exports.TextShimmer = exports.TextLoop = exports.TabTrigger = exports.TabsTransitionWrapper = exports.TabsList = exports.TabsContent = exports.Tabs = exports.TabTriggerPrimitive = exports.TabsPrimitive = exports.TabsListPrimitive = exports.TabsContentPrimitive = exports.Skeleton = exports.ShinyButton = exports.ScrollBar = exports.ScrollArea = exports.PopoverTrigger = exports.PopoverContent = exports.Popover = exports.Loading = exports.Input = exports.GlareCardRounded = exports.GlareCard = exports.DropdownMenuTrigger = exports.DropdownMenuSeparator = exports.DropdownMenuItem = exports.DropdownMenuContent = exports.DropdownMenu = exports.DrawerTrigger = exports.DrawerTitle = exports.DrawerPortal = exports.DrawerOverlay = exports.DrawerHeader = exports.DrawerFooter = exports.DrawerDescription = exports.DrawerContent = exports.DrawerClose = exports.Drawer = exports.DialogTrigger = exports.DialogTitle = exports.DialogPortal = exports.DialogOverlay = exports.DialogHeader = exports.DialogFooter = exports.DialogDescription = exports.DialogContent = void 0;
+exports.WalletImage = exports.useToastContext = exports.ToastProvider = exports.ToastContainer = exports.Toast = exports.toast = exports.AnimatedLottie = void 0;
 // TODO woj: Barrel file for all components, this might be reason of bundle size issues
 // Core Components
 var B3DynamicModal_1 = require("./B3DynamicModal");
@@ -19,6 +19,10 @@ var types_1 = require("./B3Provider/types");
 Object.defineProperty(exports, "B3Context", { enumerable: true, get: function () { return types_1.B3Context; } });
 var useB3_1 = require("./B3Provider/useB3");
 Object.defineProperty(exports, "useB3", { enumerable: true, get: function () { return useB3_1.useB3; } });
+var useB3Account_1 = require("./B3Provider/useB3Account");
+Object.defineProperty(exports, "useB3Account", { enumerable: true, get: function () { return useB3Account_1.useB3Account; } });
+var useB3Config_1 = require("./B3Provider/useB3Config");
+Object.defineProperty(exports, "useB3Config", { enumerable: true, get: function () { return useB3Config_1.useB3Config; } });
 var StyleRoot_1 = require("./StyleRoot");
 Object.defineProperty(exports, "StyleRoot", { enumerable: true, get: function () { return StyleRoot_1.StyleRoot; } });
 // SignInWithB3 Components

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

@@ -8,6 +8,7 @@ const debug_1 = require("../../../shared/utils/debug");
 const react_2 = require("react");
 const react_3 = require("thirdweb/react");
 const in_app_1 = require("thirdweb/wallets/in-app");
+const useB3Account_1 = require("../components/B3Provider/useB3Account");
 const debug = (0, debug_1.debugB3React)("useAccountWallet");
 function useLastAuthProvider() {
     const [lastAuthProvider, setLastAuthProvider] = (0, react_2.useState)(null);
@@ -27,7 +28,7 @@ function useAccountWallet() {
     // const effectiveAccount = isAuthenticated ? accountOverride || activeAccount : undefined;
     // can we possibly just use useActiveAccount here?
     // --------------------
-    const { account } = (0, react_1.useB3)();
+    const account = (0, useB3Account_1.useB3Account)();
     const activeWallet = (0, react_3.useActiveWallet)();
     const connectedWallets = (0, react_3.useConnectedWallets)();
     const connectedSmartWallet = connectedWallets.find(wallet => wallet.id === constants_1.ecosystemWalletId);
@@ -75,7 +76,7 @@ function useAccountWallet() {
     return res;
 }
 function useAccountWalletImage() {
-    const { account } = (0, react_1.useB3)();
+    const account = (0, useB3Account_1.useB3Account)();
     const activeWallet = (0, react_3.useActiveWallet)();
     const connectedWallets = (0, react_3.useConnectedWallets)();
     const connectedSmartWallet = connectedWallets.find(wallet => wallet.id === constants_1.ecosystemWalletId);

package/dist/cjs/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/cjs/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/cjs/global-account/react/hooks/useAutoSelectWallet.js

@@ -0,0 +1,42 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.useAutoSelectWallet = useAutoSelectWallet;
+const debug_1 = require("../../../shared/utils/debug");
+const react_1 = require("react");
+const react_2 = require("thirdweb/react");
+const stores_1 = require("../stores");
+const debug = (0, debug_1.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
+ */
+function useAutoSelectWallet({ enabled }) {
+    const isAuthenticated = (0, stores_1.useAuthStore)(state => state.isAuthenticated);
+    const wallets = (0, react_2.useConnectedWallets)();
+    const setActiveWallet = (0, react_2.useSetActiveWallet)();
+    const setWallet = (0, react_1.useCallback)((wallet) => {
+        debug("@@setWallet", wallet.id, wallet.getAccount()?.address);
+        setActiveWallet(wallet);
+    }, [setActiveWallet]);
+    (0, react_1.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 (0, react_2.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/cjs/global-account/react/hooks/useTurnkeyAuth.js

@@ -4,11 +4,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.useTurnkeyAuth = useTurnkeyAuth;
+const debug_1 = require("../../../shared/utils/debug");
+const react_1 = require("react");
 const app_1 = __importDefault(require("../../app"));
+const components_1 = require("../components");
 const stores_1 = require("../stores");
-const react_1 = require("react");
-const useB3_1 = require("../components/B3Provider/useB3");
-const debug_1 = require("../../../shared/utils/debug");
+const useAuthentication_1 = require("./useAuthentication");
 const debug = (0, debug_1.debugB3React)("useTurnkeyAuth");
 /**
  * Hook for Turnkey email-based OTP authentication
@@ -23,7 +24,8 @@ function useTurnkeyAuth() {
     const [error, setError] = (0, react_1.useState)(null);
     const setIsAuthenticating = (0, stores_1.useAuthStore)(state => state.setIsAuthenticating);
     const setIsAuthenticated = (0, stores_1.useAuthStore)(state => state.setIsAuthenticated);
-    const { user } = (0, useB3_1.useB3)();
+    const { partnerId } = (0, components_1.useB3Config)();
+    const { user } = (0, useAuthentication_1.useAuthentication)(partnerId);
     /**
      * Step 1: Initiate login with email
      * - Calls backend to create sub-org (if needed) and send OTP

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

@@ -14,7 +14,7 @@ const react_2 = require("react");
 const thirdweb_2 = require("thirdweb");
 const viem_1 = require("viem");
 const wagmi_1 = require("wagmi");
-const components_1 = require("../components");
+const useB3Account_1 = require("../components/B3Provider/useB3Account");
 const useAccountWallet_1 = require("./useAccountWallet");
 const partnerId = String(process.env.PUBLIC_THIRDWEB_PARTNER_ID ||
     process.env.NEXT_PUBLIC_THIRDWEB_PARTNER_ID ||
@@ -25,7 +25,7 @@ function useUnifiedChainSwitchAndExecute() {
     const { switchChainAsync } = (0, wagmi_1.useSwitchChain)();
     const [isSwitchingOrExecuting, setIsSwitchingOrExecuting] = (0, react_2.useState)(false);
     const { isActiveSmartWallet, isActiveEOAWallet, connectedEOAWallet } = (0, useAccountWallet_1.useAccountWallet)();
-    const { account: aaAccount } = (0, components_1.useB3)();
+    const aaAccount = (0, useB3Account_1.useB3Account)();
     // Handle EOA wallet chain switch and execute transaction
     const handleEOASwitchChainAndSendTransaction = (0, react_2.useCallback)(async (targetChainId, params) => {
         if (!connectedEOAWallet) {

package/dist/cjs/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;