@b3dotfun/sdk 0.0.88-alpha.10 → 0.0.88-alpha.2

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

@@ -1,20 +1,19 @@
-import { useB3ConfigStore } from "../../stores/configStore.js";
-/**
- * Hook to access B3 configuration
- * Returns all config values from the Zustand store
- * Since config is static (set once at initialization), destructuring is fine here
- */
+import { useContext, useMemo } from "react";
+import { B3Context } from "./types.js";
 export const useB3Config = () => {
-    return useB3ConfigStore(state => ({
-        automaticallySetFirstEoa: state.automaticallySetFirstEoa,
-        environment: state.environment,
-        theme: state.theme,
-        clientType: state.clientType,
-        partnerId: state.partnerId,
-        createClientReferenceId: state.createClientReferenceId,
-        enableTurnkey: state.enableTurnkey,
-        stripePublishableKey: state.stripePublishableKey,
-        defaultPermissions: state.defaultPermissions,
-        accountOverride: state.accountOverride,
-    }));
+    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/ManageAccount/ProfileSection.js

@@ -1,5 +1,5 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { useAccountWallet, useModalStore, useProfile, useSimBalance, useUser, } 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 } = useUser();
+    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/channels/DiscordChannel.js

@@ -1,13 +1,13 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { useB3Config } from "../../../../../global-account/react/index.js";
 import { debugB3React } from "../../../../../shared/utils/debug.js";
 import { useState } from "react";
 import { notificationsAPI } from "../../../utils/notificationsAPI.js";
