@b3dotfun/sdk 0.1.2 → 0.1.5

package/dist/cjs/anyspend/react/hooks/useDirectTransfer.d.ts

@@ -0,0 +1,17 @@
+import { CryptoPaymentMethodType } from "../components/common/CryptoPaymentMethod";
+interface DirectTransferParams {
+    chainId: number;
+    tokenAddress: string;
+    recipientAddress: string;
+    amount: bigint;
+    method: CryptoPaymentMethodType;
+}
+/**
+ * Hook for executing direct token transfers (same chain, same token)
+ * bypassing the swap backend.
+ */
+export declare function useDirectTransfer(): {
+    executeDirectTransfer: ({ chainId, tokenAddress, recipientAddress, amount, method, }: DirectTransferParams) => Promise<string | undefined>;
+    isTransferring: boolean;
+};
+export {};

package/dist/cjs/anyspend/react/hooks/useDirectTransfer.js

@@ -0,0 +1,46 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.useDirectTransfer = useDirectTransfer;
+const react_1 = require("../../../global-account/react");
+const token_1 = require("../../../anyspend/utils/token");
+const viem_1 = require("viem");
+const react_2 = require("react");
+const CryptoPaymentMethod_1 = require("../components/common/CryptoPaymentMethod");
+/**
+ * Hook for executing direct token transfers (same chain, same token)
+ * bypassing the swap backend.
+ */
+function useDirectTransfer() {
+    const { switchChainAndExecute, switchChainAndExecuteWithEOA, isSwitchingOrExecuting } = (0, react_1.useUnifiedChainSwitchAndExecute)();
+    const executeDirectTransfer = (0, react_2.useCallback)(async ({ chainId, tokenAddress, recipientAddress, amount, method, }) => {
+        const isNative = (0, token_1.isNativeToken)(tokenAddress);
+        // Choose the correct execution function based on payment method
+        const execute = method === CryptoPaymentMethod_1.CryptoPaymentMethodType.CONNECT_WALLET ? switchChainAndExecuteWithEOA : switchChainAndExecute;
+        let txHash;
+        if (isNative) {
+            // Native token transfer (ETH, etc.)
+            txHash = await execute(chainId, {
+                to: recipientAddress,
+                value: amount,
+            });
+        }
+        else {
+            // ERC20 token transfer
+            const transferData = (0, viem_1.encodeFunctionData)({
+                abi: viem_1.erc20Abi,
+                functionName: "transfer",
+                args: [recipientAddress, amount],
+            });
+            txHash = await execute(chainId, {
+                to: tokenAddress,
+                data: transferData,
+                value: BigInt(0),
+            });
+        }
+        return txHash;
+    }, [switchChainAndExecute, switchChainAndExecuteWithEOA]);
+    return {
+        executeDirectTransfer,
+        isTransferring: isSwitchingOrExecuting,
+    };
+}

package/dist/cjs/anyspend/react/hooks/useRecipientAddressState.js

