@b3dotfun/sdk 0.0.81 → 0.0.82-alpha.1

package/dist/esm/anyspend/react/components/common/CryptoPaymentMethod.js

@@ -4,13 +4,9 @@ import { toast, useAccountWallet, WalletImage } from "../../../../global-account
 import { cn } from "../../../../shared/utils/cn.js";
 import { shortenAddress } from "../../../../shared/utils/formatAddress.js";
 import { client } from "../../../../shared/utils/thirdweb.js";
-import { WalletCoinbase, WalletMetamask, WalletRainbow, WalletWalletConnect } from "@web3icons/react";
 import { ChevronLeft, ChevronRightCircle, Wallet, X, ZapIcon } from "lucide-react";
-import { useState } from "react";
-import { createPortal } from "react-dom";
-import { useSetActiveWallet, useWalletInfo } from "thirdweb/react";
-import { createWallet } from "thirdweb/wallets";
-import { useAccount, useConnect, useDisconnect, useWalletClient } from "wagmi";
+import { useConnectModal, useSetActiveWallet, useWalletInfo } from "thirdweb/react";
+import { useAccount, useDisconnect } from "wagmi";
 import { useConnectedWalletDisplay } from "../../hooks/useConnectedWalletDisplay.js";
 export var CryptoPaymentMethodType;
 (function (CryptoPaymentMethodType) {
@@ -22,193 +18,80 @@ export var CryptoPaymentMethodType;
 export function CryptoPaymentMethod({ selectedPaymentMethod, setSelectedPaymentMethod, isCreatingOrder, onBack, onSelectPaymentMethod, }) {
     const { connectedEOAWallet: connectedEOAWallet, connectedSmartWallet: connectedSmartWallet } = useAccountWallet();
     const { connector, address } = useAccount();
-    const { connect, connectors, isPending } = useConnect();
     const { disconnect } = useDisconnect();
-    const { data: walletClient } = useWalletClient();
-    const [showWalletModal, setShowWalletModal] = useState(false);
+    const { connect: openConnectModal } = useConnectModal();
     const setActiveWallet = useSetActiveWallet();
     const { data: eoaWalletInfo } = useWalletInfo(connectedEOAWallet?.id);
-    const isConnected = !!connectedEOAWallet;
     const globalAddress = connectedSmartWallet?.getAccount()?.address;
     // Use custom hook to determine wallet display logic
     const { shouldShowConnectedEOA, shouldShowWagmiWallet } = useConnectedWalletDisplay(selectedPaymentMethod);
-    console.log("shouldShowWagmiWallet :", shouldShowWagmiWallet);
-    // Map wagmi connector names to thirdweb wallet IDs
-    const getThirdwebWalletId = (connectorName) => {
-        const walletMap = {
-            MetaMask: "io.metamask",
-            "Coinbase Wallet": "com.coinbase.wallet",
-            Rainbow: "me.rainbow",
-            WalletConnect: "walletConnect",
-            Phantom: "app.phantom",
-        };
-        return walletMap[connectorName] || null;
-    };
-    // Create thirdweb wallet from wagmi connector
-    const createThirdwebWalletFromConnector = async (connectorName) => {
-        const walletId = getThirdwebWalletId(connectorName);
-        if (!walletId) {
-            console.warn(`No thirdweb wallet ID found for connector: ${connectorName}`);
-            return null;
-        }
+    // Handle wallet connection using thirdweb modal
+    const handleConnectWallet = async () => {
         try {
-            const thirdwebWallet = createWallet(walletId);
-            // Connect the wallet to sync with the existing wagmi connection
-            await thirdwebWallet.connect({ client });
-            return thirdwebWallet;
-        }
-        catch (error) {
-            console.error(`Failed to create thirdweb wallet for ${connectorName}:`, error);
-            return null;
-        }
-    };
-    // Define available wallet connectors
-    const availableConnectors = connectors.filter(connector => ["MetaMask", "WalletConnect", "Coinbase Wallet", "Rainbow", "Phantom"].includes(connector.name));
-    // Define wallet options with icons and info
-    const walletOptions = [
-        {
-            id: "metamask",
-            name: "MetaMask",
-            icon: _jsx(WalletMetamask, { size: 48 }),
-            description: "Connect using MetaMask browser extension",
-            connector: availableConnectors.find(c => c.name === "MetaMask"),
-        },
-        {
-            id: "coinbase",
-            name: "Coinbase Wallet",
-            icon: _jsx(WalletCoinbase, { size: 48 }),
-            description: "Connect using Coinbase Wallet",
-            connector: availableConnectors.find(c => c.name === "Coinbase Wallet"),
-        },
-        {
-            id: "rainbow",
-            name: "Rainbow",
-            icon: _jsx(WalletRainbow, { size: 48 }),
-            description: "Connect using Rainbow wallet",
-            connector: availableConnectors.find(c => c.name === "Rainbow"),
-        },
-        {
-            id: "walletconnect",
-            name: "WalletConnect",
-            icon: _jsx(WalletWalletConnect, { size: 48 }),
-            description: "Connect using WalletConnect protocol",
-            connector: availableConnectors.find(c => c.name === "WalletConnect"),
-        },
-    ].filter(wallet => wallet.connector); // Only show wallets that have available connectors
-    // Reset modal state when closing
-    const handleCloseModal = () => {
-        setShowWalletModal(false);
-    };
-    // Function to request wallet permissions for specific wallet
-    const requestWalletPermissions = async (walletConnector) => {
-        try {
-            // If a specific wallet connector is provided and it's different from current
-            if (walletConnector && connector?.name !== walletConnector.name) {
-                // Disconnect current and connect to the selected wallet
-                // if (isConnected) {
-                //   disconnect();
-                //   // Small delay to ensure disconnection
-                //   await new Promise(resolve => setTimeout(resolve, 100));
-                // }
-                await connect({ connector: walletConnector });
-                setSelectedPaymentMethod(CryptoPaymentMethodType.CONNECT_WALLET);
-                onSelectPaymentMethod(CryptoPaymentMethodType.CONNECT_WALLET);
-                toast.success(`Connected to ${walletConnector.name}`);
-                return;
-            }
-            // If same wallet or no specific wallet, request permissions for account switching
-            if (walletClient && "request" in walletClient) {
-                await walletClient.request({
-                    method: "wallet_requestPermissions",
-                    params: [{ eth_accounts: {} }],
-                });
-                toast.success("Account selection completed");
+            const wallet = await openConnectModal({ client, setActive: false });
+            if (wallet) {
+                // setActiveWallet(wallet);
                 setSelectedPaymentMethod(CryptoPaymentMethodType.CONNECT_WALLET);
                 onSelectPaymentMethod(CryptoPaymentMethodType.CONNECT_WALLET);
-            }
-            else {
-                // Fallback: show modal for manual wallet selection
-                setShowWalletModal(true);
+                toast.success("Wallet connected");
             }
         }
         catch (error) {
-            console.error("Failed to request wallet permissions:", error);
+            console.error("Failed to connect wallet:", error);
             if (error && typeof error === "object" && "message" in error) {
                 const errorMessage = error.message.toLowerCase();
                 if (errorMessage.includes("rejected") ||
                     errorMessage.includes("denied") ||
                     errorMessage.includes("cancelled")) {
-                    toast.error("Account selection cancelled");
+                    // User cancelled - no toast needed
                 }
                 else {
-                    toast.error("Failed to open account selection");
+                    toast.error("Failed to connect wallet");
                 }
             }
-            else {
-                toast.error("Failed to open account selection");
-            }
         }
     };
-    return (_jsxs("div", { className: "crypto-payment-method mx-auto h-fit w-[460px] max-w-full px-5 pb-5 pt-5 sm:px-0 sm:pt-5", children: [_jsxs("div", { className: cn("relative flex flex-col gap-10"), children: [_jsx("button", { onClick: onBack, className: "text-as-quaternary hover:text-as-primary absolute flex h-8 w-8 items-center justify-center rounded-lg transition-colors", children: _jsx(ChevronLeft, { className: "h-6 w-6" }) }), _jsx("div", { className: "flex items-center justify-around gap-4", children: _jsx("div", { className: "flex-1 text-center", children: _jsx("h2", { className: "text-as-primary text-lg font-semibold", children: "Select a payment method" }) }) }), process.env.NODE_ENV === "development" && (_jsxs("div", { className: "rounded-lg border border-yellow-500/50 bg-yellow-50 p-3 dark:bg-yellow-950/20", children: [_jsx("p", { className: "mb-2 text-xs font-semibold text-yellow-800 dark:text-yellow-300", children: "\uD83E\uDDEA Toast Test (Dev Only)" }), _jsxs("div", { className: "flex flex-wrap gap-2", children: [_jsx("button", { onClick: () => toast.success("Success! Transaction completed"), className: "rounded bg-green-600 px-2 py-1 text-xs font-medium text-white hover:bg-green-700", children: "Success" }), _jsx("button", { onClick: () => toast.error("Error! Transaction failed"), className: "rounded bg-red-600 px-2 py-1 text-xs font-medium text-white hover:bg-red-700", children: "Error" }), _jsx("button", { onClick: () => toast.info("Info: Processing your request..."), className: "rounded bg-blue-600 px-2 py-1 text-xs font-medium text-white hover:bg-blue-700", children: "Info" }), _jsx("button", { onClick: () => toast.warning("Warning: Low balance detected"), className: "rounded bg-yellow-600 px-2 py-1 text-xs font-medium text-white hover:bg-yellow-700", children: "Warning" }), _jsx("button", { onClick: () => {
-                                            toast.success("Multiple test 1");
-                                            setTimeout(() => toast.info("Multiple test 2"), 200);
-                                            setTimeout(() => toast.warning("Multiple test 3"), 400);
-                                        }, className: "rounded bg-purple-600 px-2 py-1 text-xs font-medium text-white hover:bg-purple-700", children: "Multiple" })] })] })), _jsxs("div", { className: "crypto-payment-methods flex flex-col gap-4", children: [(shouldShowConnectedEOA || shouldShowWagmiWallet || globalAddress) && (_jsxs("div", { className: "installed-wallets", children: [_jsx("h3", { className: "text-as-primary/80 mb-3 text-sm font-medium", children: "Connected wallets" }), _jsxs("div", { className: "space-y-2", children: [shouldShowConnectedEOA && (_jsx("button", { onClick: () => {
-                                                    setSelectedPaymentMethod(CryptoPaymentMethodType.CONNECT_WALLET);
-                                                    onSelectPaymentMethod(CryptoPaymentMethodType.CONNECT_WALLET);
-                                                    if (connectedEOAWallet) {
-                                                        setActiveWallet(connectedEOAWallet);
-                                                    }
-                                                    toast.success(`Selected ${eoaWalletInfo?.name || connector?.name || "wallet"}`);
-                                                }, className: cn("crypto-payment-method-connect-wallet eoa-wallet w-full rounded-xl border p-4 text-left transition-all hover:shadow-md", selectedPaymentMethod === CryptoPaymentMethodType.CONNECT_WALLET
-                                                    ? "connected-wallet border-as-brand bg-as-brand/5"
-                                                    : "border-as-border-secondary bg-as-surface-primary hover:border-as-secondary/80"), children: _jsxs("div", { className: "flex items-center justify-between", children: [_jsxs("div", { className: "flex items-center gap-3", children: [_jsx("div", { className: "wallet-icon flex h-10 w-10 items-center justify-center rounded-full bg-blue-100", children: _jsx(Wallet, { className: "h-5 w-5 text-blue-600" }) }), _jsxs("div", { className: "flex flex-col", children: [_jsx("span", { className: "text-as-primary font-semibold", children: eoaWalletInfo?.name || connector?.name || "Connected Wallet" }), _jsx("span", { className: "text-as-primary/60 text-sm", children: shortenAddress(connectedEOAWallet?.getAccount()?.address || "") })] })] }), _jsxs("div", { className: "flex items-center gap-2", children: [selectedPaymentMethod === CryptoPaymentMethodType.CONNECT_WALLET && (_jsx("div", { className: "h-2 w-2 rounded-full bg-green-500" })), _jsx("button", { onClick: e => {
-                                                                        e.stopPropagation();
-                                                                        disconnect();
-                                                                        toast.success("Wallet disconnected");
-                                                                        if (selectedPaymentMethod === CryptoPaymentMethodType.CONNECT_WALLET) {
-                                                                            setSelectedPaymentMethod(CryptoPaymentMethodType.NONE);
-                                                                        }
-                                                                    }, className: "text-as-primary/60 hover:text-as-primary/80 rounded-lg p-1.5 transition-colors", children: _jsx(X, { className: "h-4 w-4" }) })] })] }) })), shouldShowWagmiWallet && (_jsx("button", { onClick: async () => {
-                                                    setSelectedPaymentMethod(CryptoPaymentMethodType.CONNECT_WALLET);
-                                                    onSelectPaymentMethod(CryptoPaymentMethodType.CONNECT_WALLET);
-                                                    // Create thirdweb wallet from wagmi connector
-                                                    if (connector?.name) {
-                                                        const thirdwebWallet = await createThirdwebWalletFromConnector(connector.name);
-                                                        if (thirdwebWallet) {
-                                                            setActiveWallet(thirdwebWallet);
-                                                        }
-                                                    }
-                                                    toast.success(`Selected ${connector?.name || "wallet"}`);
-                                                }, className: cn("crypto-payment-method-connect-wallet wagmi-wallet w-full rounded-xl border p-4 text-left transition-all hover:shadow-md", selectedPaymentMethod === CryptoPaymentMethodType.CONNECT_WALLET
-                                                    ? "connected-wallet border-as-brand bg-as-brand/5"
-                                                    : "border-as-border-secondary bg-as-surface-primary hover:border-as-secondary/80"), children: _jsxs("div", { className: "flex items-center justify-between", children: [_jsxs("div", { className: "flex items-center gap-3", children: [_jsx("div", { className: "wallet-icon flex h-10 w-10 items-center justify-center rounded-full bg-blue-100", children: _jsx(Wallet, { className: "h-5 w-5 text-blue-600" }) }), _jsxs("div", { className: "flex flex-col", children: [_jsx("span", { className: "text-as-primary font-semibold", children: connector?.name || "Connected Wallet" }), _jsx("span", { className: "text-as-primary/60 text-sm", children: shortenAddress(address || "") })] })] }), _jsxs("div", { className: "flex items-center gap-2", children: [selectedPaymentMethod === CryptoPaymentMethodType.CONNECT_WALLET && (_jsx("div", { className: "h-2 w-2 rounded-full bg-green-500" })), _jsx("button", { onClick: e => {
-                                                                        e.stopPropagation();
-                                                                        disconnect();
-                                                                        toast.success("Wallet disconnected");
-                                                                        if (selectedPaymentMethod === CryptoPaymentMethodType.CONNECT_WALLET) {
-                                                                            setSelectedPaymentMethod(CryptoPaymentMethodType.NONE);
-                                                                        }
-                                                                    }, className: "text-as-primary/60 hover:text-as-primary/80 rounded-lg p-1.5 transition-colors", children: _jsx(X, { className: "h-4 w-4" }) })] })] }) })), globalAddress && (_jsx("button", { onClick: () => {
-                                                    setSelectedPaymentMethod(CryptoPaymentMethodType.GLOBAL_WALLET);
-                                                    onSelectPaymentMethod(CryptoPaymentMethodType.GLOBAL_WALLET);
-                                                    toast.success("Selected B3 Account");
-                                                }, className: cn("crypto-payment-method-global-wallet w-full rounded-xl border p-4 text-left transition-all hover:shadow-md", selectedPaymentMethod === CryptoPaymentMethodType.GLOBAL_WALLET
-                                                    ? "connected-wallet border-as-brand bg-as-brand/5"
-                                                    : "border-as-border-secondary bg-as-surface-primary hover:border-as-secondary/80"), children: _jsxs("div", { className: "flex items-center justify-between", children: [_jsxs("div", { className: "flex items-center gap-3", children: [_jsx(WalletImage, { fallback: _jsx("div", { className: "wallet-icon flex h-10 w-10 items-center justify-center rounded-full bg-purple-100", children: _jsx(Wallet, { className: "h-5 w-5 text-purple-600" }) }) }), _jsxs("div", { className: "flex flex-col", children: [_jsx("span", { className: "text-as-primary font-semibold", children: "Global Account" }), _jsx("span", { className: "text-as-primary/60 text-sm", children: shortenAddress(globalAddress || "") })] })] }), _jsx("div", { className: "flex items-center gap-2", children: selectedPaymentMethod === CryptoPaymentMethodType.GLOBAL_WALLET && (_jsx("div", { className: "h-2 w-2 rounded-full bg-green-500" })) })] }) }))] })] })), _jsxs("div", { className: "other-payment-methods", children: [_jsx("h3", { className: "text-as-primary/80 mb-3 text-sm font-medium", children: "Payment methods" }), _jsxs("div", { className: "space-y-3", children: [_jsxs("button", { onClick: () => {
-                                                    // Always show wallet selection modal first
-                                                    setShowWalletModal(true);
-                                                }, className: "crypto-payment-method-connect-wallet bg-as-surface-primary border-as-border-secondary hover:border-as-secondary/80 group flex w-full items-center justify-between gap-4 rounded-xl border px-4 py-3.5 transition-all duration-200 hover:shadow-md", children: [_jsxs("div", { className: "flex items-center gap-3", children: [_jsx("div", { className: "wallet-icon flex h-8 w-8 items-center justify-center rounded-full bg-blue-100", children: _jsx(Wallet, { className: "h-4 w-4 text-blue-600" }) }), _jsx("div", { className: "flex flex-col items-start text-left", children: _jsx("h4", { className: "text-as-primary font-semibold", children: "Connect wallet" }) })] }), _jsx(ChevronRightCircle, { className: "text-as-primary/40 group-hover:text-as-primary/60 h-5 w-5 transition-colors" })] }), _jsxs("button", { onClick: () => {
-                                                    setSelectedPaymentMethod(CryptoPaymentMethodType.TRANSFER_CRYPTO);
-                                                    onSelectPaymentMethod(CryptoPaymentMethodType.TRANSFER_CRYPTO);
-                                                }, disabled: isCreatingOrder, className: "crypto-payment-method-transfer bg-as-surface-primary border-as-border-secondary hover:border-as-secondary/80 group flex w-full items-center justify-between gap-4 rounded-xl border px-4 py-3.5 transition-all duration-200 hover:shadow-md", children: [_jsxs("div", { className: "flex items-center gap-3", children: [_jsx("div", { className: "wallet-icon flex h-8 w-8 items-center justify-center rounded-full bg-orange-100", children: _jsx(ZapIcon, { className: "h-4 w-4" }) }), _jsx("div", { className: "flex flex-col items-start text-left", children: _jsx("h4", { className: "text-as-primary font-semibold", children: "Transfer crypto" }) })] }), _jsx(ChevronRightCircle, { className: "text-as-primary/40 group-hover:text-as-primary/60 h-5 w-5 transition-colors" })] })] })] })] })] }), showWalletModal &&
-                createPortal(_jsx("div", { className: "wallet-connection-modal pointer-events-auto fixed inset-0 z-[9999] flex items-center justify-center bg-black/50", children: _jsxs("div", { className: "max-h-[80vh] w-[400px] max-w-[90vw] overflow-auto rounded-xl bg-white p-6 dark:bg-gray-900", children: [_jsxs("div", { className: "mb-4 flex items-center justify-between", children: [_jsx("h3", { className: "text-lg font-semibold text-gray-900 dark:text-white", children: isConnected ? "Switch wallet or account" : "Choose wallet to connect" }), _jsx("button", { onClick: handleCloseModal, className: "text-gray-500 hover:text-gray-700 dark:text-gray-400 dark:hover:text-gray-200", children: _jsx(X, { className: "h-5 w-5" }) })] }), _jsx("div", { className: "space-y-4", children: _jsx("div", { className: "space-y-3", children: walletOptions.map(walletOption => {
-                                        const isCurrentWallet = isConnected && connector?.name === walletOption.connector?.name;
-                                        return (_jsx("button", { onClick: async () => {
-                                                handleCloseModal();
-                                                await requestWalletPermissions(walletOption.connector);
-                                            }, disabled: isPending, className: `wallet-option w-full rounded-xl border p-4 text-left transition-all hover:shadow-md disabled:opacity-50 ${isCurrentWallet
-                                                ? "wallet-option--active border-blue-500 bg-blue-50 dark:bg-blue-900/20"
-                                                : "border-gray-200 bg-white hover:border-gray-300 dark:border-gray-600 dark:bg-gray-800 dark:hover:border-gray-500"}`, children: _jsxs("div", { className: "flex items-center justify-between", children: [_jsxs("div", { className: "flex items-center gap-3", children: [walletOption.icon, _jsxs("div", { children: [_jsxs("div", { className: "wallet-option-name flex items-center gap-2", children: [_jsx("div", { className: "text-sm font-semibold text-gray-900 dark:text-white", children: walletOption.name }), isCurrentWallet && (_jsx("span", { className: "rounded-full bg-blue-100 px-2 py-0.5 text-xs font-medium text-blue-700 dark:bg-blue-800 dark:text-blue-200", children: "Connected" }))] }), _jsx("div", { className: "text-xs text-gray-500 dark:text-gray-400", children: isCurrentWallet ? "Switch account or reconnect" : walletOption.description })] })] }), _jsx(ChevronRightCircle, { className: "h-5 w-5 text-gray-400" })] }) }, walletOption.id));
-                                    }) }) })] }) }), typeof window !== "undefined" ? document.getElementById("b3-root") || document.body : document.body)] }));
+    return (_jsx("div", { className: "crypto-payment-method mx-auto h-fit w-[460px] max-w-full px-5 pb-5 pt-5 sm:px-0 sm:pt-5", children: _jsxs("div", { className: cn("relative flex flex-col gap-10"), children: [_jsx("button", { onClick: onBack, className: "text-as-quaternary hover:text-as-primary absolute flex h-8 w-8 items-center justify-center rounded-lg transition-colors", children: _jsx(ChevronLeft, { className: "h-6 w-6" }) }), _jsx("div", { className: "flex items-center justify-around gap-4", children: _jsx("div", { className: "flex-1 text-center", children: _jsx("h2", { className: "text-as-primary text-lg font-semibold", children: "Select a payment method" }) }) }), process.env.NODE_ENV === "development" && (_jsxs("div", { className: "rounded-lg border border-yellow-500/50 bg-yellow-50 p-3 dark:bg-yellow-950/20", children: [_jsx("p", { className: "mb-2 text-xs font-semibold text-yellow-800 dark:text-yellow-300", children: "\uD83E\uDDEA Toast Test (Dev Only)" }), _jsxs("div", { className: "flex flex-wrap gap-2", children: [_jsx("button", { onClick: () => toast.success("Success! Transaction completed"), className: "rounded bg-green-600 px-2 py-1 text-xs font-medium text-white hover:bg-green-700", children: "Success" }), _jsx("button", { onClick: () => toast.error("Error! Transaction failed"), className: "rounded bg-red-600 px-2 py-1 text-xs font-medium text-white hover:bg-red-700", children: "Error" }), _jsx("button", { onClick: () => toast.info("Info: Processing your request..."), className: "rounded bg-blue-600 px-2 py-1 text-xs font-medium text-white hover:bg-blue-700", children: "Info" }), _jsx("button", { onClick: () => toast.warning("Warning: Low balance detected"), className: "rounded bg-yellow-600 px-2 py-1 text-xs font-medium text-white hover:bg-yellow-700", children: "Warning" }), _jsx("button", { onClick: () => {
+                                        toast.success("Multiple test 1");
+                                        setTimeout(() => toast.info("Multiple test 2"), 200);
+                                        setTimeout(() => toast.warning("Multiple test 3"), 400);
+                                    }, className: "rounded bg-purple-600 px-2 py-1 text-xs font-medium text-white hover:bg-purple-700", children: "Multiple" })] })] })), _jsxs("div", { className: "crypto-payment-methods flex flex-col gap-4", children: [(shouldShowConnectedEOA || shouldShowWagmiWallet || globalAddress) && (_jsxs("div", { className: "installed-wallets", children: [_jsx("h3", { className: "text-as-primary/80 mb-3 text-sm font-medium", children: "Connected wallets" }), _jsxs("div", { className: "space-y-2", children: [shouldShowConnectedEOA && (_jsx("button", { onClick: () => {
+                                                setSelectedPaymentMethod(CryptoPaymentMethodType.CONNECT_WALLET);
+                                                onSelectPaymentMethod(CryptoPaymentMethodType.CONNECT_WALLET);
+                                                if (connectedEOAWallet) {
+                                                    setActiveWallet(connectedEOAWallet);
+                                                }
+                                                toast.success(`Selected ${eoaWalletInfo?.name || connector?.name || "wallet"}`);
+                                            }, className: cn("crypto-payment-method-connect-wallet eoa-wallet w-full rounded-xl border p-4 text-left transition-all hover:shadow-md", selectedPaymentMethod === CryptoPaymentMethodType.CONNECT_WALLET
+                                                ? "connected-wallet border-as-brand bg-as-brand/5"
+                                                : "border-as-border-secondary bg-as-surface-primary hover:border-as-secondary/80"), children: _jsxs("div", { className: "flex items-center justify-between", children: [_jsxs("div", { className: "flex items-center gap-3", children: [_jsx("div", { className: "wallet-icon flex h-10 w-10 items-center justify-center rounded-full bg-blue-100", children: _jsx(Wallet, { className: "h-5 w-5 text-blue-600" }) }), _jsxs("div", { className: "flex flex-col", children: [_jsx("span", { className: "text-as-primary font-semibold", children: eoaWalletInfo?.name || connector?.name || "Connected Wallet" }), _jsx("span", { className: "text-as-primary/60 text-sm", children: shortenAddress(connectedEOAWallet?.getAccount()?.address || "") })] })] }), _jsxs("div", { className: "flex items-center gap-2", children: [selectedPaymentMethod === CryptoPaymentMethodType.CONNECT_WALLET && (_jsx("div", { className: "h-2 w-2 rounded-full bg-green-500" })), _jsx("button", { onClick: e => {
+                                                                    e.stopPropagation();
+                                                                    disconnect();
+                                                                    toast.success("Wallet disconnected");
+                                                                    if (selectedPaymentMethod === CryptoPaymentMethodType.CONNECT_WALLET) {
+                                                                        setSelectedPaymentMethod(CryptoPaymentMethodType.NONE);
+                                                                    }
+                                                                }, className: "text-as-primary/60 hover:text-as-primary/80 rounded-lg p-1.5 transition-colors", children: _jsx(X, { className: "h-4 w-4" }) })] })] }) })), shouldShowWagmiWallet && (_jsx("button", { onClick: () => {
+                                                setSelectedPaymentMethod(CryptoPaymentMethodType.CONNECT_WALLET);
+                                                onSelectPaymentMethod(CryptoPaymentMethodType.CONNECT_WALLET);
+                                                toast.success(`Selected ${connector?.name || "wallet"}`);
+                                            }, className: cn("crypto-payment-method-connect-wallet wagmi-wallet w-full rounded-xl border p-4 text-left transition-all hover:shadow-md", selectedPaymentMethod === CryptoPaymentMethodType.CONNECT_WALLET
+                                                ? "connected-wallet border-as-brand bg-as-brand/5"
+                                                : "border-as-border-secondary bg-as-surface-primary hover:border-as-secondary/80"), children: _jsxs("div", { className: "flex items-center justify-between", children: [_jsxs("div", { className: "flex items-center gap-3", children: [_jsx("div", { className: "wallet-icon flex h-10 w-10 items-center justify-center rounded-full bg-blue-100", children: _jsx(Wallet, { className: "h-5 w-5 text-blue-600" }) }), _jsxs("div", { className: "flex flex-col", children: [_jsx("span", { className: "text-as-primary font-semibold", children: connector?.name || "Connected Wallet" }), _jsx("span", { className: "text-as-primary/60 text-sm", children: shortenAddress(address || "") })] })] }), _jsxs("div", { className: "flex items-center gap-2", children: [selectedPaymentMethod === CryptoPaymentMethodType.CONNECT_WALLET && (_jsx("div", { className: "h-2 w-2 rounded-full bg-green-500" })), _jsx("button", { onClick: e => {
+                                                                    e.stopPropagation();
+                                                                    disconnect();
+                                                                    toast.success("Wallet disconnected");
+                                                                    if (selectedPaymentMethod === CryptoPaymentMethodType.CONNECT_WALLET) {
+                                                                        setSelectedPaymentMethod(CryptoPaymentMethodType.NONE);
+                                                                    }
+                                                                }, className: "text-as-primary/60 hover:text-as-primary/80 rounded-lg p-1.5 transition-colors", children: _jsx(X, { className: "h-4 w-4" }) })] })] }) })), globalAddress && (_jsx("button", { onClick: () => {
+                                                setSelectedPaymentMethod(CryptoPaymentMethodType.GLOBAL_WALLET);
+                                                onSelectPaymentMethod(CryptoPaymentMethodType.GLOBAL_WALLET);
+                                                toast.success("Selected B3 Account");
+                                            }, className: cn("crypto-payment-method-global-wallet w-full rounded-xl border p-4 text-left transition-all hover:shadow-md", selectedPaymentMethod === CryptoPaymentMethodType.GLOBAL_WALLET
+                                                ? "connected-wallet border-as-brand bg-as-brand/5"
+                                                : "border-as-border-secondary bg-as-surface-primary hover:border-as-secondary/80"), children: _jsxs("div", { className: "flex items-center justify-between", children: [_jsxs("div", { className: "flex items-center gap-3", children: [_jsx(WalletImage, { fallback: _jsx("div", { className: "wallet-icon flex h-10 w-10 items-center justify-center rounded-full bg-purple-100", children: _jsx(Wallet, { className: "h-5 w-5 text-purple-600" }) }) }), _jsxs("div", { className: "flex flex-col", children: [_jsx("span", { className: "text-as-primary font-semibold", children: "Global Account" }), _jsx("span", { className: "text-as-primary/60 text-sm", children: shortenAddress(globalAddress || "") })] })] }), _jsx("div", { className: "flex items-center gap-2", children: selectedPaymentMethod === CryptoPaymentMethodType.GLOBAL_WALLET && (_jsx("div", { className: "h-2 w-2 rounded-full bg-green-500" })) })] }) }))] })] })), _jsxs("div", { className: "other-payment-methods", children: [_jsx("h3", { className: "text-as-primary/80 mb-3 text-sm font-medium", children: "Payment methods" }), _jsxs("div", { className: "space-y-3", children: [_jsxs("button", { onClick: handleConnectWallet, className: "crypto-payment-method-connect-wallet bg-as-surface-primary border-as-border-secondary hover:border-as-secondary/80 group flex w-full items-center justify-between gap-4 rounded-xl border px-4 py-3.5 transition-all duration-200 hover:shadow-md", children: [_jsxs("div", { className: "flex items-center gap-3", children: [_jsx("div", { className: "wallet-icon flex h-8 w-8 items-center justify-center rounded-full bg-blue-100", children: _jsx(Wallet, { className: "h-4 w-4 text-blue-600" }) }), _jsx("div", { className: "flex flex-col items-start text-left", children: _jsx("h4", { className: "text-as-primary font-semibold", children: "Connect wallet" }) })] }), _jsx(ChevronRightCircle, { className: "text-as-primary/40 group-hover:text-as-primary/60 h-5 w-5 transition-colors" })] }), _jsxs("button", { onClick: () => {
+                                                setSelectedPaymentMethod(CryptoPaymentMethodType.TRANSFER_CRYPTO);
+                                                onSelectPaymentMethod(CryptoPaymentMethodType.TRANSFER_CRYPTO);
+                                            }, disabled: isCreatingOrder, className: "crypto-payment-method-transfer bg-as-surface-primary border-as-border-secondary hover:border-as-secondary/80 group flex w-full items-center justify-between gap-4 rounded-xl border px-4 py-3.5 transition-all duration-200 hover:shadow-md", children: [_jsxs("div", { className: "flex items-center gap-3", children: [_jsx("div", { className: "wallet-icon flex h-8 w-8 items-center justify-center rounded-full bg-orange-100", children: _jsx(ZapIcon, { className: "h-4 w-4" }) }), _jsx("div", { className: "flex flex-col items-start text-left", children: _jsx("h4", { className: "text-as-primary font-semibold", children: "Transfer crypto" }) })] }), _jsx(ChevronRightCircle, { className: "text-as-primary/40 group-hover:text-as-primary/60 h-5 w-5 transition-colors" })] })] })] })] })] }) }));
 }

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

@@ -162,7 +162,7 @@ export function SignInWithB3Flow({ strategies, onLoginSuccess, onSessionKeySucce
             isOpen,
             source,
         });
-        if (isConnected && isAuthenticated) {
+        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) {

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

@@ -125,14 +125,40 @@ export function useAuthentication(partnerId) {
             return userAuth;
         }
     }, [activeWallet, partnerId, authenticate, setIsAuthenticated, setIsAuthenticating, setUser, setHasStartedConnecting]);
+    const logout = useCallback(async (callback) => {
+        if (activeWallet) {
+            debug("@@logout:activeWallet", activeWallet);
+            disconnect(activeWallet);
+            debug("@@logout:activeWallet", activeWallet);
+        }
+        // Log out of each wallet
+        wallets.forEach(wallet => {
+            console.log("@@logging out", wallet);
+            disconnect(wallet);
+        });
+        // Delete localStorage thirdweb:connected-wallet-ids
+        // https://npc-labs.slack.com/archives/C070E6HNG85/p1750185115273099
+        if (typeof localStorage !== "undefined") {
+            localStorage.removeItem("thirdweb:connected-wallet-ids");
+            localStorage.removeItem("wagmi.store");
+            localStorage.removeItem("lastAuthProvider");
+            localStorage.removeItem("b3-user");
+        }
+        app.logout();
+        debug("@@logout:loggedOut");
+        setIsAuthenticated(false);
+        setIsConnected(false);
+        setUser();
+        callback?.();
+    }, [activeWallet, disconnect, wallets, setIsAuthenticated, setUser, setIsConnected]);
     const onConnect = useCallback(async (_walleAutoConnectedWith, allConnectedWallets) => {
         debug("@@useAuthentication:onConnect", { _walleAutoConnectedWith, allConnectedWallets });
-        const wallet = allConnectedWallets.find(wallet => wallet.id.startsWith("ecosystem."));
-        if (!wallet) {
-            throw new Error("No smart wallet found during auto-connect");
-        }
-        debug("@@useAuthentication:onConnect", { wallet });
         try {
+            const wallet = allConnectedWallets.find(wallet => wallet.id.startsWith("ecosystem."));
+            if (!wallet) {
+                throw new Error("No smart wallet found during auto-connect");
+            }
+            debug("@@useAuthentication:onConnect", { wallet });
             setHasStartedConnecting(true);
             setIsConnected(true);
             setIsAuthenticating(true);
@@ -146,6 +172,7 @@ export function useAuthentication(partnerId) {
             debug("@@useAuthentication:onConnect:failed", { error });
             setIsAuthenticated(false);
             setUser(undefined);
+            await logout();
         }
         finally {
             setIsAuthenticating(false);
@@ -156,44 +183,19 @@ export function useAuthentication(partnerId) {
             isConnected,
         });
     }, [
-        onConnectCallback,
-        authenticateUser,
         isAuthenticated,
         isAuthenticating,
         isConnected,
-        setActiveWallet,
         setHasStartedConnecting,
-        setIsAuthenticated,
-        setIsAuthenticating,
         setIsConnected,
+        setIsAuthenticating,
+        setActiveWallet,
+        authenticateUser,
+        onConnectCallback,
+        setIsAuthenticated,
         setUser,
+        logout,
     ]);
-    const logout = useCallback(async (callback) => {
-        if (activeWallet) {
-            debug("@@logout:activeWallet", activeWallet);
-            disconnect(activeWallet);
-            debug("@@logout:activeWallet", activeWallet);
-        }
-        // Log out of each wallet
-        wallets.forEach(wallet => {
-            console.log("@@logging out", wallet);
-            disconnect(wallet);
-        });
-        // Delete localStorage thirdweb:connected-wallet-ids
-        // https://npc-labs.slack.com/archives/C070E6HNG85/p1750185115273099
-        if (typeof localStorage !== "undefined") {
-            localStorage.removeItem("thirdweb:connected-wallet-ids");
-            localStorage.removeItem("wagmi.store");
-            localStorage.removeItem("lastAuthProvider");
-            localStorage.removeItem("b3-user");
-        }
-        app.logout();
-        debug("@@logout:loggedOut");
-        setIsAuthenticated(false);
-        setIsConnected(false);
-        setUser();
-        callback?.();
-    }, [activeWallet, disconnect, wallets, setIsAuthenticated, setUser, setIsConnected]);
     const { isLoading: useAutoConnectLoading } = useAutoConnect({
         client,
         wallets: [wallet],

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

@@ -2,7 +2,7 @@ import { Users } from "@b3dotfun/b3-api";
 /**
  * NOTE: THIS IS ONLY MEANT FOR INTERNAL USE, from useOnConnect
  *
- * Custom hook to manage user state with react-query
+ * Custom hook to manage user state with Zustand
  * This allows for invalidation and refetching of user data
  */
 export declare function useUserQuery(): {
@@ -59,7 +59,7 @@ export declare function useUserQuery(): {
         };
     } | undefined;
     setUser: (newUser?: Users) => void;
-    refetchUser: () => Promise<void>;
+    refetchUser: () => Promise<any>;
     clearUser: () => void;
     queryKey: string[];
 };

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

@@ -1,77 +1,98 @@
 import { debugB3React } from "../../../shared/utils/debug.js";
-import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
+import { useEffect } from "react";
+import { create } from "zustand";
+import { persist } from "zustand/middleware";
 const debug = debugB3React("useUserQuery");
 const USER_QUERY_KEY = ["b3-user"];
 /**
- * Retrieves the user from localStorage
+ * Zustand store for managing user state
+ * Persists user data to localStorage
  */
-function getUserFromStorage() {
-    if (typeof window === "undefined") {
-        return null;
-    }
-    try {
-        const storedUser = localStorage.getItem("b3-user");
-        return storedUser ? JSON.parse(storedUser) : null;
-    }
-    catch (error) {
-        console.warn("Failed to restore user from localStorage:", error);
-        return null;
-    }
-}
-/**
- * Saves user to localStorage
- */
-function saveUserToStorage(user) {
-    if (typeof window === "undefined") {
-        return;
-    }
-    if (user) {
-        localStorage.setItem("b3-user", JSON.stringify(user));
-    }
-    else {
-        localStorage.removeItem("b3-user");
-    }
-}
+const useUserStore = create()(persist(set => ({
+    user: null,
+    setUser: (newUser) => {
+        const userToSave = newUser ?? null;
+        set({ user: userToSave });
+        debug("User updated", userToSave);
+    },
+    clearUser: () => {
+        set({ user: null });
+        debug("User cleared");
+    },
+}), {
+    name: "b3-user",
+    onRehydrateStorage: () => (_, error) => {
+        if (error) {
+            console.warn("Failed to rehydrate user store:", error);
+        }
+    },
+}));
 /**
  * NOTE: THIS IS ONLY MEANT FOR INTERNAL USE, from useOnConnect
  *
- * Custom hook to manage user state with react-query
+ * Custom hook to manage user state with Zustand
  * This allows for invalidation and refetching of user data
  */
 export function useUserQuery() {
-    const queryClient = useQueryClient();
-    // Query to get user data (primarily from cache/localStorage)
-    const { data: user } = useQuery({
-        queryKey: USER_QUERY_KEY,
-        queryFn: getUserFromStorage,
-        staleTime: Infinity, // User data doesn't go stale automatically
-        gcTime: Infinity, // Keep in cache indefinitely
-        initialData: getUserFromStorage,
-    });
-    // Mutation to update user
-    const setUserMutation = useMutation({
-        mutationFn: async (newUser) => {
-            const userToSave = newUser ?? null;
-            saveUserToStorage(userToSave);
-            return userToSave;
-        },
-        onSuccess: data => {
-            queryClient.setQueryData(USER_QUERY_KEY, data);
-            debug("User updated", data);
-        },
-    });
+    const user = useUserStore(state => state.user);
+    const setUserStore = useUserStore(state => state.setUser);
+    const clearUserStore = useUserStore(state => state.clearUser);
+    // Listen for storage events from other tabs/windows
+    useEffect(() => {
+        const handleStorageChange = (e) => {
+            if (e.key === "b3-user") {
+                // Sync with changes from other tabs/windows
+                const stored = e.newValue;
+                if (stored) {
+                    try {
+                        const parsed = JSON.parse(stored);
+                        // Zustand persist format: { state: { user: ... }, version: ... }
+                        const userData = parsed?.state?.user ?? parsed?.user ?? null;
+                        useUserStore.setState({ user: userData });
+                    }
+                    catch (error) {
+                        console.warn("Failed to parse user from storage event:", error);
+                    }
+                }
+                else {
+                    useUserStore.setState({ user: null });
+                }
+            }
+        };
+        window.addEventListener("storage", handleStorageChange);
+        return () => {
+            window.removeEventListener("storage", handleStorageChange);
+        };
+    }, []);
     // Helper function to set user (maintains backward compatibility)
     const setUser = (newUser) => {
-        setUserMutation.mutate(newUser);
+        setUserStore(newUser);
     };
     // Helper function to invalidate and refetch user
     const refetchUser = async () => {
-        await queryClient.invalidateQueries({ queryKey: USER_QUERY_KEY });
-        return queryClient.refetchQueries({ queryKey: USER_QUERY_KEY });
+        // Re-read from localStorage and update store
+        // Zustand persist stores data as { state: { user: ... }, version: ... }
+        const stored = localStorage.getItem("b3-user");
+        if (stored) {
+            try {
+                const parsed = JSON.parse(stored);
+                // Zustand persist format: { state: { user: ... }, version: ... }
+                const userData = parsed?.state?.user ?? parsed?.user ?? null;
+                useUserStore.setState({ user: userData });
+                return userData ?? undefined;
+            }
+            catch (error) {
+                console.warn("Failed to refetch user from localStorage:", error);
+                // Fallback to current store state
+                return useUserStore.getState().user ?? undefined;
+            }
+        }
+        useUserStore.setState({ user: null });
+        return undefined;
     };
     // Helper function to clear user
     const clearUser = () => {
-        setUser(undefined);
+        clearUserStore();
     };
     return {
         user: user ?? undefined,