+import { useB3 } from "../../B3Provider/useB3.js";
 import { toast } from "../../Toast/toastApi.js";
 import { NotificationChannel } from "../NotificationChannel.js";
 const debug = debugB3React("DiscordChannel");
 export const DiscordChannel = ({ userId, jwtToken, discordChannel, isConnected, isOptimisticallyConnected, onConnectionChange, onToggle, }) => {
-    const { partnerId } = useB3Config();
+    const { partnerId } = useB3();
     const [discordId, setDiscordId] = useState("");
     const [isConnecting, setIsConnecting] = useState(false);
     const [showInput, setShowInput] = useState(false);

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

@@ -1,8 +1,8 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { useB3Config } from "../../../../../global-account/react/index.js";
 import { debugB3React } from "../../../../../shared/utils/debug.js";
 import { useState } from "react";
 import { notificationsAPI } from "../../../utils/notificationsAPI.js";
+import { useB3 } from "../../B3Provider/useB3.js";
 import { toast } from "../../Toast/toastApi.js";
 import { NotificationChannel } from "../NotificationChannel.js";
 const debug = debugB3React("EmailChannel");
@@ -11,7 +11,7 @@ const validateEmail = (email) => {
     return emailRegex.test(email);
 };
 export const EmailChannel = ({ userId, jwtToken, emailChannel, isConnected, isOptimisticallyConnected, onConnectionChange, onToggle, }) => {
-    const { partnerId } = useB3Config();
+    const { partnerId } = useB3();
     const [email, setEmail] = useState("");
     const [emailError, setEmailError] = useState(null);
     const [isConnecting, setIsConnecting] = useState(false);

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

@@ -1,13 +1,13 @@
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
-import { useB3Config } from "../../../../../global-account/react/index.js";
 import { debugB3React } from "../../../../../shared/utils/debug.js";
 import { useState } from "react";
 import { notificationsAPI } from "../../../utils/notificationsAPI.js";
+import { useB3 } from "../../B3Provider/useB3.js";
 import { toast } from "../../Toast/toastApi.js";
 import { NotificationChannel } from "../NotificationChannel.js";
 const debug = debugB3React("PhoneChannel");
 export const PhoneChannel = ({ userId, jwtToken, smsChannel, whatsappChannel, isSMSConnected, isWhatsAppConnected, isOptimisticallySMSConnected, isOptimisticallyWhatsAppConnected, onConnectionChange, onToggle, }) => {
-    const { partnerId } = useB3Config();
+    const { partnerId } = useB3();
     const [phoneNumber, setPhoneNumber] = useState("");
     const [isConnectingSMS, setIsConnectingSMS] = useState(false);
     const [isConnectingWhatsApp, setIsConnectingWhatsApp] = useState(false);

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

@@ -1,13 +1,13 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { useB3Config } from "../../../../../global-account/react/index.js";
 import { debugB3React } from "../../../../../shared/utils/debug.js";
 import { useState } from "react";
 import { notificationsAPI } from "../../../utils/notificationsAPI.js";
+import { useB3 } from "../../B3Provider/useB3.js";
 import { toast } from "../../Toast/toastApi.js";
 import { NotificationChannel } from "../NotificationChannel.js";
 const debug = debugB3React("TelegramChannel");
 export const TelegramChannel = ({ userId, jwtToken, telegramChannel, isConnected, isOptimisticallyConnected, onConnectionChange, onToggle, }) => {
-    const { partnerId } = useB3Config();
+    const { partnerId } = useB3();
     const [isConnecting, setIsConnecting] = useState(false);
     const [status, setStatus] = useState("idle");
     // Detect if we're disconnecting

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

@@ -1,5 +1,6 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { Button, PermissionItem, useAddTWSessionKey, useB3Config, useGetAllTWSigners, } from "../../../../global-account/react/index.js";
+import { Button, useB3, useAddTWSessionKey, useGetAllTWSigners, } from "../../../../global-account/react/index.js";
+import { PermissionItem } from "../../../../global-account/react/index.js";
 import { debugB3React } from "../../../../shared/utils/debug.js";
 import { formatAddress } from "../../../../shared/utils/formatAddress.js";
 import { CreditCard, Eye } from "lucide-react";
@@ -14,7 +15,7 @@ const debug = debugB3React("RequestPermissions");
 export function RequestPermissions({ onSuccess, onError, chain, sessionKeyAddress, permissions, }) {
     const [isApproving, setIsApproving] = useState(false);
     const account = useActiveAccount();
-    const { defaultPermissions } = useB3Config();
+    const { defaultPermissions } = useB3();
     const DEFAULT_PERMISSIONS = useMemo(() => permissions ?? defaultPermissions, [defaultPermissions, permissions]);
     const { refetch: refetchSigners } = useGetAllTWSigners({
         chain,

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

@@ -1,5 +1,5 @@
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
-import { IPFSMediaRenderer, SignInWithB3, StyleRoot, useAccountWallet, useAuthentication, useB3Config, useIsMobile, } from "../../../../global-account/react/index.js";
+import { IPFSMediaRenderer, SignInWithB3, StyleRoot, useAccountWallet, useAuthentication, useB3, useIsMobile, } from "../../../../global-account/react/index.js";
 import Icon from "../../../../global-account/react/components/custom/Icon.js";
 import { ecosystemWalletId } from "../../../../shared/constants/index.js";
 import { cn, truncateAddress } from "../../../../shared/utils/index.js";
@@ -9,7 +9,7 @@ import { useConnectedWallets, useSetActiveWallet, useWalletImage } from "thirdwe
 import { ManageAccountButton } from "../custom/ManageAccountButton.js";
 export function SignIn(props) {
     const { className } = props;
-    const { automaticallySetFirstEoa, partnerId } = useB3Config();
+    const { automaticallySetFirstEoa, partnerId } = useB3();
     const { address: globalAddress, ensName, connectedSmartWallet, connectedEOAWallet, isActiveSmartWallet, isActiveEOAWallet, smartWalletIcon, } = useAccountWallet();
     const { data: walletImage } = useWalletImage(connectedEOAWallet?.id);
     const isMobile = useIsMobile();

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

@@ -3,7 +3,6 @@ import { Loading, useAuthentication, useAuthStore, useB3Config, useGetAllTWSigne
 import { debugB3React } from "../../../../shared/utils/debug.js";
 import { useCallback, useEffect, useState } from "react";
 import { useActiveAccount } from "thirdweb/react";
-import { TurnkeyAuthModal } from "../TurnkeyAuthModal.js";
 import { SignInWithB3Privy } from "./SignInWithB3Privy.js";
 import { LoginStep, LoginStepContainer } from "./steps/LoginStep.js";
 import { LoginStepCustom } from "./steps/LoginStepCustom.js";
@@ -22,9 +21,7 @@ export function SignInWithB3Flow({ strategies, onLoginSuccess, onSessionKeySucce
     const account = useActiveAccount();
     const isAuthenticating = useAuthStore(state => state.isAuthenticating);
     const isAuthenticated = useAuthStore(state => state.isAuthenticated);
-    const setIsAuthenticated = useAuthStore(state => state.setIsAuthenticated);
     const isConnected = useAuthStore(state => state.isConnected);
-    const setIsConnected = useAuthStore(state => state.setIsConnected);
     const setJustCompletedLogin = useAuthStore(state => state.setJustCompletedLogin);
     const [refetchCount, setRefetchCount] = useState(0);
     const [refetchError, setRefetchError] = useState(null);
@@ -57,9 +54,7 @@ export function SignInWithB3Flow({ strategies, onLoginSuccess, onSessionKeySucce
             refetchSigners();
             setRefetchQueued(false);
         }, backoffDelay);
-        // State setters are stable and don't need to be in dependencies
-        // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [refetchCount, refetchSigners, onError, refetchQueued]);
+    }, [refetchCount, refetchSigners, onError, setRefetchQueued, refetchQueued]);
     // Extract the completion flow logic to be reused
     const handlePostTurnkeyFlow = useCallback(() => {
         debug("Running post-Turnkey flow logic");
@@ -128,10 +123,6 @@ export function SignInWithB3Flow({ strategies, onLoginSuccess, onSessionKeySucce
         debug("Refetching user after Turnkey success...");
         await refetchUser();
         debug("User refetched successfully");
-        // Set authentication and connection state so UI updates properly
-        setIsAuthenticated(true);
-        setIsConnected(true);
-        setJustCompletedLogin(true);
         // After user data is refreshed, close Turnkey modal and go back to sign-in flow
         debug("Switching back to signInWithB3 modal");
         setB3ModalContentType({
@@ -150,6 +141,7 @@ export function SignInWithB3Flow({ strategies, onLoginSuccess, onSessionKeySucce
         // The useEffect will re-run with updated user data to complete the sign-in process
     }, [
         refetchUser,
+        setB3ModalContentType,
         strategies,
         onLoginSuccess,
         onSessionKeySuccess,
@@ -160,10 +152,6 @@ export function SignInWithB3Flow({ strategies, onLoginSuccess, onSessionKeySucce
         closeAfterLogin,
         source,
         signersEnabled,
-        setB3ModalContentType,
-        setIsAuthenticated,
-        setIsConnected,
-        setJustCompletedLogin,
     ]);
     // Handle post-login flow after signers are loaded
     useEffect(() => {
@@ -181,20 +169,15 @@ export function SignInWithB3Flow({ strategies, onLoginSuccess, onSessionKeySucce
             if (closeAfterLogin) {
                 setJustCompletedLogin(true);
             }
-            // Check if we should show Turnkey login form as SECONDARY option (after wallet connection)
-            // This only applies when:
-            // - enableTurnkey={true} is set on B3Provider
-            // - NEXT_PUBLIC_TURNKEY_PRIMARY is NOT set to true (otherwise Turnkey shows as primary)
-            // - User just logged in AND hasn't completed Turnkey auth in this session
+            // Check if we should show Turnkey login form
+            // Show if enableTurnkey is true AND user just logged in AND hasn't completed Turnkey auth in this session
             // For new users (!turnkeyId): Show email form
             // For returning users (turnkeyId && turnkeyEmail): Auto-skip to OTP
             // Also check that we're not already showing the Turnkey modal
             const hasTurnkeyId = user?.partnerIds?.turnkeyId;
             const hasTurnkeyEmail = !!user?.email;
             const isTurnkeyModalCurrentlyOpen = contentType?.type === "turnkeyAuth";
-            const isTurnkeyPrimary = process.env.NEXT_PUBLIC_TURNKEY_PRIMARY === "true";
             const shouldShowTurnkeyModal = enableTurnkey &&
-                !isTurnkeyPrimary &&
                 user &&
                 !turnkeyAuthCompleted &&
                 !isTurnkeyModalCurrentlyOpen &&
@@ -221,9 +204,7 @@ export function SignInWithB3Flow({ strategies, onLoginSuccess, onSessionKeySucce
             // Normal flow continues after Turnkey auth is complete (or if not needed)
             handlePostTurnkeyFlow();
         }
-    }, 
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-    [
+    }, [
         signers,
         isFetchingSigners,
         partnerId,
@@ -239,10 +220,11 @@ export function SignInWithB3Flow({ strategies, onLoginSuccess, onSessionKeySucce
         isAuthenticating,
         isAuthenticated,
         isOpen,
+        setJustCompletedLogin,
         user,
         enableTurnkey,
         turnkeyAuthCompleted,
-        // handleTurnkeySuccess, // This is causing infinite loops
+        handleTurnkeySuccess,
         contentType,
         handlePostTurnkeyFlow,
     ]);
@@ -259,9 +241,7 @@ export function SignInWithB3Flow({ strategies, onLoginSuccess, onSessionKeySucce
         if (closeAfterLogin && sessionKeyAdded) {
             setB3ModalOpen(false);
         }
-        // setB3ModalOpen is stable
-        // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [closeAfterLogin, sessionKeyAdded]);
+    }, [closeAfterLogin, sessionKeyAdded, setB3ModalOpen]);
     const onSessionKeySuccessEnhanced = useCallback(() => {
         onSessionKeySuccess?.();
         setB3ModalContentType({
@@ -307,57 +287,21 @@ export function SignInWithB3Flow({ strategies, onLoginSuccess, onSessionKeySucce
     if (refetchError) {
         content = (_jsx(LoginStepContainer, { partnerId: partnerId, children: _jsx("div", { className: "p-4 text-center text-red-500", children: refetchError }) }));
     }
+    else if (isAuthenticating || (isFetchingSigners && step === "login") || source === "requestPermissions") {
+        content = (_jsx(LoginStepContainer, { partnerId: partnerId, children: _jsx("div", { className: "my-8 flex min-h-[350px] items-center justify-center", children: _jsx(Loading, { variant: "white", size: "lg" }) }) }));
+    }
     else if (step === "login") {
-        // PRIORITY: If NEXT_PUBLIC_TURNKEY_PRIMARY is true, show Turnkey modal FIRST as the primary authentication option
-        // Setting NEXT_PUBLIC_TURNKEY_PRIMARY="true" implicitly enables Turnkey
-        const isTurnkeyPrimary = process.env.NEXT_PUBLIC_TURNKEY_PRIMARY === "true";
-        const shouldShowTurnkeyFirst = isTurnkeyPrimary && !turnkeyAuthCompleted;
-        if (shouldShowTurnkeyFirst) {
-            // Don't show loading spinner for Turnkey - let the modal handle its own loading state
-            // This prevents the infinite loop where isAuthenticating causes the modal to be replaced
-            debug("Showing Turnkey as primary authentication option", {
-                isTurnkeyPrimary,
-                turnkeyAuthCompleted,
-                isAuthenticated,
-            });
-            // Show Turnkey authentication as primary option
-            content = (_jsx(LoginStepContainer, { partnerId: partnerId, children: _jsx(TurnkeyAuthModal, { onSuccess: async (authenticatedUser) => {
-                        debug("Turnkey authentication successful in primary flow", { authenticatedUser });
-                        setTurnkeyAuthCompleted(true);
-                        // After Turnkey auth, refetch user to get the full user object
-                        await refetchUser();
-                        // User is now authenticated via Turnkey
-                        // Set both isAuthenticated and isConnected to true so UI updates properly
-                        // Wallet connection is optional and can happen later for signing transactions
-                        setIsAuthenticated(true);
-                        setIsConnected(true);
-                        setJustCompletedLogin(true);
-                        // Call the login success callback
-                        onLoginSuccess?.({});
-                    }, onClose: () => {
-                        // If user closes Turnkey modal, they can still use wallet connection as fallback
-                        setTurnkeyAuthCompleted(true);
-                    }, initialEmail: "", skipToOtp: false }) }));
+        // Custom strategy
+        if (strategies?.[0] === "privy") {
+            content = _jsx(SignInWithB3Privy, { onSuccess: handleLoginSuccess, chain: chain });
+        }
+        else if (strategies) {
+            // Strategies are explicitly provided
+            content = (_jsx(LoginStepCustom, { strategies: strategies, chain: chain, onSuccess: handleLoginSuccess, onError: onError, automaticallySetFirstEoa: !!automaticallySetFirstEoa }));
         }
         else {
-            // Show loading spinner only if not in Turnkey flow
-            if (isAuthenticating || (isFetchingSigners && step === "login") || source === "requestPermissions") {
-                content = (_jsx(LoginStepContainer, { partnerId: partnerId, children: _jsx("div", { className: "my-8 flex min-h-[350px] items-center justify-center", children: _jsx(Loading, { variant: "white", size: "lg" }) }) }));
-            }
-            else {
-                // Custom strategy
-                if (strategies?.[0] === "privy") {
-                    content = _jsx(SignInWithB3Privy, { onSuccess: handleLoginSuccess, chain: chain });
-                }
-                else if (strategies) {
-                    // Strategies are explicitly provided
-                    content = (_jsx(LoginStepCustom, { strategies: strategies, chain: chain, onSuccess: handleLoginSuccess, onError: onError, automaticallySetFirstEoa: !!automaticallySetFirstEoa }));
-                }
-                else {
-                    // Default to handle all strategies we support
-                    content = _jsx(LoginStep, { chain: chain, onSuccess: handleLoginSuccess, onError: onError });
-                }
-            }
+            // Default to handle all strategies we support
+            content = _jsx(LoginStep, { chain: chain, onSuccess: handleLoginSuccess, onError: onError });
         }
     }
     return content;

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

@@ -1,10 +1,10 @@
 import { jsx as _jsx } from "react/jsx-runtime";
-import { Loading, useAuthentication, useAuthStore, useB3Config, useHandleConnectWithPrivy, } from "../../../../global-account/react/index.js";
+import { Loading, useAuthentication, useAuthStore, useB3, useHandleConnectWithPrivy, } from "../../../../global-account/react/index.js";
 import { debugB3React } from "../../../../shared/utils/debug.js";
 import { useEffect } from "react";
 const debug = debugB3React("SignInWithB3Privy");
 export function SignInWithB3Privy({ onSuccess, onError, chain }) {
-    const { partnerId } = useB3Config();
+    const { partnerId } = useB3();
     const { isLoading, connectTw, fullToken } = useHandleConnectWithPrivy(chain, onSuccess);
     const setIsAuthenticating = useAuthStore(state => state.setIsAuthenticating);
     const setIsAuthenticated = useAuthStore(state => state.setIsAuthenticated);

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

@@ -1,5 +1,5 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { useAuthentication, useB3Config, useQueryB3 } from "../../../../../global-account/react/index.js";
+import { useAuthentication, useB3, useQueryB3 } from "../../../../../global-account/react/index.js";
 import { ecosystemWalletId } from "../../../../../shared/constants/index.js";
 import { client } from "../../../../../shared/utils/thirdweb.js";
 import { ConnectEmbed, darkTheme, lightTheme } from "thirdweb/react";
@@ -15,7 +15,7 @@ export function LoginStepContainer({ children, partnerId }) {
     return (_jsxs("div", { className: "bg-b3-react-background flex flex-col items-center justify-center pt-6", children: [partnerLogo && (_jsx("img", { src: partnerLogo, alt: "Partner Logo", className: "partner-logo mb-6 h-12 w-auto object-contain" })), children] }));
 }
 export function LoginStep({ onSuccess, chain }) {
-    const { partnerId, theme } = useB3Config();
+    const { partnerId, theme } = useB3();
     const wallet = ecosystemWallet(ecosystemWalletId, {
         partnerId: partnerId,
     });

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

@@ -1,5 +1,5 @@
 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 { AuthButton, Button, getConnectOptionsFromStrategy, isWalletType, LoginStepContainer, useAuthentication, useAuthStore, useB3, useConnect, WalletRow, } from "../../../../../global-account/react/index.js";
 import { debugB3React } from "../../../../../shared/utils/debug.js";
 import { client } from "../../../../../shared/utils/thirdweb.js";
 import { useState } from "react";
@@ -7,7 +7,7 @@ import { useConnect as useConnectTW } from "thirdweb/react";
 import { createWallet } from "thirdweb/wallets";
 const debug = debugB3React("LoginStepCustom");
 export function LoginStepCustom({ onSuccess, onError, chain, strategies, maxInitialWallets = 2, automaticallySetFirstEoa, }) {
-    const { partnerId } = useB3Config();
+    const { partnerId } = useB3();
     const [isLoading, setIsLoading] = useState(false);
     const [showAllWallets, setShowAllWallets] = useState(false);
     const { connect } = useConnect(partnerId, chain);

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

@@ -1,6 +1,6 @@
 import { jsx as _jsx } from "react/jsx-runtime";
-import { useB3Config } from "./B3Provider/useB3Config.js";
+import { useB3 } from "./B3Provider/useB3.js";
 export function StyleRoot({ children, id }) {
-    const { theme } = useB3Config();
-    return (_jsx("div", { className: "b3-root", id: id, "data-theme": theme, children: children }));
+    const { theme: b3Theme } = useB3();
+    return (_jsx("div", { className: "b3-root", id: id, "data-theme": b3Theme, children: children }));
 }

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

@@ -1,5 +1,5 @@
-import { jsxs as _jsxs, jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
-import { useEffect, useRef, useState } from "react";
+import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
+import { useState, useEffect, useRef } from "react";
 import { useTurnkeyAuth } from "../hooks/useTurnkeyAuth.js";
 export function TurnkeyAuthModal({ onClose, onSuccess, initialEmail = "", skipToOtp = false }) {
     const [step, setStep] = useState(skipToOtp ? "otp" : "email");
@@ -77,7 +77,5 @@ export function TurnkeyAuthModal({ onClose, onSuccess, initialEmail = "", skipTo
             console.error("Failed to resend OTP:", err);
         }
     };
-    const isTurnkeyPrimary = process.env.NEXT_PUBLIC_TURNKEY_PRIMARY === "true";
-    const walletBrand = isTurnkeyPrimary ? "Smart Wallet" : "AnySpend Wallet";
-    return (_jsxs("div", { className: "font-neue-montreal p-8", children: [step === "email" && (_jsxs(_Fragment, { children: [_jsxs("h2", { className: "mb-6 text-center text-2xl font-bold text-gray-900 dark:text-white", children: ["Setup your ", walletBrand] }), _jsxs("div", { className: "mb-6 space-y-3 text-center text-sm text-gray-600 dark:text-gray-400", children: [_jsxs("p", { children: [isTurnkeyPrimary ? "We use a secure," : "AnySpend uses a secure,", _jsx("br", {}), "embedded wallet to fund your workflows."] }), _jsxs("p", { children: ["Please provide an email address to secure", _jsx("br", {}), "your wallet."] })] }), _jsxs("form", { onSubmit: handleEmailSubmit, className: "space-y-4", children: [_jsx("div", { children: _jsx("input", { type: "email", placeholder: "email", value: email, onChange: e => setEmail(e.target.value), required: true, disabled: isLoading, className: "w-full rounded-lg border border-gray-300 px-4 py-3 text-center text-gray-900 placeholder-gray-400 focus:border-blue-500 focus:outline-none focus:ring-2 focus:ring-blue-500/20 disabled:cursor-not-allowed disabled:bg-gray-50 dark:border-gray-700 dark:bg-gray-800 dark:text-white dark:placeholder-gray-500" }) }), error && (_jsx("div", { className: "rounded-md bg-red-50 p-3 text-sm text-red-800 dark:bg-red-900/20 dark:text-red-400", children: error })), _jsx("button", { type: "submit", disabled: isLoading || !email, className: "w-full rounded-lg bg-blue-600 px-6 py-3 font-semibold text-white transition-all duration-200 hover:bg-blue-700 disabled:cursor-not-allowed disabled:bg-gray-300 dark:disabled:bg-gray-700", children: isLoading ? (_jsxs("span", { className: "flex items-center justify-center gap-2", children: [_jsx("div", { className: "h-4 w-4 animate-spin rounded-full border-2 border-white border-t-transparent" }), "Sending..."] })) : ("Continue") })] })] })), step === "otp" && (_jsxs(_Fragment, { children: [_jsx("h2", { className: "mb-4 text-center text-2xl font-bold text-gray-900 dark:text-white", children: "2FA Security" }), _jsx("div", { className: "mb-6 space-y-3 text-center text-sm text-gray-600 dark:text-gray-400", children: _jsxs("p", { children: [isTurnkeyPrimary ? "We use a secure," : "AnySpend uses a secure,", _jsx("br", {}), "embedded wallet to fund your workflows.", _jsx("br", {}), "Please provide 2FA code sent to your email."] }) }), _jsxs("form", { onSubmit: handleOtpSubmit, className: "space-y-4", children: [_jsx("div", { children: _jsx("input", { type: "text", placeholder: "Enter code", value: otpCode, onChange: e => setOtpCode(e.target.value.toUpperCase()), required: true, disabled: isLoading, autoFocus: true, className: "w-full rounded-lg border border-gray-300 px-4 py-3 text-center font-mono text-lg uppercase tracking-wider text-gray-900 placeholder-gray-400 focus:border-blue-500 focus:outline-none focus:ring-2 focus:ring-blue-500/20 disabled:cursor-not-allowed disabled:bg-gray-50 dark:border-gray-700 dark:bg-gray-800 dark:text-white dark:placeholder-gray-500", maxLength: 20 }) }), error && (_jsx("div", { className: "rounded-md bg-red-50 p-3 text-sm text-red-800 dark:bg-red-900/20 dark:text-red-400", children: error })), _jsxs("div", { className: "flex flex-col gap-2", children: [_jsx("button", { type: "submit", disabled: isLoading || !otpCode, className: "w-full rounded-lg bg-blue-600 px-6 py-3 font-semibold text-white transition-all duration-200 hover:bg-blue-700 disabled:cursor-not-allowed disabled:bg-gray-300 dark:disabled:bg-gray-700", children: isLoading ? (_jsxs("span", { className: "flex items-center justify-center gap-2", children: [_jsx("div", { className: "h-4 w-4 animate-spin rounded-full border-2 border-white border-t-transparent" }), "Verifying..."] })) : ("Confirm") }), _jsx("button", { type: "button", onClick: handleResendOtp, disabled: isLoading, className: "text-sm text-blue-600 hover:text-blue-700 hover:underline disabled:cursor-not-allowed disabled:text-gray-400 dark:text-blue-400 dark:hover:text-blue-300", children: "Resend code" })] })] })] })), step === "success" && (_jsxs("div", { className: "text-center", children: [_jsx("div", { className: "mb-6 flex items-center justify-center", children: _jsx("div", { className: "flex h-16 w-16 items-center justify-center rounded-full bg-green-100 dark:bg-green-900/20", children: _jsx("svg", { className: "h-8 w-8 text-green-600 dark:text-green-400", fill: "none", viewBox: "0 0 24 24", stroke: "currentColor", children: _jsx("path", { strokeLinecap: "round", strokeLinejoin: "round", strokeWidth: 2, d: "M5 13l4 4L19 7" }) }) }) }), _jsx("h2", { className: "mb-2 text-2xl font-bold text-gray-900 dark:text-white", children: "Successfully Authenticated!" }), _jsx("p", { className: "text-sm text-gray-600 dark:text-gray-400", children: "Redirecting..." })] }))] }));
+    return (_jsxs("div", { className: "font-neue-montreal p-8", children: [step === "email" && (_jsxs(_Fragment, { children: [_jsx("h2", { className: "mb-6 text-center text-2xl font-bold text-gray-900 dark:text-white", children: "Setup your AnySpend Wallet" }), _jsxs("div", { className: "mb-6 space-y-3 text-center text-sm text-gray-600 dark:text-gray-400", children: [_jsxs("p", { children: ["AnySpend uses a secure,", _jsx("br", {}), "embedded wallet to fund your workflows."] }), _jsxs("p", { children: ["Please provide an email address to secure", _jsx("br", {}), "your wallet."] })] }), _jsxs("form", { onSubmit: handleEmailSubmit, className: "space-y-4", children: [_jsx("div", { children: _jsx("input", { type: "email", placeholder: "email", value: email, onChange: e => setEmail(e.target.value), required: true, disabled: isLoading, className: "w-full rounded-lg border border-gray-300 px-4 py-3 text-center text-gray-900 placeholder-gray-400 focus:border-blue-500 focus:outline-none focus:ring-2 focus:ring-blue-500/20 disabled:cursor-not-allowed disabled:bg-gray-50 dark:border-gray-700 dark:bg-gray-800 dark:text-white dark:placeholder-gray-500" }) }), error && (_jsx("div", { className: "rounded-md bg-red-50 p-3 text-sm text-red-800 dark:bg-red-900/20 dark:text-red-400", children: error })), _jsx("button", { type: "submit", disabled: isLoading || !email, className: "w-full rounded-lg bg-blue-600 px-6 py-3 font-semibold text-white transition-all duration-200 hover:bg-blue-700 disabled:cursor-not-allowed disabled:bg-gray-300 dark:disabled:bg-gray-700", children: isLoading ? (_jsxs("span", { className: "flex items-center justify-center gap-2", children: [_jsx("div", { className: "h-4 w-4 animate-spin rounded-full border-2 border-white border-t-transparent" }), "Sending..."] })) : ("Continue") })] })] })), step === "otp" && (_jsxs(_Fragment, { children: [_jsx("h2", { className: "mb-4 text-center text-2xl font-bold text-gray-900 dark:text-white", children: "2FA Security" }), _jsx("div", { className: "mb-6 space-y-3 text-center text-sm text-gray-600 dark:text-gray-400", children: _jsxs("p", { children: ["AnySpend uses a secure,", _jsx("br", {}), "embedded wallet to fund your workflows.", _jsx("br", {}), "Please provide 2FA code sent to your email."] }) }), _jsxs("form", { onSubmit: handleOtpSubmit, className: "space-y-4", children: [_jsx("div", { children: _jsx("input", { type: "text", placeholder: "Enter code", value: otpCode, onChange: e => setOtpCode(e.target.value.toUpperCase()), required: true, disabled: isLoading, autoFocus: true, className: "w-full rounded-lg border border-gray-300 px-4 py-3 text-center font-mono text-lg uppercase tracking-wider text-gray-900 placeholder-gray-400 focus:border-blue-500 focus:outline-none focus:ring-2 focus:ring-blue-500/20 disabled:cursor-not-allowed disabled:bg-gray-50 dark:border-gray-700 dark:bg-gray-800 dark:text-white dark:placeholder-gray-500", maxLength: 20 }) }), error && (_jsx("div", { className: "rounded-md bg-red-50 p-3 text-sm text-red-800 dark:bg-red-900/20 dark:text-red-400", children: error })), _jsxs("div", { className: "flex flex-col gap-2", children: [_jsx("button", { type: "submit", disabled: isLoading || !otpCode, className: "w-full rounded-lg bg-blue-600 px-6 py-3 font-semibold text-white transition-all duration-200 hover:bg-blue-700 disabled:cursor-not-allowed disabled:bg-gray-300 dark:disabled:bg-gray-700", children: isLoading ? (_jsxs("span", { className: "flex items-center justify-center gap-2", children: [_jsx("div", { className: "h-4 w-4 animate-spin rounded-full border-2 border-white border-t-transparent" }), "Verifying..."] })) : ("Confirm") }), _jsx("button", { type: "button", onClick: handleResendOtp, disabled: isLoading, className: "text-sm text-blue-600 hover:text-blue-700 hover:underline disabled:cursor-not-allowed disabled:text-gray-400 dark:text-blue-400 dark:hover:text-blue-300", children: "Resend code" })] })] })] })), step === "success" && (_jsxs("div", { className: "text-center", children: [_jsx("div", { className: "mb-6 flex items-center justify-center", children: _jsx("div", { className: "flex h-16 w-16 items-center justify-center rounded-full bg-green-100 dark:bg-green-900/20", children: _jsx("svg", { className: "h-8 w-8 text-green-600 dark:text-green-400", fill: "none", viewBox: "0 0 24 24", stroke: "currentColor", children: _jsx("path", { strokeLinecap: "round", strokeLinejoin: "round", strokeWidth: 2, d: "M5 13l4 4L19 7" }) }) }) }), _jsx("h2", { className: "mb-2 text-2xl font-bold text-gray-900 dark:text-white", children: "Successfully Authenticated!" }), _jsx("p", { className: "text-sm text-gray-600 dark:text-gray-400", children: "Redirecting..." })] }))] }));
 }

package/dist/esm/global-account/react/components/custom/ManageAccountButton.js

@@ -1,9 +1,10 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { Button, StyleRoot, useModalStore, useUser } from "../../../../global-account/react/index.js";
+import { Button, StyleRoot, useAuthentication, useB3, useModalStore } from "../../../../global-account/react/index.js";
 import { cn } from "../../../../shared/utils/index.js";
 export function ManageAccountButton(props) {
+    const { partnerId } = useB3();
     const { setB3ModalOpen, setB3ModalContentType } = useModalStore();
-    const { isConnected } = useUser();
+    const { isConnected } = useAuthentication(partnerId);
     const handleClickManageAccount = () => {
         setB3ModalContentType({
             ...props,

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

@@ -1,6 +1,7 @@
 export { B3DynamicModal } from "./B3DynamicModal";
-export { B3Provider } from "./B3Provider/B3Provider";
+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";

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

@@ -1,8 +1,9 @@
 // TODO woj: Barrel file for all components, this might be reason of bundle size issues
 // Core Components
 export { B3DynamicModal } from "./B3DynamicModal.js";
-export { B3Provider } from "./B3Provider/B3Provider.js";
+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";

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

@@ -3,7 +3,6 @@ export { useAccountAssets } from "./useAccountAssets";
 export { useAccountWallet } from "./useAccountWallet";
 export { useAddTWSessionKey } from "./useAddTWSessionKey";
 export { useAnalytics } from "./useAnalytics";
-export { useAuth } from "./useAuth";
 export { useAuthentication } from "./useAuthentication";
 export { useB3BalanceFromAddresses } from "./useB3BalanceFromAddresses";
 export { useB3EnsName } from "./useB3EnsName";
@@ -43,4 +42,3 @@ export { useTokensFromAddress } from "./useTokensFromAddress";
 export { useTurnkeyAuth } from "./useTurnkeyAuth";
 export { useUnifiedChainSwitchAndExecute } from "./useUnifiedChainSwitchAndExecute";
 export { useURLParams } from "./useURLParams";
-export { useUser } from "./useUser";

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

@@ -3,7 +3,6 @@ export { useAccountAssets } from "./useAccountAssets.js";
 export { useAccountWallet } from "./useAccountWallet.js";
 export { useAddTWSessionKey } from "./useAddTWSessionKey.js";
 export { useAnalytics } from "./useAnalytics.js";
-export { useAuth } from "./useAuth.js";
 export { useAuthentication } from "./useAuthentication.js";
 export { useB3BalanceFromAddresses } from "./useB3BalanceFromAddresses.js";
 export { useB3EnsName } from "./useB3EnsName.js";
@@ -43,4 +42,3 @@ export { useTokensFromAddress } from "./useTokensFromAddress.js";
 export { useTurnkeyAuth } from "./useTurnkeyAuth.js";
 export { useUnifiedChainSwitchAndExecute } from "./useUnifiedChainSwitchAndExecute.js";
 export { useURLParams } from "./useURLParams.js";
-export { useUser } from "./useUser.js";

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

@@ -1,11 +1,11 @@
-import { useB3Config } from "../../../global-account/react/index.js";
+import { useB3 } from "../../../global-account/react/index.js";
 import { useCallback } from "react";
 import { authenticateBoth, authenticateWithClient, getClient, getClientByType, setClientType, } from "../../client-manager.js";
 /**
  * Hook to access the current FeathersJS client and client management utilities
  */
 export function useClient() {
-    const { clientType } = useB3Config();
+    const { clientType } = useB3();
     const getCurrentClient = useCallback(() => {
         return getClient();
     }, []);

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

@@ -1,4 +1,4 @@
-import { useB3Config, useConnect } from "../../../global-account/react/index.js";
+import { useB3, useConnect } from "../../../global-account/react/index.js";
 import { debugB3React } from "../../../shared/utils/debug.js";
 import { useIdentityToken, usePrivy } from "@privy-io/react-auth";
 import { useCallback, useRef, useState } from "react";
@@ -8,7 +8,7 @@ const debug = debugB3React("@@b3:useHandleConnectWithPrivy");
  * Currently, this is for the basement-privy strategy
  */
 export function useHandleConnectWithPrivy(chain, onSuccess) {
-    const { partnerId } = useB3Config();
+    const { partnerId } = useB3();
     if (!chain) {
         throw new Error("Chain is required");
     }

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

@@ -1,7 +1,7 @@
-import { useB3Config } from "../../../global-account/react/index.js";
 import { getAuthToken } from "../../../shared/utils/auth-token.js";
 import { debugB3React } from "../../../shared/utils/debug.js";
 import { useCallback, useEffect, useState } from "react";
+import { useB3 } from "../components/index.js";
 import { notificationsAPI } from "../utils/notificationsAPI.js";
 import { useUserQuery } from "./useUserQuery.js";
 const debug = debugB3React("useNotifications");
@@ -27,7 +27,7 @@ const debug = debugB3React("useNotifications");
  */
 export function useNotifications() {
     const { user } = useUserQuery();
-    const { partnerId } = useB3Config();
+    const { partnerId } = useB3();
     const [userData, setUserData] = useState(null);
     const [loading, setLoading] = useState(true);
     const [error, setError] = useState(null);

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

@@ -1,7 +1,4 @@
 import { Wallet } from "thirdweb/wallets";
-/**
- * @deprecated Use useAuth() with Turnkey authentication instead
- */
 export declare function useTWAuth(): {
     authenticate: (wallet: Wallet, partnerId: string) => Promise<import("@feathersjs/authentication").AuthenticationResult>;
 };

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

@@ -1,16 +1,8 @@
-/**
- * @deprecated This hook is deprecated. Use useAuth() with Turnkey authentication instead.
- * This file is kept for backward compatibility but should not be used in new code.
- */
 import app from "../../../global-account/app.js";
 import debug from "../../../shared/utils/debug.js";
 import { useCallback } from "react";
 import { useSearchParam } from "./useSearchParamsSSR.js";
-/**
- * @deprecated Use useAuth() with Turnkey authentication instead
- */
 export function useTWAuth() {
-    console.warn("useTWAuth is deprecated. Please migrate to useAuth() with Turnkey authentication. See useTurnkeyAuth.ts for the new implementation.");
     const referralCode = useSearchParam("referralCode");
     const authenticate = useCallback(async (wallet, partnerId) => {
         if (!wallet || !wallet?.getAuthToken?.())