@@ -38,7 +38,7 @@ function useRecipientAddressState({ recipientAddressFromProps, walletAddress, gl
     // selectedRecipientAddress: explicitly selected by user (undefined means no explicit selection)
     const [selectedRecipientAddress, setSelectedRecipientAddress] = (0, react_1.useState)(undefined);
     // The effective recipient address, derived on each render, respecting priority.
-    const effectiveRecipientAddress = recipientAddressFromProps || selectedRecipientAddress || walletAddress || globalAddress;
+    const effectiveRecipientAddress = selectedRecipientAddress || recipientAddressFromProps || walletAddress || globalAddress;
     // Helper function to reset user's manual selection.
     const resetRecipientAddress = () => {
         setSelectedRecipientAddress(undefined);

package/dist/cjs/anyspend/utils/format.js

@@ -6,7 +6,11 @@ const getStatusDisplay = (order) => {
     const srcToken = order.metadata?.srcToken;
     const dstToken = order.metadata?.dstToken;
     const formattedSrcAmount = srcToken ? (0, number_1.formatTokenAmount)(BigInt(order.srcAmount), srcToken.decimals) : undefined;
-    const actualDstAmount = order.settlement?.actualDstAmount;
+    // For custom orders, use payload.amount as fallback if actualDstAmount is not available
+    const actualDstAmount = order.settlement?.actualDstAmount ||
+        (order.type === "custom" || order.type === "custom_exact_in" || order.type === "deposit_first"
+            ? order.payload.amount?.toString()
+            : undefined);
     const formattedActualDstAmount = actualDstAmount && dstToken ? (0, number_1.formatTokenAmount)(BigInt(actualDstAmount), dstToken.decimals) : undefined;
     switch (order.status) {
         case "scanning_deposit_transaction": {
@@ -43,6 +47,7 @@ const getStatusDisplay = (order) => {
             };
         case "executed": {
             const receivedText = formattedActualDstAmount && dstToken ? `Received ${formattedActualDstAmount} ${dstToken.symbol}` : undefined;
+            const actionText = order.metadata?.action || "Order";
             const { text, description } = order.type === "swap"
                 ? { text: receivedText || "Swap Complete", description: "Your swap has been completed successfully." }
                 : order.type === "mint_nft"
@@ -51,7 +56,12 @@ const getStatusDisplay = (order) => {
                         ? { text: "Tournament Joined", description: "You have joined the tournament" }
                         : order.type === "fund_tournament"
                             ? { text: "Tournament Funded", description: "You have funded the tournament" }
-                            : { text: receivedText || "Order Complete", description: "Your order has been completed" };
+                            : order.type === "custom" || order.type === "custom_exact_in"
+                                ? {
+                                    text: receivedText || `${actionText} Complete`,
+                                    description: "Your order has been completed successfully.",
+                                }
+                                : { text: receivedText || "Order Complete", description: "Your order has been completed" };
             return { text, status: "success", description };
         }
         case "refunding":

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

@@ -25,7 +25,6 @@ const RequestPermissions_1 = require("./RequestPermissions/RequestPermissions");
 const Send_1 = require("./Send/Send");
 const SignInWithB3Flow_1 = require("./SignInWithB3/SignInWithB3Flow");
 const index_1 = require("./Toast/index");
-const TurnkeyAuthModal_1 = require("./TurnkeyAuthModal");
 const dialog_1 = require("./ui/dialog");
 const drawer_1 = require("./ui/drawer");
 const debug = (0, debug_1.debugB3React)("B3DynamicModal");
@@ -50,7 +49,6 @@ function B3DynamicModal() {
         "anySpendBuySpin",
         "anySpendOrderHistory",
         "signInWithB3",
-        "turnkeyAuth",
         "anySpendSignatureMint",
         "anySpendBondKit",
         "linkAccount",
@@ -80,7 +78,7 @@ function B3DynamicModal() {
     const hideCloseButton = true;
     // Build content class using cn utility
     // eslint-disable-next-line tailwindcss/no-custom-classname
-    const contentClass = (0, cn_1.cn)("b3-modal", theme === "dark" && "dark", fullWidthTypes.includes(contentType?.type) && "w-full", isFreestyleType && "b3-modal-freestyle", contentType?.type === "signInWithB3" && "p-0", contentType?.type === "turnkeyAuth" && "p-0", contentType?.type === "anySpend" && "md:p-0", contentType?.type === "send" && "p-0", contentType?.type === "manageAccount" && " md:p-0 md:pt-2", contentType?.type === "linkAccount" && "md:p-0");
+    const contentClass = (0, cn_1.cn)("b3-modal", theme === "dark" && "dark", fullWidthTypes.includes(contentType?.type) && "w-full", isFreestyleType && "b3-modal-freestyle", contentType?.type === "signInWithB3" && "p-0", contentType?.type === "anySpend" && "md:p-0", contentType?.type === "send" && "p-0", contentType?.type === "manageAccount" && " md:p-0 md:pt-2", contentType?.type === "linkAccount" && "md:p-0");
     debug("contentType", contentType);
     const renderContent = () => {
         if (!contentType)
@@ -88,8 +86,6 @@ function B3DynamicModal() {
         switch (contentType.type) {
             case "signInWithB3":
                 return (0, jsx_runtime_1.jsx)(SignInWithB3Flow_1.SignInWithB3Flow, { ...contentType });
-            case "turnkeyAuth":
-                return (0, jsx_runtime_1.jsx)(TurnkeyAuthModal_1.TurnkeyAuthModal, { ...contentType });
             case "requestPermissions":
                 return (0, jsx_runtime_1.jsx)(RequestPermissions_1.RequestPermissions, { ...contentType });
             case "manageAccount":

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

@@ -13,9 +13,8 @@ export interface B3ConfigContextType {
     partnerId: string;
     stripePublishableKey?: string;
     createClientReferenceId?: (params: CreateOrderParams | CreateOnrampOrderParams) => Promise<string>;
-    enableTurnkey: boolean;
 }
-export declare function B3ConfigProvider({ children, accountOverride, environment, defaultPermissions, automaticallySetFirstEoa, theme, clientType, partnerId, stripePublishableKey, createClientReferenceId, enableTurnkey, }: {
+export declare function B3ConfigProvider({ children, accountOverride, environment, defaultPermissions, automaticallySetFirstEoa, theme, clientType, partnerId, stripePublishableKey, createClientReferenceId, }: {
     children: React.ReactNode;
     accountOverride?: Account;
     environment?: "development" | "production";
@@ -26,6 +25,5 @@ export declare function B3ConfigProvider({ children, accountOverride, environmen
     partnerId: string;
     stripePublishableKey?: string;
     createClientReferenceId?: (params: CreateOrderParams | CreateOnrampOrderParams) => Promise<string>;
-    enableTurnkey?: boolean;
 }): import("react/jsx-runtime").JSX.Element;
 export declare function useB3Config(): B3ConfigContextType;

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

@@ -14,7 +14,7 @@ const DEFAULT_PERMISSIONS = {
     endDate: new Date(Date.now() + 1000 * 60 * 60 * 24 * 365), // 1 year from now
 };
 const B3ConfigContext = (0, react_1.createContext)(null);
-function B3ConfigProvider({ children, accountOverride, environment = "development", defaultPermissions = DEFAULT_PERMISSIONS, automaticallySetFirstEoa = false, theme = "light", clientType = "rest", partnerId, stripePublishableKey, createClientReferenceId, enableTurnkey = false, }) {
+function B3ConfigProvider({ children, accountOverride, environment = "development", defaultPermissions = DEFAULT_PERMISSIONS, automaticallySetFirstEoa = false, theme = "light", clientType = "rest", partnerId, stripePublishableKey, createClientReferenceId, }) {
     return ((0, jsx_runtime_1.jsx)(B3ConfigContext.Provider, { value: {
             accountOverride,
             environment,
@@ -25,7 +25,6 @@ function B3ConfigProvider({ children, accountOverride, environment = "developmen
             partnerId,
             stripePublishableKey,
             createClientReferenceId,
-            enableTurnkey,
         }, children: children }));
 }
 function useB3Config() {

package/dist/cjs/global-account/react/components/B3Provider/B3Provider.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";
@@ -9,7 +8,7 @@ import { ClientType } from "../../../client-manager";
 /**
  * Main B3Provider component
  */
-export declare function B3Provider({ theme, children, accountOverride, environment, automaticallySetFirstEoa, simDuneApiKey, toaster: _toaster, clientType, rpcUrls, partnerId, stripePublishableKey, onConnect, onLogout, connectors, overrideDefaultConnectors, createClientReferenceId, enableTurnkey, defaultPermissions, onTurnkeyConnect, }: {
+export declare function B3Provider({ theme, children, accountOverride, environment, automaticallySetFirstEoa, simDuneApiKey, toaster: _toaster, clientType, rpcUrls, partnerId, stripePublishableKey, onConnect, onLogout, connectors, overrideDefaultConnectors, createClientReferenceId, defaultPermissions, }: {
     theme: "light" | "dark";
     children: React.ReactNode;
     accountOverride?: Account;
@@ -30,7 +29,5 @@ export declare function B3Provider({ theme, children, accountOverride, environme
     connectors?: CreateConnectorFn[];
     overrideDefaultConnectors?: boolean;
     createClientReferenceId?: (params: CreateOrderParams | CreateOnrampOrderParams) => Promise<string>;
-    enableTurnkey?: boolean;
     defaultPermissions?: PermissionsConfig;
-    onTurnkeyConnect?: (user: Users) => void | Promise<void>;
 }): import("react/jsx-runtime").JSX.Element;

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

@@ -26,7 +26,7 @@ const queryClient = new react_query_1.QueryClient();
  */
 function B3Provider({ theme = "light", children, accountOverride, environment, automaticallySetFirstEoa, simDuneApiKey, 
 // deprecated since v0.0.87
-toaster: _toaster, clientType = "rest", rpcUrls, partnerId, stripePublishableKey, onConnect, onLogout, connectors, overrideDefaultConnectors = false, createClientReferenceId, enableTurnkey = false, defaultPermissions, onTurnkeyConnect, }) {
+toaster: _toaster, clientType = "rest", rpcUrls, partnerId, stripePublishableKey, onConnect, onLogout, connectors, overrideDefaultConnectors = false, createClientReferenceId, defaultPermissions, }) {
     // Initialize Google Analytics on mount
     (0, react_2.useEffect)(() => {
         (0, analytics_1.loadGA4Script)();
@@ -36,7 +36,7 @@ toaster: _toaster, clientType = "rest", rpcUrls, partnerId, stripePublishableKey
         (0, client_manager_1.setClientType)(clientType);
     }, [clientType]);
     const wagmiConfig = (0, react_2.useMemo)(() => (0, createWagmiConfig_1.createWagmiConfig)({ partnerId, rpcUrls, connectors, overrideDefaultConnectors }), [partnerId, rpcUrls, connectors, overrideDefaultConnectors]);
-    return ((0, jsx_runtime_1.jsx)(react_3.ThirdwebProvider, { children: (0, jsx_runtime_1.jsx)(wagmi_1.WagmiProvider, { config: wagmiConfig, reconnectOnMount: false, children: (0, jsx_runtime_1.jsx)(react_query_1.QueryClientProvider, { client: queryClient, children: (0, jsx_runtime_1.jsx)(react_1.TooltipProvider, { children: (0, jsx_runtime_1.jsx)(index_1.ToastProvider, { children: (0, jsx_runtime_1.jsx)(LocalSDKProvider_1.LocalSDKProvider, { onConnectCallback: onConnect, onLogoutCallback: onLogout, onTurnkeyConnect: onTurnkeyConnect, children: (0, jsx_runtime_1.jsxs)(B3ConfigProvider_1.B3ConfigProvider, { accountOverride: accountOverride, environment: environment, automaticallySetFirstEoa: !!automaticallySetFirstEoa, theme: theme, clientType: clientType, partnerId: partnerId, stripePublishableKey: stripePublishableKey, createClientReferenceId: createClientReferenceId, enableTurnkey: enableTurnkey, defaultPermissions: defaultPermissions, children: [(0, jsx_runtime_1.jsx)(ToastContextConnector, {}), (0, jsx_runtime_1.jsxs)(react_1.RelayKitProviderWrapper, { simDuneApiKey: simDuneApiKey, children: [children, (0, jsx_runtime_1.jsx)(StyleRoot_1.StyleRoot, { id: "b3-root" })] }), (0, jsx_runtime_1.jsx)(AuthenticationProvider_1.default, { partnerId: partnerId, automaticallySetFirstEoa: !!automaticallySetFirstEoa })] }) }) }) }) }) }) }));
+    return ((0, jsx_runtime_1.jsx)(react_3.ThirdwebProvider, { children: (0, jsx_runtime_1.jsx)(wagmi_1.WagmiProvider, { config: wagmiConfig, reconnectOnMount: false, children: (0, jsx_runtime_1.jsx)(react_query_1.QueryClientProvider, { client: queryClient, children: (0, jsx_runtime_1.jsx)(react_1.TooltipProvider, { children: (0, jsx_runtime_1.jsx)(index_1.ToastProvider, { children: (0, jsx_runtime_1.jsx)(LocalSDKProvider_1.LocalSDKProvider, { onConnectCallback: onConnect, onLogoutCallback: onLogout, children: (0, jsx_runtime_1.jsxs)(B3ConfigProvider_1.B3ConfigProvider, { accountOverride: accountOverride, environment: environment, automaticallySetFirstEoa: !!automaticallySetFirstEoa, theme: theme, clientType: clientType, partnerId: partnerId, stripePublishableKey: stripePublishableKey, createClientReferenceId: createClientReferenceId, defaultPermissions: defaultPermissions, children: [(0, jsx_runtime_1.jsx)(ToastContextConnector, {}), (0, jsx_runtime_1.jsxs)(react_1.RelayKitProviderWrapper, { simDuneApiKey: simDuneApiKey, children: [children, (0, jsx_runtime_1.jsx)(StyleRoot_1.StyleRoot, { id: "b3-root" })] }), (0, jsx_runtime_1.jsx)(AuthenticationProvider_1.default, { partnerId: partnerId, automaticallySetFirstEoa: !!automaticallySetFirstEoa })] }) }) }) }) }) }) }));
 }
 /**
  * Component to connect the toast context to the global toast API

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

@@ -4,7 +4,7 @@ import { ClientType } from "../../../client-manager";
 /**
  * Main B3Provider component
  */
-export declare function B3Provider({ theme, children, accountOverride, environment, clientType, partnerId, rpcUrls, onConnect, defaultPermissions, }: {
+export declare function B3Provider({ theme, children, accountOverride, environment, clientType, partnerId, rpcUrls: _rpcUrls, onConnect, defaultPermissions, }: {
     theme: "light" | "dark";
     children: React.ReactNode;
     accountOverride?: Account;

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

@@ -18,7 +18,7 @@ const queryClient = new react_query_1.QueryClient();
 /**
  * Main B3Provider component
  */
-function B3Provider({ theme = "light", children, accountOverride, environment, clientType = "socket", partnerId, rpcUrls, onConnect, defaultPermissions, }) {
+function B3Provider({ theme = "light", children, accountOverride, environment, clientType = "socket", partnerId, rpcUrls: _rpcUrls, onConnect, defaultPermissions, }) {
     return ((0, jsx_runtime_1.jsx)(react_1.ThirdwebProvider, { children: (0, jsx_runtime_1.jsx)(LocalSDKProvider_1.LocalSDKProvider, { onConnectCallback: onConnect, children: (0, jsx_runtime_1.jsxs)(B3ConfigProvider_1.B3ConfigProvider, { accountOverride: accountOverride, environment: environment, automaticallySetFirstEoa: false, theme: theme, clientType: clientType, partnerId: partnerId, defaultPermissions: defaultPermissions, children: [children, (0, jsx_runtime_1.jsx)(AuthenticationProvider_1.default, { partnerId: partnerId, automaticallySetFirstEoa: false })] }) }) }));
 }
 /**

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

@@ -1,4 +1,3 @@
-import { Users } from "@b3dotfun/b3-api";
 import { Wallet } from "thirdweb/wallets";
 /**
  * Local SDK Context for internal SDK state (like authentication callbacks)
@@ -7,15 +6,13 @@ import { Wallet } from "thirdweb/wallets";
 export interface LocalSDKContextType {
     onConnectCallback?: (wallet: Wallet, b3Jwt: string) => void | Promise<void>;
     onLogoutCallback?: () => void | Promise<void>;
-    onTurnkeyConnect?: (user: Users) => void | Promise<void>;
 }
 export declare const LocalSDKContext: import("react").Context<LocalSDKContextType>;
 /**
  * Local SDK Provider that wraps the app and provides internal SDK state
  */
-export declare function LocalSDKProvider({ children, onConnectCallback, onLogoutCallback, onTurnkeyConnect, }: {
+export declare function LocalSDKProvider({ children, onConnectCallback, onLogoutCallback, }: {
     children: React.ReactNode;
     onConnectCallback?: (wallet: Wallet, b3Jwt: string) => void | Promise<void>;
     onLogoutCallback?: () => void | Promise<void>;
-    onTurnkeyConnect?: (user: Users) => void | Promise<void>;
 }): import("react/jsx-runtime").JSX.Element;

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

@@ -7,15 +7,13 @@ const react_1 = require("react");
 exports.LocalSDKContext = (0, react_1.createContext)({
     onConnectCallback: undefined,
     onLogoutCallback: undefined,
-    onTurnkeyConnect: undefined,
 });
 /**
  * Local SDK Provider that wraps the app and provides internal SDK state
  */
-function LocalSDKProvider({ children, onConnectCallback, onLogoutCallback, onTurnkeyConnect, }) {
+function LocalSDKProvider({ children, onConnectCallback, onLogoutCallback, }) {
     return ((0, jsx_runtime_1.jsx)(exports.LocalSDKContext.Provider, { value: {
             onConnectCallback,
             onLogoutCallback,
-            onTurnkeyConnect,
         }, children: children }));
 }

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

@@ -14,8 +14,6 @@ function RelayKitProviderWrapper({ children, simDuneApiKey, }) {
         };
         fetchChains();
     }, []);
-    const isTurnkeyPrimary = process.env.NEXT_PUBLIC_TURNKEY_PRIMARY === "true";
-    const appName = isTurnkeyPrimary ? "Smart Wallet" : "AnySpend";
     return ((0, jsx_runtime_1.jsx)(relay_kit_ui_1.RelayKitProvider, { options: {
             baseApiUrl: relay_sdk_1.MAINNET_RELAY_API,
             source: "anyspend",
@@ -25,7 +23,7 @@ function RelayKitProviderWrapper({ children, simDuneApiKey, }) {
             },
             chains: relayChains,
             privateChainIds: undefined,
-            appName,
+            appName: "AnySpend",
             useGasFeeEstimations: true,
         }, children: (0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, { children: children }) }));
 }

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

@@ -6,14 +6,19 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const jsx_runtime_1 = require("react/jsx-runtime");
 const react_1 = require("../../../../global-account/react");
 const thirdweb_1 = require("../../../../shared/utils/thirdweb");
-const react_2 = require("thirdweb/react");
+const lucide_react_1 = require("lucide-react");
+const react_2 = require("react");
+const react_3 = require("thirdweb/react");
+const SignOutIcon_1 = __importDefault(require("../icons/SignOutIcon"));
 const ModalHeader_1 = __importDefault(require("../ModalHeader/ModalHeader"));
 const SettingsMenuItem_1 = __importDefault(require("./SettingsMenuItem"));
 const SettingsProfileCard_1 = __importDefault(require("./SettingsProfileCard"));
 const SettingsContent = ({ partnerId, onLogout, chain, }) => {
     const setB3ModalContentType = (0, react_1.useModalStore)(state => state.setB3ModalContentType);
     const setB3ModalOpen = (0, react_1.useModalStore)(state => state.setB3ModalOpen);
-    const { data: profilesRaw = [] } = (0, react_2.useProfiles)({ client: thirdweb_1.client });
+    const { logout } = (0, react_1.useAuthentication)(partnerId);
+    const [logoutLoading, setLogoutLoading] = (0, react_2.useState)(false);
+    const { data: profilesRaw = [] } = (0, react_3.useProfiles)({ client: thirdweb_1.client });
     const profiles = profilesRaw.filter((profile) => !["custom_auth_endpoint"].includes(profile.type));
     const handleNavigate = (type) => {
         if (type === "home") {
@@ -55,6 +60,15 @@ const SettingsContent = ({ partnerId, onLogout, chain, }) => {
         }
         setB3ModalOpen(true);
     };
-    return ((0, jsx_runtime_1.jsxs)("div", { className: "flex h-[470px] flex-col", children: [(0, jsx_runtime_1.jsx)(ModalHeader_1.default, { showBackButton: false, showCloseButton: false, title: "Settings" }), (0, jsx_runtime_1.jsx)("div", { className: "p-5", children: (0, jsx_runtime_1.jsx)("div", { className: "b3-modal-settings-profile-card dark:border-b3-line dark:bg-b3-background flex items-center rounded-xl border border-[#e4e4e7] bg-[#f4f4f5] p-4", children: (0, jsx_runtime_1.jsx)(SettingsProfileCard_1.default, {}) }) }), (0, jsx_runtime_1.jsxs)("div", { className: "space-y-3 px-5", children: [(0, jsx_runtime_1.jsx)(SettingsMenuItem_1.default, { icon: (0, jsx_runtime_1.jsx)("svg", { width: "40", height: "40", viewBox: "0 0 40 40", fill: "none", xmlns: "http://www.w3.org/2000/svg", children: (0, jsx_runtime_1.jsx)("path", { d: "M0 12C0 5.37258 5.37258 0 12 0H28C34.6274 0 40 5.37258 40 12V28C40 34.6274 34.6274 40 28 40H12C5.37258 40 0 34.6274 0 28V12Z", fill: "#F4F4F5" }) }), title: "Linked Accounts", subtitle: `${profiles.length} connected account${profiles.length > 1 ? "s" : ""}`, onClick: () => handleNavigate("linkAccount") }), (0, jsx_runtime_1.jsx)(SettingsMenuItem_1.default, { icon: (0, jsx_runtime_1.jsx)("svg", { width: "40", height: "40", viewBox: "0 0 40 40", fill: "none", xmlns: "http://www.w3.org/2000/svg", children: (0, jsx_runtime_1.jsx)("path", { d: "M0 12C0 5.37258 5.37258 0 12 0H28C34.6274 0 40 5.37258 40 12V28C40 34.6274 34.6274 40 28 40H12C5.37258 40 0 34.6274 0 28V12Z", fill: "#F4F4F5" }) }), title: "Notifications", subtitle: "Manage your notifications", onClick: () => handleNavigate("notifications") })] })] }));
+    const onLogoutEnhanced = async () => {
+        setLogoutLoading(true);
+        await logout();
+        onLogout?.();
+        setB3ModalOpen(false);
+        setLogoutLoading(false);
+    };
+    return ((0, jsx_runtime_1.jsxs)("div", { className: "flex h-[470px] flex-col", children: [(0, jsx_runtime_1.jsx)(ModalHeader_1.default, { showBackButton: false, showCloseButton: false, title: "Settings" }), (0, jsx_runtime_1.jsx)("div", { className: "p-5", children: (0, jsx_runtime_1.jsx)("div", { className: "b3-modal-settings-profile-card dark:border-b3-line dark:bg-b3-background flex items-center rounded-xl border border-[#e4e4e7] bg-[#f4f4f5] p-4", children: (0, jsx_runtime_1.jsx)(SettingsProfileCard_1.default, {}) }) }), (0, jsx_runtime_1.jsxs)("div", { className: "space-y-3 px-5", children: [(0, jsx_runtime_1.jsx)(SettingsMenuItem_1.default, { icon: (0, jsx_runtime_1.jsx)("svg", { width: "40", height: "40", viewBox: "0 0 40 40", fill: "none", xmlns: "http://www.w3.org/2000/svg", children: (0, jsx_runtime_1.jsx)("path", { d: "M0 12C0 5.37258 5.37258 0 12 0H28C34.6274 0 40 5.37258 40 12V28C40 34.6274 34.6274 40 28 40H12C5.37258 40 0 34.6274 0 28V12Z", fill: "#F4F4F5" }) }), title: "Linked Accounts", subtitle: `${profiles.length} connected account${profiles.length > 1 ? "s" : ""}`, onClick: () => handleNavigate("linkAccount") }), (0, jsx_runtime_1.jsx)(SettingsMenuItem_1.default, { icon: (0, jsx_runtime_1.jsx)("svg", { width: "40", height: "40", viewBox: "0 0 40 40", fill: "none", xmlns: "http://www.w3.org/2000/svg", children: (0, jsx_runtime_1.jsx)("path", { d: "M0 12C0 5.37258 5.37258 0 12 0H28C34.6274 0 40 5.37258 40 12V28C40 34.6274 34.6274 40 28 40H12C5.37258 40 0 34.6274 0 28V12Z", fill: "#F4F4F5" }) }), title: "Notifications", subtitle: "Manage your notifications", onClick: () => handleNavigate("notifications") })] }), (0, jsx_runtime_1.jsx)("div", { className: "mt-auto px-5 pb-5", children: (0, jsx_runtime_1.jsxs)("button", { className: "b3-modal-sign-out-button border-b3-line hover:bg-b3-line bg-b3-background dark:bg-b3-background dark:border-b3-line dark:hover:bg-b3-line/80 flex w-full items-center justify-center gap-1.5 rounded-xl border border-solid p-3 transition-colors", onClick: onLogoutEnhanced, disabled: logoutLoading, style: {
+                        boxShadow: "inset 0px 0px 0px 1px rgba(10,13,18,0.18), inset 0px -2px 0px 0px rgba(10,13,18,0.05)",
+                    }, children: [logoutLoading ? ((0, jsx_runtime_1.jsx)(lucide_react_1.Loader2, { className: "text-b3-grey animate-spin", size: 20 })) : ((0, jsx_runtime_1.jsx)(SignOutIcon_1.default, { size: 20, className: "text-b3-grey", color: "currentColor" })), (0, jsx_runtime_1.jsx)("p", { className: "text-b3-grey dark:text-b3-foreground-muted font-neue-montreal-semibold text-base", children: "Sign out" })] }) })] }));
 };
 exports.default = SettingsContent;

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

@@ -6,8 +6,6 @@ const react_1 = require("../../../../global-account/react");
 const debug_1 = require("../../../../shared/utils/debug");
 const react_2 = require("react");
 const react_3 = require("thirdweb/react");
-const LocalSDKProvider_1 = require("../B3Provider/LocalSDKProvider");
-const TurnkeyAuthModal_1 = require("../TurnkeyAuthModal");
 const SignInWithB3Privy_1 = require("./SignInWithB3Privy");
 const LoginStep_1 = require("./steps/LoginStep");
 const LoginStepCustom_1 = require("./steps/LoginStepCustom");
@@ -18,9 +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, enableTurnkey } = (0, react_1.useB3Config)();
-    const { user, refetchUser, logout } = (0, react_1.useAuthentication)(partnerId);
-    const { onTurnkeyConnect } = (0, react_2.useContext)(LocalSDKProvider_1.LocalSDKContext);
+    const { automaticallySetFirstEoa } = (0, react_1.useB3Config)();
+    const { user, logout } = (0, react_1.useAuthentication)(partnerId);
     // FIXME Logout before login to ensure a clean state
     const hasLoggedOutRef = (0, react_2.useRef)(false);
     (0, react_2.useEffect)(() => {
@@ -38,13 +35,10 @@ function SignInWithB3Flow({ strategies, onLoginSuccess, onSessionKeySuccess, onE
     const account = (0, react_3.useActiveAccount)();
     const isAuthenticating = (0, react_1.useAuthStore)(state => state.isAuthenticating);
     const isAuthenticated = (0, react_1.useAuthStore)(state => state.isAuthenticated);
-    const setIsAuthenticated = (0, react_1.useAuthStore)(state => state.setIsAuthenticated);
     const isConnected = (0, react_1.useAuthStore)(state => state.isConnected);
-    const setIsConnected = (0, react_1.useAuthStore)(state => state.setIsConnected);
     const setJustCompletedLogin = (0, react_1.useAuthStore)(state => state.setJustCompletedLogin);
     const [refetchCount, setRefetchCount] = (0, react_2.useState)(0);
     const [refetchError, setRefetchError] = (0, react_2.useState)(null);
-    const [turnkeyAuthCompleted, setTurnkeyAuthCompleted] = (0, react_2.useState)(false);
     const { data: signers, refetch: refetchSigners, isFetching: isFetchingSigners, } = (0, react_1.useGetAllTWSigners)({
         chain,
         accountAddress: account?.address,
@@ -77,8 +71,8 @@ function SignInWithB3Flow({ strategies, onLoginSuccess, onSessionKeySuccess, onE
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [refetchCount, refetchSigners, onError, refetchQueued]);
     // Extract the completion flow logic to be reused
-    const handlePostTurnkeyFlow = (0, react_2.useCallback)(() => {
-        debug("Running post-Turnkey flow logic");
+    const handlePostAuthFlow = (0, react_2.useCallback)(() => {
+        debug("Running post-authentication flow logic");
         // Check if we already have a signer for this partner
         const hasExistingSigner = signers?.some(signer => signer.partner.id === partnerId);
         if (hasExistingSigner) {
@@ -135,56 +129,6 @@ function SignInWithB3Flow({ strategies, onLoginSuccess, onSessionKeySuccess, onE
         handleRefetchSigners,
         setSessionKeyAdded,
     ]);
-    // Define handleTurnkeySuccess before the useEffect that uses it
-    const handleTurnkeySuccess = (0, react_2.useCallback)(async (user) => {
-        debug("Turnkey authentication successful - setting completed flag", { user, onTurnkeyConnect });
-        // Call the onTurnkeyConnect callback
-        onTurnkeyConnect?.(user);
-        // Set completed flag FIRST before any async operations
-        setTurnkeyAuthCompleted(true);
-        // Refetch user to update the user state with Turnkey ID
-        debug("Refetching user after Turnkey success...");
-        // TODO: See why sometimes this fails with "No wallet found during auto-connect"
-        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({
-            type: "signInWithB3",
-            strategies,
-            onLoginSuccess,
-            onSessionKeySuccess,
-            onError,
-            chain,
-            sessionKeyAddress,
-            partnerId,
-            closeAfterLogin,
-            source,
-            signersEnabled,
-        });
-        // The useEffect will re-run with updated user data to complete the sign-in process
-    }, [
-        onTurnkeyConnect,
-        refetchUser,
-        strategies,
-        onLoginSuccess,
-        onSessionKeySuccess,
-        onError,
-        chain,
-        sessionKeyAddress,
-        partnerId,
-        closeAfterLogin,
-        source,
-        signersEnabled,
-        setB3ModalContentType,
-        setIsAuthenticated,
-        setIsConnected,
-        setJustCompletedLogin,
-    ]);
     // Handle post-login flow after signers are loaded
     (0, react_2.useEffect)(() => {
         debug("@@SignInWithB3Flow:useEffect", {
@@ -197,49 +141,11 @@ function SignInWithB3Flow({ strategies, onLoginSuccess, onSessionKeySuccess, onE
         });
         if (isConnected && isAuthenticated && user) {
             // Mark that login just completed BEFORE opening manage account or closing modal
-            // This allows Turnkey modal to show (if enableTurnkey is true)
             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
-            // 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 &&
-                (!hasTurnkeyId || (hasTurnkeyId && hasTurnkeyEmail));
-            if (shouldShowTurnkeyModal) {
-                // Extract email from user object - check partnerIds.turnkeyEmail first, then twProfiles, then user.email
-                const email = user?.email || user?.twProfiles?.find((profile) => profile.details?.email)?.details?.email;
-                // Open Turnkey modal through the modal store
-                setB3ModalContentType({
-                    type: "turnkeyAuth",
-                    onSuccess: handleTurnkeySuccess,
-                    onClose: () => {
-                        // After closing Turnkey modal, continue with the rest of the flow
-                        setTurnkeyAuthCompleted(true);
-                        debug("Turnkey modal closed, running post-Turnkey flow");
-                        handlePostTurnkeyFlow();
-                    },
-                    initialEmail: email,
-                    skipToOtp: !!(hasTurnkeyId && hasTurnkeyEmail),
-                    closable: false, // Turnkey modal cannot be closed until auth is complete
-                });
-                return;
-            }
-            // Normal flow continues after Turnkey auth is complete (or if not needed)
-            handlePostTurnkeyFlow();
+            // Normal flow continues
+            handlePostAuthFlow();
         }
     }, 
     // eslint-disable-next-line react-hooks/exhaustive-deps
@@ -260,11 +166,8 @@ function SignInWithB3Flow({ strategies, onLoginSuccess, onSessionKeySuccess, onE
         isAuthenticated,
         isOpen,
         user,
-        enableTurnkey,
-        turnkeyAuthCompleted,
-        // handleTurnkeySuccess, // This is causing infinite loops
         contentType,
-        handlePostTurnkeyFlow,
+        handlePostAuthFlow,
     ]);
     debug("render", {
         step,
@@ -328,58 +231,22 @@ function SignInWithB3Flow({ strategies, onLoginSuccess, onSessionKeySuccess, onE
         content = ((0, jsx_runtime_1.jsx)(LoginStep_1.LoginStepContainer, { partnerId: partnerId, children: (0, jsx_runtime_1.jsx)("div", { className: "p-4 text-center text-red-500", children: refetchError }) }));
     }
     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 = ((0, jsx_runtime_1.jsx)(LoginStep_1.LoginStepContainer, { partnerId: partnerId, children: (0, jsx_runtime_1.jsx)(TurnkeyAuthModal_1.TurnkeyAuthModal, { onSuccess: async (authenticatedUser) => {
-                        debug("Turnkey authentication successful in primary flow", { authenticatedUser });
-                        setTurnkeyAuthCompleted(true);
-                        // 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?.({});
-                        // Call the onTurnkeyConnect callback
-                        onTurnkeyConnect?.(authenticatedUser);
-                        // After Turnkey auth, refetch user to get the full user object
-                        // TODO: See why sometimes this fails with "No wallet found during auto-connect"
-                        await refetchUser();
-                    }, onClose: () => {
-                        // If user closes Turnkey modal, they can still use wallet connection as fallback
-                        setTurnkeyAuthCompleted(true);
-                    }, initialEmail: "", skipToOtp: false }) }));
+        // Show loading spinner
+        if (isAuthenticating || (isFetchingSigners && step === "login") || source === "requestPermissions") {
+            content = ((0, jsx_runtime_1.jsx)(LoginStep_1.LoginStepContainer, { partnerId: partnerId, children: (0, jsx_runtime_1.jsx)("div", { className: "my-8 flex min-h-[350px] items-center justify-center", children: (0, jsx_runtime_1.jsx)(react_1.Loading, { variant: "white", size: "lg" }) }) }));
         }
         else {
-            // Show loading spinner only if not in Turnkey flow
-            if (isAuthenticating || (isFetchingSigners && step === "login") || source === "requestPermissions") {
-                content = ((0, jsx_runtime_1.jsx)(LoginStep_1.LoginStepContainer, { partnerId: partnerId, children: (0, jsx_runtime_1.jsx)("div", { className: "my-8 flex min-h-[350px] items-center justify-center", children: (0, jsx_runtime_1.jsx)(react_1.Loading, { variant: "white", size: "lg" }) }) }));
+            // Custom strategy
+            if (strategies?.[0] === "privy") {
+                content = (0, jsx_runtime_1.jsx)(SignInWithB3Privy_1.SignInWithB3Privy, { onSuccess: handleLoginSuccess, chain: chain });
+            }
+            else if (strategies) {
+                // Strategies are explicitly provided
+                content = ((0, jsx_runtime_1.jsx)(LoginStepCustom_1.LoginStepCustom, { strategies: strategies, chain: chain, onSuccess: handleLoginSuccess, onError: onError, automaticallySetFirstEoa: !!automaticallySetFirstEoa }));
             }
             else {
-                // Custom strategy
-                if (strategies?.[0] === "privy") {
-                    content = (0, jsx_runtime_1.jsx)(SignInWithB3Privy_1.SignInWithB3Privy, { onSuccess: handleLoginSuccess, chain: chain });
-                }
-                else if (strategies) {
-                    // Strategies are explicitly provided
-                    content = ((0, jsx_runtime_1.jsx)(LoginStepCustom_1.LoginStepCustom, { strategies: strategies, chain: chain, onSuccess: handleLoginSuccess, onError: onError, automaticallySetFirstEoa: !!automaticallySetFirstEoa }));
-                }
-                else {
-                    // Default to handle all strategies we support
-                    content = (0, jsx_runtime_1.jsx)(LoginStep_1.LoginStep, { chain: chain, onSuccess: handleLoginSuccess, onError: onError });
-                }
+                // Default to handle all strategies we support
+                content = (0, jsx_runtime_1.jsx)(LoginStep_1.LoginStep, { chain: chain, onSuccess: handleLoginSuccess, onError: onError });
             }
         }
     }

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

@@ -13,7 +13,6 @@ export { SignInWithB3Flow } from "./SignInWithB3/SignInWithB3Flow";
 export { SignInWithB3Privy } from "./SignInWithB3/SignInWithB3Privy";
 export { LoginStepContainer } from "./SignInWithB3/steps/LoginStep";
 export { getConnectOptionsFromStrategy, isWalletType, type AllowedStrategy } from "./SignInWithB3/utils/signInUtils";
-export { TurnkeyAuthModal } from "./TurnkeyAuthModal";
 export { ManageAccount } from "./ManageAccount/ManageAccount";
 export { Deposit } from "./Deposit/Deposit";
 export { Send } from "./Send/Send";