@b3dotfun/sdk 0.0.29-alpha.3 → 0.0.29-alpha.4

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

@@ -1,17 +1,13 @@
 "use client";
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import { useAccountWallet } from "../../../../global-account/react/index.js";
-import { thirdwebB3Mainnet } from "../../../../shared/constants/chains/b3Chain.js";
 import { cn } from "../../../../shared/utils/cn.js";
 import { shortenAddress } from "../../../../shared/utils/formatAddress.js";
-import { client } from "../../../../shared/utils/thirdweb.js";
-import { ChevronLeft, ChevronRightCircle, Wallet, X } from "lucide-react";
+import { ChevronLeft, ChevronRightCircle, Wallet, X, ZapIcon } from "lucide-react";
 import { useState } from "react";
 import { createPortal } from "react-dom";
 import { toast } from "sonner";
-import { ConnectEmbed, lightTheme, useActiveWallet, useDisconnect as useThirdwebDisconnect } from "thirdweb/react";
-import { createWallet } from "thirdweb/wallets";
-import { useDisconnect } from "wagmi";
+import { useAccount, useConnect, useDisconnect, useWalletClient } from "wagmi";
 export var CryptoPaymentMethodType;
 (function (CryptoPaymentMethodType) {
     CryptoPaymentMethodType["NONE"] = "none";
@@ -20,45 +16,138 @@ export var CryptoPaymentMethodType;
 })(CryptoPaymentMethodType || (CryptoPaymentMethodType = {}));
 export function CryptoPaymentMethod({ selectedPaymentMethod, setSelectedPaymentMethod, isCreatingOrder, onBack, onSelectPaymentMethod, }) {
     const { wallet: globalWallet } = useAccountWallet();
-    const activeWallet = useActiveWallet();
+    const { address, isConnected, connector } = useAccount();
+    const { connect, connectors, isPending } = useConnect();
     const { disconnect } = useDisconnect();
-    const { disconnect: disconnectThirdweb } = useThirdwebDisconnect();
+    const { data: walletClient } = useWalletClient();
     const [showWalletModal, setShowWalletModal] = useState(false);
-    // Define available wallets for the modal
-    const availableWallets = [
-        createWallet("io.metamask"),
-        // createWallet("com.coinbase.wallet"),
-        createWallet("me.rainbow"),
-        createWallet("walletConnect"),
-        createWallet("io.rabby"),
-        createWallet("app.phantom"),
-    ];
-    return (_jsxs("div", { className: "crypto-payment-method mx-auto h-fit w-[460px] max-w-full", 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: "Choose payment method" }) }) }), _jsxs("div", { className: "crypto-payment-methods flex flex-col gap-3", children: [!activeWallet ? (
-                            // Not connected - show single connect button
-                            _jsxs("button", { onClick: () => 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" }) }), _jsxs("div", { className: "flex flex-col items-start text-left", children: [_jsx("h4", { className: "text-as-primary font-semibold", children: "Connect wallet" }), _jsx("p", { className: "text-as-primary/60 text-sm", children: "Choose from multiple wallet options" })] })] }), _jsx(ChevronRightCircle, { className: "text-as-primary/40 group-hover:text-as-primary/60 h-5 w-5 transition-colors" })] })) : (
-                            // Connected - show wallet info
-                            _jsx("div", { className: "crypto-payment-method-connect-wallet wallet-connected bg-as-surface-primary border-as-border-secondary rounded-xl border", children: _jsxs("div", { className: "flex items-center justify-between p-4", children: [_jsxs("div", { className: "flex items-center gap-3", children: [globalWallet?.meta?.icon ? (_jsx("img", { src: globalWallet.meta.icon, alt: "Connected Wallet", className: "h-8 w-8 rounded-full" })) : (_jsx("div", { className: "wallet-icon flex h-8 w-8 items-center justify-center rounded-full bg-green-100", children: _jsx(Wallet, { className: "h-4 w-4 text-green-600" }) })), _jsxs("div", { className: "flex flex-col", children: [_jsx("span", { className: "text-as-primary font-semibold", children: "Connected Wallet" }), _jsx("span", { className: "text-as-primary/60 text-sm", children: shortenAddress(activeWallet.getAccount()?.address || "") })] })] }), _jsxs("div", { className: "flex items-center gap-2", children: [_jsx("button", { onClick: () => {
-                                                        setSelectedPaymentMethod(CryptoPaymentMethodType.CONNECT_WALLET);
-                                                        onSelectPaymentMethod(CryptoPaymentMethodType.CONNECT_WALLET);
-                                                    }, className: "bg-as-brand hover:bg-as-brand/90 rounded-lg px-3 py-1.5 text-sm font-medium text-white transition-colors", children: "Use Wallet" }), _jsx("button", { onClick: async () => {
-                                                        disconnect();
-                                                        disconnectThirdweb(activeWallet);
-                                                        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" }) })] })] }) })), _jsxs("button", { onClick: () => {
+    const [selectedWalletConnector, setSelectedWalletConnector] = useState(null);
+    const [modalStep, setModalStep] = useState("wallet-selection");
+    // Define available wallet connectors
+    const availableConnectors = connectors.filter(connector => ["MetaMask", "WalletConnect", "Coinbase Wallet", "Rainbow"].includes(connector.name));
+    // Define wallet options with icons and info
+    const walletOptions = [
+        {
+            id: "metamask",
+            name: "MetaMask",
+            icon: "🦊",
+            description: "Connect using MetaMask browser extension",
+            connector: availableConnectors.find(c => c.name === "MetaMask"),
+        },
+        {
+            id: "coinbase",
+            name: "Coinbase Wallet",
+            icon: "🔵",
+            description: "Connect using Coinbase Wallet",
+            connector: availableConnectors.find(c => c.name === "Coinbase Wallet"),
+        },
+        {
+            id: "rainbow",
+            name: "Rainbow",
+            icon: "🌈",
+            description: "Connect using Rainbow wallet",
+            connector: availableConnectors.find(c => c.name === "Rainbow"),
+        },
+        {
+            id: "walletconnect",
+            name: "WalletConnect",
+            icon: "🔗",
+            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);
+        setModalStep("wallet-selection");
+        setSelectedWalletConnector(null);
+    };
+    // 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");
+                setSelectedPaymentMethod(CryptoPaymentMethodType.CONNECT_WALLET);
+                onSelectPaymentMethod(CryptoPaymentMethodType.CONNECT_WALLET);
+            }
+            else {
+                // Fallback: show modal for manual wallet selection
+                setShowWalletModal(true);
+            }
+        }
+        catch (error) {
+            console.error("Failed to request wallet permissions:", 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");
+                }
+                else {
+                    toast.error("Failed to open account selection");
+                }
+            }
+            else {
+                toast.error("Failed to open account selection");
+            }
+        }
+    };
+    return (_jsxs("div", { className: "crypto-payment-method mx-auto h-fit w-[460px] max-w-full", 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" }) }) }), _jsxs("div", { className: "crypto-payment-methods flex flex-col gap-6", 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: [_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: "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: "Connect Wallet" }), _jsx("button", { onClick: () => setShowWalletModal(false), 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(ConnectEmbed, { client: client, chain: thirdwebB3Mainnet, wallets: availableWallets, showThirdwebBranding: false, theme: lightTheme(), onConnect: async (wallet) => {
-                                    console.log("Wallet connected:", wallet);
-                                    // setShowWalletModal(false);
-                                    setSelectedPaymentMethod(CryptoPaymentMethodType.CONNECT_WALLET);
-                                    onSelectPaymentMethod(CryptoPaymentMethodType.CONNECT_WALLET);
-                                    setShowWalletModal(false);
-                                }, style: {
-                                    width: "100%",
-                                    minHeight: "300px",
-                                } })] }) }), typeof window !== "undefined" ? document.getElementById("b3-root") || document.body : document.body)] }));
+                                }, 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" })] }), isConnected && (_jsxs("div", { className: "installed-wallets", children: [_jsx("h3", { className: "text-as-primary/80 mb-3 text-sm font-medium", children: "Connected wallets" }), _jsx("div", { className: "space-y-2", children: _jsx("button", { onClick: () => {
+                                                setSelectedPaymentMethod(CryptoPaymentMethodType.CONNECT_WALLET);
+                                                onSelectPaymentMethod(CryptoPaymentMethodType.CONNECT_WALLET);
+                                                toast.success(`Selected ${connector?.name || "wallet"}`);
+                                            }, className: cn("crypto-payment-method-connect-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: [globalWallet?.meta?.icon ? (_jsx("img", { src: globalWallet.meta.icon, alt: "Wallet", className: "h-10 w-10 rounded-full" })) : (_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" }) })] })] }) }) })] }))] })] }), showWalletModal &&
+                createPortal(_jsx("div", { className: "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: [_jsxs("div", { className: "flex items-center gap-2", children: [modalStep === "account-selection" && (_jsx("button", { onClick: () => setModalStep("wallet-selection"), className: "text-gray-500 hover:text-gray-700 dark:text-gray-400 dark:hover:text-gray-200", children: _jsx(ChevronLeft, { className: "h-5 w-5" }) })), _jsx("h3", { className: "text-lg font-semibold text-gray-900 dark:text-white", children: modalStep === "wallet-selection"
+                                                    ? "Select a payment method"
+                                                    : `Connect ${selectedWalletConnector?.name}` })] }), _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: modalStep === "wallet-selection" ? (_jsx(_Fragment, { children: _jsxs("div", { className: "space-y-3", children: [_jsx("h4", { className: "text-sm font-medium text-gray-700 dark:text-gray-300", children: isConnected ? "Switch wallet or account" : "Choose wallet to connect" }), walletOptions.map(walletOption => {
+                                                const isCurrentWallet = isConnected && connector?.name === walletOption.connector?.name;
+                                                return (_jsx("button", { onClick: async () => {
+                                                        setSelectedWalletConnector(walletOption.connector);
+                                                        setModalStep("account-selection");
+                                                    }, disabled: isPending, className: `w-full rounded-xl border p-4 text-left transition-all hover:shadow-md disabled:opacity-50 ${isCurrentWallet
+                                                        ? "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: [_jsx("div", { className: `flex h-12 w-12 items-center justify-center rounded-xl text-xl ${isCurrentWallet ? "bg-blue-100 dark:bg-blue-800" : "bg-gray-100 dark:bg-gray-700"}`, children: walletOption.icon }), _jsxs("div", { children: [_jsxs("div", { className: "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));
+                                            })] }) })) : (
+                                /* Account Selection Step */
+                                _jsxs("div", { className: "space-y-4", children: [_jsxs("p", { className: "text-sm text-gray-600 dark:text-gray-400", children: ["Connect to ", selectedWalletConnector?.name, " to view available accounts"] }), _jsx("button", { onClick: async () => {
+                                                handleCloseModal();
+                                                await requestWalletPermissions(selectedWalletConnector);
+                                            }, disabled: isPending, className: "w-full rounded-lg border border-gray-200 bg-white p-4 text-center transition-all hover:border-gray-300 hover:shadow-md disabled:opacity-50 dark:border-gray-600 dark:bg-gray-800 dark:hover:border-gray-500", children: _jsxs("div", { className: "flex items-center justify-center gap-3", children: [_jsx("div", { className: "flex h-10 w-10 items-center justify-center rounded-lg bg-gray-100 dark:bg-gray-700", children: _jsx(Wallet, { className: "h-5 w-5 text-gray-600 dark:text-gray-400" }) }), _jsxs("div", { children: [_jsx("div", { className: "text-sm font-medium text-gray-900 dark:text-white", children: isPending
+                                                                    ? `Connecting to ${selectedWalletConnector?.name}...`
+                                                                    : `Connect ${selectedWalletConnector?.name}` }), _jsx("div", { className: "text-xs text-gray-500 dark:text-gray-400", children: isPending ? "Please check your wallet" : "Click to connect and select account" })] })] }) })] })) })] }) }), typeof window !== "undefined" ? document.getElementById("b3-root") || document.body : document.body)] }));
 }

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

@@ -139,7 +139,7 @@ export const OrderDetails = memo(function OrderDetails({ mode = "modal", order,
     const [txHash, setTxHash] = useState();
     const [showQRCode, setShowQRCode] = useState(false);
     const { isLoading: txLoading, isSuccess: txSuccess } = useWaitForTransactionReceipt({ hash: txHash });
-    const { switchChainAndExecute, isSwitchingOrExecuting } = useUnifiedChainSwitchAndExecute();
+    const { switchChainAndExecuteWithEOA, isSwitchingOrExecuting } = useUnifiedChainSwitchAndExecute();
     const { colorMode } = useColorMode();
     const roundedUpSrcAmount = useMemo(() => {
         // Display the full transfer amount without rounding since users need to see the exact value they're transferring.
@@ -169,11 +169,11 @@ export const OrderDetails = memo(function OrderDetails({ mode = "modal", order,
             to = order.srcTokenAddress;
             value = BigInt(0);
         }
-        const txHash = await switchChainAndExecute(order.srcChain, { to, data: txData, value });
+        const txHash = await switchChainAndExecuteWithEOA(order.srcChain, { to, data: txData, value });
         if (txHash) {
             setTxHash(txHash);
         }
-    }, [order, switchChainAndExecute]);
+    }, [order, switchChainAndExecuteWithEOA]);
     // Main payment handler that triggers chain switch and payment
     const handlePayment = async () => {
         console.log("Initiating payment process. Target chain:", order.srcChain, "Current chain:", walletClient?.chain?.id);

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

@@ -1,18 +1,20 @@
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
-import { Input, useAccountWallet, useTokenData } from "../../../../global-account/react/index.js";
+import { Input, useProfile, useTokenData } from "../../../../global-account/react/index.js";
 import { formatUsername } from "../../../../shared/utils/index.js";
 import { shortenAddress } from "../../../../shared/utils/formatAddress.js";
 import { formatDisplayNumber } from "../../../../shared/utils/number.js";
 import { ChevronRight } from "lucide-react";
 import { motion } from "motion/react";
 import { useEffect, useRef } from "react";
+import { useAccount } from "wagmi";
 import { CryptoPaymentMethodType } from "./CryptoPaymentMethod.js";
 import { FiatPaymentMethod } from "./FiatPaymentMethod.js";
 import { OrderTokenAmount } from "./OrderTokenAmount.js";
 import { TokenBalance } from "./TokenBalance.js";
 export function PaySection({ paymentType, selectedSrcChainId, setSelectedSrcChainId, selectedSrcToken, setSelectedSrcToken, srcAmount, setSrcAmount, setIsSrcInputDirty, selectedCryptoPaymentMethod, selectedFiatPaymentMethod, onSelectCryptoPaymentMethod, onSelectFiatPaymentMethod, anyspendQuote, }) {
-    const { address: globalAddress, wallet: globalWallet, ensName: connectedName } = useAccountWallet();
-    const connectedAddress = globalWallet?.address;
+    const { address: connectedAddress, isConnected } = useAccount();
+    const { data: profileData } = useProfile({ address: connectedAddress });
+    const connectedName = profileData?.displayName;
     const { data: srcTokenMetadata } = useTokenData(selectedSrcToken?.chainId, selectedSrcToken?.address);
     // Add ref to track if we've applied metadata
     const appliedSrcMetadataRef = useRef(false);
@@ -38,13 +40,13 @@ export function PaySection({ paymentType, selectedSrcChainId, setSelectedSrcChai
     useEffect(() => {
         appliedSrcMetadataRef.current = false;
     }, [selectedSrcToken.address, selectedSrcToken.chainId]);
-    return (_jsxs(motion.div, { initial: { opacity: 0, y: 20, filter: "blur(10px)" }, animate: { opacity: 1, y: 0, filter: "blur(0px)" }, transition: { duration: 0.3, delay: 0, ease: "easeInOut" }, className: "bg-as-surface-secondary border-as-border-secondary relative flex w-full flex-col gap-2 rounded-2xl border p-4 sm:p-6", children: [_jsxs("div", { className: "flex items-center justify-between", children: [_jsx("div", { className: "text-as-primary/50 flex h-7 items-center text-sm", children: "Pay" }), paymentType === "crypto" ? (_jsx("button", { className: "text-as-tertiarry flex h-7 items-center gap-2 text-sm transition-colors", onClick: onSelectCryptoPaymentMethod, children: selectedCryptoPaymentMethod === CryptoPaymentMethodType.CONNECT_WALLET ? (_jsxs(_Fragment, { children: [globalAddress ? (_jsx("div", { className: "flex items-center gap-1", children: connectedName ? formatUsername(connectedName) : shortenAddress(connectedAddress || "") })) : ("Connect wallet"), _jsx(ChevronRight, { className: "h-4 w-4" })] })) : selectedCryptoPaymentMethod === CryptoPaymentMethodType.TRANSFER_CRYPTO ? (_jsxs(_Fragment, { children: ["Transfer crypto", _jsx(ChevronRight, { className: "h-4 w-4" })] })) : (_jsxs(_Fragment, { children: ["Select payment method", _jsx(ChevronRight, { className: "h-4 w-4" })] })) })) : (_jsx("button", { className: "text-as-tertiarry flex h-7 items-center gap-2 text-sm transition-colors", onClick: onSelectFiatPaymentMethod, children: selectedFiatPaymentMethod === FiatPaymentMethod.COINBASE_PAY ? (_jsxs(_Fragment, { children: [_jsxs("div", { className: "flex items-center gap-2", children: [_jsx("div", { className: "flex h-5 w-5 items-center justify-center rounded-full bg-blue-600", children: _jsx("span", { className: "text-xs font-bold text-white", children: "C" }) }), "Coinbase Pay"] }), _jsx(ChevronRight, { className: "h-4 w-4" })] })) : selectedFiatPaymentMethod === FiatPaymentMethod.STRIPE ? (_jsxs(_Fragment, { children: [_jsxs("div", { className: "flex items-center gap-2", children: [_jsx("div", { className: "flex h-5 w-5 items-center justify-center rounded-full bg-blue-600", children: _jsx("span", { className: "text-xs font-bold text-white", children: "S" }) }), "Credit/Debit Card"] }), _jsx(ChevronRight, { className: "h-4 w-4" })] })) : (_jsxs(_Fragment, { children: ["Select payment method", _jsx(ChevronRight, { className: "h-4 w-4" })] })) }))] }), paymentType === "crypto" ? (_jsxs(_Fragment, { children: [_jsx(OrderTokenAmount, { address: globalAddress, context: "from", inputValue: srcAmount, onChangeInput: value => {
+    return (_jsxs(motion.div, { initial: { opacity: 0, y: 20, filter: "blur(10px)" }, animate: { opacity: 1, y: 0, filter: "blur(0px)" }, transition: { duration: 0.3, delay: 0, ease: "easeInOut" }, className: "bg-as-surface-secondary border-as-border-secondary relative flex w-full flex-col gap-2 rounded-2xl border p-4 sm:p-6", children: [_jsxs("div", { className: "flex items-center justify-between", children: [_jsx("div", { className: "text-as-primary/50 flex h-7 items-center text-sm", children: "Pay" }), paymentType === "crypto" ? (_jsx("button", { className: "text-as-tertiarry flex h-7 items-center gap-2 text-sm transition-colors focus:!outline-none", onClick: onSelectCryptoPaymentMethod, children: selectedCryptoPaymentMethod === CryptoPaymentMethodType.CONNECT_WALLET ? (_jsxs(_Fragment, { children: [isConnected ? (_jsx("div", { className: "flex items-center gap-1", children: connectedName ? formatUsername(connectedName) : shortenAddress(connectedAddress || "") })) : ("Connect wallet"), _jsx(ChevronRight, { className: "h-4 w-4" })] })) : selectedCryptoPaymentMethod === CryptoPaymentMethodType.TRANSFER_CRYPTO ? (_jsxs(_Fragment, { children: ["Transfer crypto", _jsx(ChevronRight, { className: "h-4 w-4" })] })) : (_jsxs(_Fragment, { children: ["Select payment method", _jsx(ChevronRight, { className: "h-4 w-4" })] })) })) : (_jsx("button", { className: "text-as-tertiarry flex h-7 items-center gap-2 text-sm transition-colors", onClick: onSelectFiatPaymentMethod, children: selectedFiatPaymentMethod === FiatPaymentMethod.COINBASE_PAY ? (_jsxs(_Fragment, { children: [_jsxs("div", { className: "flex items-center gap-2", children: [_jsx("div", { className: "flex h-5 w-5 items-center justify-center rounded-full bg-blue-600", children: _jsx("span", { className: "text-xs font-bold text-white", children: "C" }) }), "Coinbase Pay"] }), _jsx(ChevronRight, { className: "h-4 w-4" })] })) : selectedFiatPaymentMethod === FiatPaymentMethod.STRIPE ? (_jsxs(_Fragment, { children: [_jsxs("div", { className: "flex items-center gap-2", children: [_jsx("div", { className: "flex h-5 w-5 items-center justify-center rounded-full bg-blue-600", children: _jsx("span", { className: "text-xs font-bold text-white", children: "S" }) }), "Credit/Debit Card"] }), _jsx(ChevronRight, { className: "h-4 w-4" })] })) : (_jsxs(_Fragment, { children: ["Select payment method", _jsx(ChevronRight, { className: "h-4 w-4" })] })) }))] }), paymentType === "crypto" ? (_jsxs(_Fragment, { children: [_jsx(OrderTokenAmount, { address: connectedAddress, context: "from", inputValue: srcAmount, onChangeInput: value => {
                             setIsSrcInputDirty(true);
                             setSrcAmount(value);
                         }, chainId: selectedSrcChainId, setChainId: setSelectedSrcChainId, token: selectedSrcToken, setToken: setSelectedSrcToken }), _jsxs("div", { className: "flex items-center justify-between", children: [_jsx("div", { className: "text-as-primary/50 flex h-5 items-center text-sm", children: formatDisplayNumber(anyspendQuote?.data?.currencyIn?.amountUsd, {
                                     style: "currency",
                                     fallback: "",
-                                }) }), _jsx(TokenBalance, { token: selectedSrcToken, walletAddress: globalAddress, onChangeInput: value => {
+                                }) }), _jsx(TokenBalance, { token: selectedSrcToken, walletAddress: connectedAddress, onChangeInput: value => {
                                     setIsSrcInputDirty(true);
                                     setSrcAmount(value);
                                 } })] })] })) : (_jsxs(_Fragment, { children: [_jsx("div", { className: "flex items-center justify-center pb-2 pt-8", children: _jsxs("div", { className: "flex gap-1", children: [_jsx("span", { className: "text-as-tertiarry text-2xl font-bold", children: "$" }), _jsx(Input, { type: "text", value: srcAmount, onChange: e => setSrcAmount(e.target.value.replace(/[^0-9.]/g, "")), placeholder: "5", className: "text-as-primary placeholder:text-as-primary/50 h-auto min-w-[70px] border-0 bg-transparent p-0 px-3 pt-1 text-4xl font-bold focus-visible:ring-0 focus-visible:ring-offset-0", style: {

package/dist/esm/anyspend/react/hooks/useAnyspendFlow.js

@@ -1,7 +1,7 @@
 import { B3_TOKEN, getDefaultToken, USDC_BASE } from "../../../anyspend/index.js";
 import { useAnyspendCreateOnrampOrder, useAnyspendCreateOrder, useAnyspendOrderAndTransactions, useAnyspendQuote, useGeoOnrampOptions, } from "../../../anyspend/react/index.js";
 import { anyspendService } from "../../../anyspend/services/anyspend.js";
-import { useAccountWallet, useProfile } from "../../../global-account/react/index.js";
+import { useAccountWallet, useProfile, useRouter, useSearchParamsSSR } from "../../../global-account/react/index.js";
 import { formatTokenAmount, formatUnits } from "../../../shared/utils/number.js";
 import { useEffect, useState } from "react";
 import { toast } from "sonner";
@@ -19,6 +19,8 @@ export var PanelView;
     PanelView[PanelView["LOADING"] = 5] = "LOADING";
 })(PanelView || (PanelView = {}));
 export function useAnyspendFlow({ paymentType = "crypto", recipientAddress, loadOrder, isDepositMode = false, onOrderSuccess, onTransactionSuccess, sourceTokenAddress, sourceTokenChainId, }) {
+    const searchParams = useSearchParamsSSR();
+    const router = useRouter();
     // Panel and order state
     const [activePanel, setActivePanel] = useState(loadOrder ? PanelView.ORDER_DETAILS : PanelView.MAIN);
     const [orderId, setOrderId] = useState(loadOrder);
@@ -45,6 +47,11 @@ export function useAnyspendFlow({ paymentType = "crypto", recipientAddress, load
             setSelectedRecipientAddress(globalAddress);
         }
     }, [selectedRecipientAddress, globalAddress]);
+    useEffect(() => {
+        if (paymentType === "crypto") {
+            setSelectedCryptoPaymentMethod(CryptoPaymentMethodType.CONNECT_WALLET);
+        }
+    }, [paymentType]);
     // Fetch specific token when sourceTokenAddress and sourceTokenChainId are provided
     useEffect(() => {
         const fetchSourceToken = async () => {
@@ -99,6 +106,16 @@ export function useAnyspendFlow({ paymentType = "crypto", recipientAddress, load
             setDstAmount("");
         }
     }, [anyspendQuote]);
+    // Update useEffect for URL parameter to not override loadOrder
+    useEffect(() => {
+        if (loadOrder)
+            return; // Skip if we have a loadOrder
+        const orderIdParam = searchParams.get("orderId");
+        if (orderIdParam) {
+            setOrderId(orderIdParam);
+            setActivePanel(PanelView.ORDER_DETAILS);
+        }
+    }, [searchParams, loadOrder]);
     // Order creation hooks
     const { createOrder, isCreatingOrder } = useAnyspendCreateOrder({
         onSuccess: data => {
@@ -106,6 +123,18 @@ export function useAnyspendFlow({ paymentType = "crypto", recipientAddress, load
             setOrderId(newOrderId);
             setActivePanel(PanelView.ORDER_DETAILS);
             onOrderSuccess?.(newOrderId);
+            // Add orderId and payment method to URL for persistence
+            const params = new URLSearchParams(searchParams.toString()); // Preserve existing params
+            params.set("orderId", newOrderId);
+            if (selectedCryptoPaymentMethod !== CryptoPaymentMethodType.NONE) {
+                console.log("Setting cryptoPaymentMethod in URL:", selectedCryptoPaymentMethod);
+                params.set("cryptoPaymentMethod", selectedCryptoPaymentMethod);
+            }
+            else {
+                console.log("Payment method is NONE, not setting in URL");
+            }
+            console.log("Final URL params:", params.toString());
+            router.push(`${window.location.pathname}?${params.toString()}`);
         },
         onError: error => {
             console.error(error);

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

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

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

@@ -5,6 +5,7 @@ export interface UnifiedTransactionParams {
 }
 export declare function useUnifiedChainSwitchAndExecute(): {
     switchChainAndExecute: (targetChainId: number, params: UnifiedTransactionParams) => Promise<string | undefined>;
+    switchChainAndExecuteWithEOA: (targetChainId: number, params: UnifiedTransactionParams) => Promise<string | undefined>;
     isSwitchingOrExecuting: boolean;
     isActiveSmartWallet: boolean | undefined;
     isActiveEOAWallet: boolean | undefined;

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

@@ -158,6 +158,7 @@ export function useUnifiedChainSwitchAndExecute() {
     }, [isActiveSmartWallet, isActiveEOAWallet, handleAASendTransaction, handleEOASwitchChainAndSendTransaction]);
     return {
         switchChainAndExecute,
+        switchChainAndExecuteWithEOA: handleEOASwitchChainAndSendTransaction,
         isSwitchingOrExecuting,
         isActiveSmartWallet,
         isActiveEOAWallet,

package/dist/esm/shared/constants/chains/b3Chain.d.ts

@@ -88,9 +88,9 @@ export declare const getViemChainConfig: (config: ChainNetworks) => {
     readonly rpc: string;
     readonly icon: {
         format: string;
-        url: string;
-        width: number;
         height: number;
+        width: number;
+        url: string;
     };
 };
 export declare const thirdwebB3Testnet: ThirdwebChain;

package/dist/esm/shared/constants/chains/supported.d.ts

@@ -10,9 +10,9 @@ export declare const supportedChainNetworks: {
     testnet?: boolean | undefined;
     fees?: Record<string, any> | undefined;
     formatters?: Record<string, any> | undefined;
+    color?: string | undefined;
     testnetConfigID?: number | undefined;
     badge?: string | undefined;
-    color?: string | undefined;
     enabledFeatures?: string[] | undefined;
     blockExplorers: {
         default: string;
@@ -35,13 +35,13 @@ export declare const supportedChainNetworks: {
             uri: string;
         }[];
     };
-    _id: string | {};
     icon: {
         format: string;
-        url: string;
-        width: number;
         height: number;
+        width: number;
+        url: string;
     };
+    _id: string | {};
 }[];
 export declare const coingeckoChains: Record<number, {
     coingecko_id: string;