@b3dotfun/sdk 0.0.65-alpha.0 → 0.0.65-alpha.2

package/dist/esm/anyspend/react/components/AnyspendDepositHype.js

@@ -31,7 +31,7 @@ export function AnySpendDepositHype(props) {
 }
 function AnySpendDepositHypeInner({ loadOrder, mode = "modal", recipientAddress, paymentType = "crypto", sourceTokenAddress, sourceTokenChainId, onSuccess, mainFooter, onTokenSelect, customUsdInputValues, preferEoa, }) {
     // Use shared flow hook
-    const { activePanel, setActivePanel, orderId, setOrderId, oat, selectedSrcChainId, setSelectedSrcChainId, selectedSrcToken, setSelectedSrcToken, srcAmount, setSrcAmount, dstAmount, isSrcInputDirty, setIsSrcInputDirty, selectedCryptoPaymentMethod, setSelectedCryptoPaymentMethod, selectedFiatPaymentMethod, setSelectedFiatPaymentMethod, selectedRecipientAddress, setSelectedRecipientAddress, recipientName, globalAddress, anyspendQuote, isLoadingAnyspendQuote, activeInputAmountInWei, geoData, coinbaseAvailablePaymentMethods, stripeWeb2Support, createOrder, isCreatingOrder, createOnrampOrder, isCreatingOnrampOrder, } = useAnyspendFlow({
+    const { activePanel, setActivePanel, orderId, setOrderId, oat, selectedSrcChainId, setSelectedSrcChainId, selectedSrcToken, setSelectedSrcToken, srcAmount, setSrcAmount, dstAmount, isSrcInputDirty, setIsSrcInputDirty, selectedCryptoPaymentMethod, effectiveCryptoPaymentMethod, setSelectedCryptoPaymentMethod, selectedFiatPaymentMethod, setSelectedFiatPaymentMethod, selectedRecipientAddress, setSelectedRecipientAddress, recipientName, globalAddress, anyspendQuote, isLoadingAnyspendQuote, activeInputAmountInWei, geoData, coinbaseAvailablePaymentMethods, stripeWeb2Support, createOrder, isCreatingOrder, createOnrampOrder, isCreatingOnrampOrder, } = useAnyspendFlow({
         paymentType,
         recipientAddress,
         loadOrder,
@@ -78,7 +78,7 @@ function AnySpendDepositHypeInner({ loadOrder, mode = "modal", recipientAddress,
             }
         }
         if (paymentType === "crypto") {
-            if (selectedCryptoPaymentMethod === CryptoPaymentMethodType.NONE) {
+            if (effectiveCryptoPaymentMethod === CryptoPaymentMethodType.NONE) {
                 return { text: "Choose payment method", disable: false, error: false, loading: false };
             }
             return { text: "Continue to deposit", disable: false, error: false, loading: false };
@@ -92,6 +92,7 @@ function AnySpendDepositHypeInner({ loadOrder, mode = "modal", recipientAddress,
         return { text: "Continue to deposit", disable: false, error: false, loading: false };
     }, [
         activeInputAmountInWei,
+        effectiveCryptoPaymentMethod,
         isLoadingAnyspendQuote,
         isCreatingOrder,
         isCreatingOnrampOrder,
@@ -99,7 +100,6 @@ function AnySpendDepositHypeInner({ loadOrder, mode = "modal", recipientAddress,
         anyspendQuote,
         dstAmount,
         paymentType,
-        selectedCryptoPaymentMethod,
         selectedFiatPaymentMethod,
     ]);
     const onMainButtonClick = async () => {
@@ -110,7 +110,7 @@ function AnySpendDepositHypeInner({ loadOrder, mode = "modal", recipientAddress,
             return;
         }
         if (paymentType === "crypto") {
-            if (selectedCryptoPaymentMethod === CryptoPaymentMethodType.NONE) {
+            if (effectiveCryptoPaymentMethod === CryptoPaymentMethodType.NONE) {
                 setActivePanel(PanelView.CRYPTO_PAYMENT_METHOD);
                 return;
             }
@@ -124,7 +124,7 @@ function AnySpendDepositHypeInner({ loadOrder, mode = "modal", recipientAddress,
             await handleFiatOrder();
         }
     };
-    const mainView = (_jsxs("div", { className: "mx-auto flex w-[460px] max-w-full flex-col items-center gap-2", children: [_jsx("div", { className: "mb-4 flex flex-col items-center gap-3 text-center", children: _jsx("div", { children: _jsx("h1", { className: "text-as-primary text-xl font-bold", children: paymentType === "crypto" ? "Deposit Crypto" : "Fund with Fiat" }) }) }), _jsx("div", { className: "relative flex w-full max-w-[calc(100vw-32px)] flex-col gap-2", children: _jsxs("div", { className: "relative flex w-full max-w-[calc(100vw-32px)] flex-col gap-2", children: [paymentType === "crypto" ? (_jsx(CryptoPaySection, { selectedSrcChainId: selectedSrcChainId, setSelectedSrcChainId: setSelectedSrcChainId, selectedSrcToken: selectedSrcToken, setSelectedSrcToken: setSelectedSrcToken, srcAmount: srcAmount, setSrcAmount: setSrcAmount, isSrcInputDirty: isSrcInputDirty, setIsSrcInputDirty: setIsSrcInputDirty, selectedCryptoPaymentMethod: selectedCryptoPaymentMethod, onSelectCryptoPaymentMethod: () => setActivePanel(PanelView.CRYPTO_PAYMENT_METHOD), anyspendQuote: anyspendQuote, onTokenSelect: onTokenSelect })) : (_jsx(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" }, children: _jsx(PanelOnramp, { srcAmountOnRamp: srcAmount, setSrcAmountOnRamp: setSrcAmount, selectedPaymentMethod: selectedFiatPaymentMethod, setActivePanel: setActivePanel, _recipientAddress: recipientAddress, destinationToken: B3_TOKEN, destinationChainId: base.id, dstTokenSymbol: HYPE_TOKEN_DETAILS.SYMBOL, hideDstToken: true, destinationAmount: dstAmount, onDestinationTokenChange: () => { }, onDestinationChainChange: () => { }, fiatPaymentMethodIndex: PanelView.FIAT_PAYMENT_METHOD, recipientSelectionPanelIndex: PanelView.RECIPIENT_SELECTION, anyspendQuote: anyspendQuote, onShowPointsDetail: () => setActivePanel(PanelView.POINTS_DETAIL), onShowFeeDetail: () => setActivePanel(PanelView.FEE_DETAIL), customUsdInputValues: customUsdInputValues }) })), _jsx("div", { className: cn("relative -my-1 flex h-0 items-center justify-center", paymentType === "fiat" && "hidden"), children: _jsx(Button, { variant: "ghost", className: cn("swap-direction-button border-as-stroke bg-as-surface-primary z-10 h-10 w-10 cursor-default rounded-xl border-2 sm:h-8 sm:w-8 sm:rounded-xl"), children: _jsx("div", { className: "relative flex items-center justify-center transition-opacity", children: _jsx(ArrowDown, { className: "text-as-primary/50 h-5 w-5" }) }) }) }), paymentType === "crypto" && (_jsx(CryptoReceiveSection, { isDepositMode: false, isBuyMode: true, selectedRecipientAddress: selectedRecipientAddress, recipientName: recipientName || undefined, onSelectRecipient: () => setActivePanel(PanelView.RECIPIENT_SELECTION), setRecipientAddress: setSelectedRecipientAddress, recipientAddressFromProps: recipientAddress, globalAddress: globalAddress, dstAmount: dstAmount, dstToken: B3_TOKEN, dstTokenSymbol: HYPE_TOKEN_DETAILS.SYMBOL, dstTokenLogoURI: HYPE_TOKEN_DETAILS.LOGO_URI, selectedDstChainId: base.id, setSelectedDstChainId: () => { }, setSelectedDstToken: () => { }, isSrcInputDirty: isSrcInputDirty, onChangeDstAmount: value => {
+    const mainView = (_jsxs("div", { className: "mx-auto flex w-[460px] max-w-full flex-col items-center gap-2", children: [_jsx("div", { className: "mb-4 flex flex-col items-center gap-3 text-center", children: _jsx("div", { children: _jsx("h1", { className: "text-as-primary text-xl font-bold", children: paymentType === "crypto" ? "Deposit Crypto" : "Fund with Fiat" }) }) }), _jsx("div", { className: "relative flex w-full max-w-[calc(100vw-32px)] flex-col gap-2", children: _jsxs("div", { className: "relative flex w-full max-w-[calc(100vw-32px)] flex-col gap-2", children: [paymentType === "crypto" ? (_jsx(CryptoPaySection, { selectedSrcChainId: selectedSrcChainId, setSelectedSrcChainId: setSelectedSrcChainId, selectedSrcToken: selectedSrcToken, setSelectedSrcToken: setSelectedSrcToken, srcAmount: srcAmount, setSrcAmount: setSrcAmount, isSrcInputDirty: isSrcInputDirty, setIsSrcInputDirty: setIsSrcInputDirty, selectedCryptoPaymentMethod: effectiveCryptoPaymentMethod, onSelectCryptoPaymentMethod: () => setActivePanel(PanelView.CRYPTO_PAYMENT_METHOD), anyspendQuote: anyspendQuote, onTokenSelect: onTokenSelect })) : (_jsx(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" }, children: _jsx(PanelOnramp, { srcAmountOnRamp: srcAmount, setSrcAmountOnRamp: setSrcAmount, selectedPaymentMethod: selectedFiatPaymentMethod, setActivePanel: setActivePanel, _recipientAddress: recipientAddress, destinationToken: B3_TOKEN, destinationChainId: base.id, dstTokenSymbol: HYPE_TOKEN_DETAILS.SYMBOL, hideDstToken: true, destinationAmount: dstAmount, onDestinationTokenChange: () => { }, onDestinationChainChange: () => { }, fiatPaymentMethodIndex: PanelView.FIAT_PAYMENT_METHOD, recipientSelectionPanelIndex: PanelView.RECIPIENT_SELECTION, anyspendQuote: anyspendQuote, onShowPointsDetail: () => setActivePanel(PanelView.POINTS_DETAIL), onShowFeeDetail: () => setActivePanel(PanelView.FEE_DETAIL), customUsdInputValues: customUsdInputValues }) })), _jsx("div", { className: cn("relative -my-1 flex h-0 items-center justify-center", paymentType === "fiat" && "hidden"), children: _jsx(Button, { variant: "ghost", className: cn("swap-direction-button border-as-stroke bg-as-surface-primary z-10 h-10 w-10 cursor-default rounded-xl border-2 sm:h-8 sm:w-8 sm:rounded-xl"), children: _jsx("div", { className: "relative flex items-center justify-center transition-opacity", children: _jsx(ArrowDown, { className: "text-as-primary/50 h-5 w-5" }) }) }) }), paymentType === "crypto" && (_jsx(CryptoReceiveSection, { isDepositMode: false, isBuyMode: true, selectedRecipientAddress: selectedRecipientAddress, recipientName: recipientName || undefined, onSelectRecipient: () => setActivePanel(PanelView.RECIPIENT_SELECTION), setRecipientAddress: setSelectedRecipientAddress, recipientAddressFromProps: recipientAddress, globalAddress: globalAddress, dstAmount: dstAmount, dstToken: B3_TOKEN, dstTokenSymbol: HYPE_TOKEN_DETAILS.SYMBOL, dstTokenLogoURI: HYPE_TOKEN_DETAILS.LOGO_URI, selectedDstChainId: base.id, setSelectedDstChainId: () => { }, setSelectedDstToken: () => { }, isSrcInputDirty: isSrcInputDirty, onChangeDstAmount: value => {
                                 setIsSrcInputDirty(false);
                                 setSrcAmount(value);
                             }, anyspendQuote: anyspendQuote, onShowPointsDetail: () => setActivePanel(PanelView.POINTS_DETAIL), onShowFeeDetail: () => setActivePanel(PanelView.FEE_DETAIL), selectedCryptoPaymentMethod: selectedCryptoPaymentMethod }))] }) }), _jsx(motion.div, { initial: { opacity: 0, y: 20, filter: "blur(10px)" }, animate: { opacity: 1, y: 0, filter: "blur(0px)" }, transition: { duration: 0.3, delay: 0.2, ease: "easeInOut" }, className: cn("mt-4 flex w-full max-w-[460px] flex-col gap-2"), children: _jsx(ShinyButton, { accentColor: "hsl(var(--as-brand))", disabled: btnInfo.disable, onClick: onMainButtonClick, className: cn("as-main-button relative w-full", btnInfo.error ? "!bg-as-red" : btnInfo.disable ? "!bg-as-on-surface-2" : "!bg-as-brand"), textClassName: cn(btnInfo.error ? "text-white" : btnInfo.disable ? "text-as-secondary" : "text-white"), children: _jsxs("div", { className: "flex items-center justify-center gap-2", children: [btnInfo.loading && _jsx(Loader2, { className: "h-4 w-4 animate-spin" }), btnInfo.text] }) }) }), mainFooter ? mainFooter : null] }));

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

@@ -14,26 +14,19 @@ import { ChainTokenIcon } from "./ChainTokenIcon.js";
 export function OrderTokenAmount({ disabled, inputValue, onChangeInput, context, address, chainId, setChainId, token, setToken, hideTokenSelect = false, canEditAmount = true, className, innerClassName, amountClassName, tokenSelectClassName, onTokenSelect, walletAddress, }) {
     // Track previous token to detect changes
     const prevTokenRef = useRef(token.address);
-    // Track if initial balance has been set
-    const initialBalanceSetRef = useRef(false);
     // Only get token balance when context is "from" (for setting max amount)
     const { rawBalance } = useTokenBalance({
         token,
         address: context === "from" && walletAddress ? walletAddress : undefined,
     });
-    // Reset balance ref when token address or chain changes
-    useEffect(() => {
-        initialBalanceSetRef.current = false;
-    }, [token.address, token.chainId]);
     useEffect(() => {
         // Only handle "from" context
         if (context !== "from")
             return;
         // Check if token changed or if this is the initial load with balance
         const isTokenChanged = prevTokenRef.current !== token.address;
-        const isInitialLoad = !initialBalanceSetRef.current && rawBalance;
-        if ((isTokenChanged || isInitialLoad) && rawBalance) {
-            console.log(`Setting max balance - Token: ${token.address}, Changed: ${isTokenChanged}, Initial: ${isInitialLoad}`);
+        if (isTokenChanged && rawBalance) {
+            console.log(`Setting max balance - Token: ${token.address}, Changed: ${isTokenChanged}`);
             // Calculate max amount with gas reserve for native tokens
             let maxAmount;
             if (isNativeToken(token.address)) {
@@ -49,7 +42,6 @@ export function OrderTokenAmount({ disabled, inputValue, onChangeInput, context,
             onChangeInput(formatUnits(maxAmount, token.decimals));
             // Update refs
             prevTokenRef.current = token.address;
-            initialBalanceSetRef.current = true;
         }
     }, [token.address, token.chainId, token.decimals, chainId, context, onChangeInput, rawBalance]);
     const handleTokenSelect = (newToken) => {

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

@@ -93,8 +93,12 @@ export declare function useAnyspendFlow({ paymentType, recipientAddress, loadOrd
     setDstAmount: import("react").Dispatch<import("react").SetStateAction<string>>;
     isSrcInputDirty: boolean;
     setIsSrcInputDirty: import("react").Dispatch<import("react").SetStateAction<boolean>>;
+    cryptoPaymentMethod: CryptoPaymentMethodType;
+    setCryptoPaymentMethod: (method: CryptoPaymentMethodType) => void;
     selectedCryptoPaymentMethod: CryptoPaymentMethodType;
-    setSelectedCryptoPaymentMethod: import("react").Dispatch<import("react").SetStateAction<CryptoPaymentMethodType>>;
+    setSelectedCryptoPaymentMethod: (method: CryptoPaymentMethodType) => void;
+    effectiveCryptoPaymentMethod: CryptoPaymentMethodType;
+    resetPaymentMethods: () => void;
     selectedFiatPaymentMethod: FiatPaymentMethod;
     setSelectedFiatPaymentMethod: import("react").Dispatch<import("react").SetStateAction<FiatPaymentMethod>>;
     selectedRecipientAddress: string | undefined;

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

@@ -7,11 +7,12 @@ import { useEffect, useMemo, useState } from "react";
 import { toast } from "sonner";
 import { parseUnits } from "viem";
 import { base, mainnet } from "viem/chains";
-import { useAccount } from "wagmi";
 import { CryptoPaymentMethodType } from "../components/common/CryptoPaymentMethod.js";
 import { FiatPaymentMethod } from "../components/common/FiatPaymentMethod.js";
 import { useAutoSelectCryptoPaymentMethod } from "./useAutoSelectCryptoPaymentMethod.js";
 import { useAutoSetActiveWalletFromWagmi } from "./useAutoSetActiveWalletFromWagmi.js";
+import { useConnectedWalletDisplay } from "./useConnectedWalletDisplay.js";
+import { useCryptoPaymentMethodState } from "./useCryptoPaymentMethodState.js";
 export var PanelView;
 (function (PanelView) {
     PanelView[PanelView["MAIN"] = 0] = "MAIN";
@@ -37,17 +38,17 @@ export function useAnyspendFlow({ paymentType = "crypto", recipientAddress, load
     const defaultDstToken = B3_TOKEN; // Default destination token
     const [selectedSrcToken, setSelectedSrcToken] = useState(defaultSrcToken);
     const [selectedDstToken, setSelectedDstToken] = useState(defaultDstToken);
-    const [srcAmount, setSrcAmount] = useState(paymentType === "fiat" ? "5" : "0.1");
+    const [srcAmount, setSrcAmount] = useState(paymentType === "fiat" ? "5" : "0");
     const [dstAmount, setDstAmount] = useState("");
     const [isSrcInputDirty, setIsSrcInputDirty] = useState(true);
     // Derive destination chain ID from token or prop (cannot change)
     const selectedDstChainId = destinationTokenChainId || selectedDstToken.chainId;
-    // Payment method state
-    const [selectedCryptoPaymentMethod, setSelectedCryptoPaymentMethod] = useState(CryptoPaymentMethodType.NONE);
+    // Payment method state with dual-state system (auto + explicit user selection)
+    const { cryptoPaymentMethod, setCryptoPaymentMethod, selectedCryptoPaymentMethod, setSelectedCryptoPaymentMethod, effectiveCryptoPaymentMethod, resetPaymentMethods, } = useCryptoPaymentMethodState();
     const [selectedFiatPaymentMethod, setSelectedFiatPaymentMethod] = useState(FiatPaymentMethod.NONE);
     // Recipient state
     const { address: globalAddress } = useAccountWallet();
-    const { address: wagmiAddress } = useAccount();
+    const { walletAddress } = useConnectedWalletDisplay(effectiveCryptoPaymentMethod);
     const [selectedRecipientAddress, setSelectedRecipientAddress] = useState(recipientAddress);
     const recipientProfile = useProfile({ address: selectedRecipientAddress, fresh: true });
     const recipientName = recipientProfile.data?.name;
@@ -62,7 +63,7 @@ export function useAnyspendFlow({ paymentType = "crypto", recipientAddress, load
     // Check token balance for crypto payments
     const { rawBalance, isLoading: isBalanceLoading } = useTokenBalance({
         token: selectedSrcToken,
-        address: wagmiAddress,
+        address: walletAddress,
     });
     // Check if user has enough balance
     const hasEnoughBalance = useMemo(() => {
@@ -79,8 +80,9 @@ export function useAnyspendFlow({ paymentType = "crypto", recipientAddress, load
     // Auto-select crypto payment method based on available wallets and balance
     useAutoSelectCryptoPaymentMethod({
         paymentType,
+        cryptoPaymentMethod,
+        setCryptoPaymentMethod,
         selectedCryptoPaymentMethod,
-        setSelectedCryptoPaymentMethod,
         hasEnoughBalance,
         isBalanceLoading,
     });
@@ -180,9 +182,9 @@ export function useAnyspendFlow({ paymentType = "crypto", recipientAddress, load
             if (!disableUrlParamManagement) {
                 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);
+                if (effectiveCryptoPaymentMethod !== CryptoPaymentMethodType.NONE) {
+                    console.log("Setting cryptoPaymentMethod in URL:", effectiveCryptoPaymentMethod);
+                    params.set("cryptoPaymentMethod", effectiveCryptoPaymentMethod);
                 }
                 else {
                     console.log("Payment method is NONE, not setting in URL");
@@ -246,8 +248,12 @@ export function useAnyspendFlow({ paymentType = "crypto", recipientAddress, load
         isSrcInputDirty,
         setIsSrcInputDirty,
         // Payment methods
+        cryptoPaymentMethod,
+        setCryptoPaymentMethod,
         selectedCryptoPaymentMethod,
         setSelectedCryptoPaymentMethod,
+        effectiveCryptoPaymentMethod,
+        resetPaymentMethods,
         selectedFiatPaymentMethod,
         setSelectedFiatPaymentMethod,
         // Recipient

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

@@ -2,10 +2,12 @@ import { CryptoPaymentMethodType } from "../components/common/CryptoPaymentMetho
 interface UseAutoSelectCryptoPaymentMethodParams {
     /** Current payment type (crypto or fiat) */
     paymentType?: "crypto" | "fiat";
-    /** Currently selected payment method */
+    /** Auto-selected payment method based on balance (not used in hook logic, but part of state management) */
+    cryptoPaymentMethod: CryptoPaymentMethodType;
+    /** Function to update the auto-selected payment method */
+    setCryptoPaymentMethod: (method: CryptoPaymentMethodType) => void;
+    /** User explicitly selected payment method (NONE means no explicit selection) */
     selectedCryptoPaymentMethod: CryptoPaymentMethodType;
-    /** Function to update the selected payment method */
-    setSelectedCryptoPaymentMethod: (method: CryptoPaymentMethodType) => void;
     /** Whether user has enough balance to pay */
     hasEnoughBalance: boolean;
     /** Whether balance is still loading */
@@ -16,11 +18,11 @@ interface UseAutoSelectCryptoPaymentMethodParams {
  * based on available wallets and balance.
  *
  * Auto-selection logic:
- * - Only auto-selects when payment method is NONE (doesn't override user choices)
+ * - Only auto-selects when selectedCryptoPaymentMethod is NONE (user hasn't explicitly chosen)
  * - If EOA/Wagmi wallet connected + has balance → CONNECT_WALLET
  * - If EOA/Wagmi wallet connected + insufficient balance → TRANSFER_CRYPTO
  * - If only Global wallet available → GLOBAL_WALLET
  * - If no wallets → remains NONE
  */
-export declare function useAutoSelectCryptoPaymentMethod({ paymentType, selectedCryptoPaymentMethod, setSelectedCryptoPaymentMethod, hasEnoughBalance, isBalanceLoading, }: UseAutoSelectCryptoPaymentMethodParams): void;
+export declare function useAutoSelectCryptoPaymentMethod({ paymentType, cryptoPaymentMethod: _cryptoPaymentMethod, setCryptoPaymentMethod, selectedCryptoPaymentMethod, hasEnoughBalance, isBalanceLoading, }: UseAutoSelectCryptoPaymentMethodParams): void;
 export {};

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

@@ -6,18 +6,22 @@ import { useConnectedWalletDisplay } from "./useConnectedWalletDisplay.js";
  * based on available wallets and balance.
  *
  * Auto-selection logic:
- * - Only auto-selects when payment method is NONE (doesn't override user choices)
+ * - Only auto-selects when selectedCryptoPaymentMethod is NONE (user hasn't explicitly chosen)
  * - If EOA/Wagmi wallet connected + has balance → CONNECT_WALLET
  * - If EOA/Wagmi wallet connected + insufficient balance → TRANSFER_CRYPTO
  * - If only Global wallet available → GLOBAL_WALLET
  * - If no wallets → remains NONE
  */
-export function useAutoSelectCryptoPaymentMethod({ paymentType = "crypto", selectedCryptoPaymentMethod, setSelectedCryptoPaymentMethod, hasEnoughBalance, isBalanceLoading, }) {
+export function useAutoSelectCryptoPaymentMethod({ paymentType = "crypto", cryptoPaymentMethod: _cryptoPaymentMethod, setCryptoPaymentMethod, selectedCryptoPaymentMethod, hasEnoughBalance, isBalanceLoading, }) {
     // Get suggested payment method based on available wallets
     const { suggestedPaymentMethod } = useConnectedWalletDisplay(selectedCryptoPaymentMethod);
     useEffect(() => {
-        // Only auto-select when on crypto payment type and payment method is NONE
-        if (paymentType !== "crypto" || selectedCryptoPaymentMethod !== CryptoPaymentMethodType.NONE) {
+        // Only auto-select when on crypto payment type
+        if (paymentType !== "crypto") {
+            return;
+        }
+        // Only auto-switch if user hasn't explicitly selected a payment method
+        if (selectedCryptoPaymentMethod !== CryptoPaymentMethodType.NONE) {
             return;
         }
         // If we have a suggested payment method (wallet is connected), use it
@@ -26,28 +30,28 @@ export function useAutoSelectCryptoPaymentMethod({ paymentType = "crypto", selec
             // Otherwise, default to TRANSFER_CRYPTO if balance is insufficient
             if (!isBalanceLoading) {
                 if (hasEnoughBalance && suggestedPaymentMethod === CryptoPaymentMethodType.CONNECT_WALLET) {
-                    setSelectedCryptoPaymentMethod(CryptoPaymentMethodType.CONNECT_WALLET);
+                    setCryptoPaymentMethod(CryptoPaymentMethodType.CONNECT_WALLET);
                 }
                 else if (!hasEnoughBalance && suggestedPaymentMethod === CryptoPaymentMethodType.CONNECT_WALLET) {
                     // Wallet connected but insufficient balance - suggest transfer
-                    setSelectedCryptoPaymentMethod(CryptoPaymentMethodType.TRANSFER_CRYPTO);
+                    setCryptoPaymentMethod(CryptoPaymentMethodType.TRANSFER_CRYPTO);
                 }
                 else {
                     // Use suggested method (e.g., GLOBAL_WALLET)
-                    setSelectedCryptoPaymentMethod(suggestedPaymentMethod);
+                    setCryptoPaymentMethod(suggestedPaymentMethod);
                 }
             }
             else {
                 // Balance still loading, use suggested method
-                setSelectedCryptoPaymentMethod(suggestedPaymentMethod);
+                setCryptoPaymentMethod(suggestedPaymentMethod);
             }
         }
     }, [
         paymentType,
+        setCryptoPaymentMethod,
         selectedCryptoPaymentMethod,
         suggestedPaymentMethod,
         hasEnoughBalance,
         isBalanceLoading,
-        setSelectedCryptoPaymentMethod,
     ]);
 }

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

@@ -0,0 +1,42 @@
+import { CryptoPaymentMethodType } from "../components/common/CryptoPaymentMethod";
+interface UseCryptoPaymentMethodStateResult {
+    /** Auto-selected payment method based on balance */
+    cryptoPaymentMethod: CryptoPaymentMethodType;
+    /** Function to update the auto-selected payment method */
+    setCryptoPaymentMethod: (method: CryptoPaymentMethodType) => void;
+    /** User explicitly selected payment method (NONE means no explicit selection) */
+    selectedCryptoPaymentMethod: CryptoPaymentMethodType;
+    /** Function to update the user-selected payment method */
+    setSelectedCryptoPaymentMethod: (method: CryptoPaymentMethodType) => void;
+    /** Effective payment method (user selection takes priority over auto-selection) */
+    effectiveCryptoPaymentMethod: CryptoPaymentMethodType;
+    /** Reset both payment method states to NONE */
+    resetPaymentMethods: () => void;
+}
+/**
+ * Custom hook to manage crypto payment method state with dual-state system:
+ *
+ * - `cryptoPaymentMethod`: Auto-selected based on wallet availability and balance
+ * - `selectedCryptoPaymentMethod`: Explicitly selected by user
+ * - `effectiveCryptoPaymentMethod`: User selection takes priority over auto-selection
+ *
+ * This allows automatic payment method suggestions while respecting explicit user choices.
+ *
+ * @example
+ * ```tsx
+ * const {
+ *   cryptoPaymentMethod,
+ *   setCryptoPaymentMethod,
+ *   selectedCryptoPaymentMethod,
+ *   setSelectedCryptoPaymentMethod,
+ *   effectiveCryptoPaymentMethod,
+ *   resetPaymentMethods
+ * } = useCryptoPaymentMethodState();
+ *
+ * // Use effectiveCryptoPaymentMethod for display
+ * // Use setSelectedCryptoPaymentMethod when user explicitly selects
+ * // Call resetPaymentMethods when switching tabs or going back
+ * ```
+ */
+export declare function useCryptoPaymentMethodState(): UseCryptoPaymentMethodStateResult;
+export {};

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

@@ -0,0 +1,48 @@
+import { useState } from "react";
+import { CryptoPaymentMethodType } from "../components/common/CryptoPaymentMethod.js";
+/**
+ * Custom hook to manage crypto payment method state with dual-state system:
+ *
+ * - `cryptoPaymentMethod`: Auto-selected based on wallet availability and balance
+ * - `selectedCryptoPaymentMethod`: Explicitly selected by user
+ * - `effectiveCryptoPaymentMethod`: User selection takes priority over auto-selection
+ *
+ * This allows automatic payment method suggestions while respecting explicit user choices.
+ *
+ * @example
+ * ```tsx
+ * const {
+ *   cryptoPaymentMethod,
+ *   setCryptoPaymentMethod,
+ *   selectedCryptoPaymentMethod,
+ *   setSelectedCryptoPaymentMethod,
+ *   effectiveCryptoPaymentMethod,
+ *   resetPaymentMethods
+ * } = useCryptoPaymentMethodState();
+ *
+ * // Use effectiveCryptoPaymentMethod for display
+ * // Use setSelectedCryptoPaymentMethod when user explicitly selects
+ * // Call resetPaymentMethods when switching tabs or going back
+ * ```
+ */
+export function useCryptoPaymentMethodState() {
+    // cryptoPaymentMethod: auto-selected based on balance
+    const [cryptoPaymentMethod, setCryptoPaymentMethod] = useState(CryptoPaymentMethodType.NONE);
+    // selectedCryptoPaymentMethod: explicitly selected by user (NONE means no explicit selection)
+    const [selectedCryptoPaymentMethod, setSelectedCryptoPaymentMethod] = useState(CryptoPaymentMethodType.NONE);
+    // The effective payment method (user selection takes priority over auto-selection)
+    const effectiveCryptoPaymentMethod = selectedCryptoPaymentMethod !== CryptoPaymentMethodType.NONE ? selectedCryptoPaymentMethod : cryptoPaymentMethod;
+    // Helper function to reset both states
+    const resetPaymentMethods = () => {
+        setCryptoPaymentMethod(CryptoPaymentMethodType.NONE);
+        setSelectedCryptoPaymentMethod(CryptoPaymentMethodType.NONE);
+    };
+    return {
+        cryptoPaymentMethod,
+        setCryptoPaymentMethod,
+        selectedCryptoPaymentMethod,
+        setSelectedCryptoPaymentMethod,
+        effectiveCryptoPaymentMethod,
+        resetPaymentMethods,
+    };
+}

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

@@ -6,7 +6,6 @@ import invariant from "invariant";
 import { useCallback, useState } from "react";
 import { toast } from "sonner";
 import { prepareTransaction, sendTransaction as twSendTransaction } from "thirdweb";
-import { useActiveWallet } from "thirdweb/react";
 import { isAddress } from "viem";
 import { useSwitchChain } from "wagmi";
 import { useB3 } from "../components/index.js";
@@ -19,7 +18,6 @@ invariant(partnerId, "Partner ID is required");
 export function useUnifiedChainSwitchAndExecute() {
     const { switchChainAsync } = useSwitchChain();
     const [isSwitchingOrExecuting, setIsSwitchingOrExecuting] = useState(false);
-    const activeWallet = useActiveWallet();
     const { isActiveSmartWallet, isActiveEOAWallet, connectedEOAWallet } = useAccountWallet();
     const { account: aaAccount } = useB3();
     // Handle EOA wallet chain switch and execute transaction
@@ -34,18 +32,18 @@ export function useUnifiedChainSwitchAndExecute() {
             toast.error(`Chain ${targetChainId} is not supported`);
             return;
         }
-        const currentChainId = activeWallet?.getChain()?.id;
+        const currentChainId = connectedEOAWallet?.getChain()?.id;
         const onCorrectChain = currentChainId === targetChainId;
         // Helper function to execute the transaction
         const executeTransaction = async () => {
-            const signer = activeWallet?.getAccount();
+            const signer = connectedEOAWallet?.getAccount();
             if (!signer) {
                 throw new Error("No account connected");
             }
             // Coinbase Smart Wallet specific chain switching (different behavior from other wallets)
             const walletChain = connectedEOAWallet.getChain();
             if (walletChain?.id !== targetChainId) {
-                activeWallet?.switchChain(getThirdwebChain(targetChainId));
+                connectedEOAWallet?.switchChain(getThirdwebChain(targetChainId));
             }
             invariant(isAddress(params.to), "params.to is not a valid address");
             const result = await signer.sendTransaction({
@@ -97,7 +95,7 @@ export function useUnifiedChainSwitchAndExecute() {
         finally {
             setIsSwitchingOrExecuting(false);
         }
-    }, [connectedEOAWallet, activeWallet, switchChainAsync]);
+    }, [connectedEOAWallet, switchChainAsync]);
     // Handle AA wallet transaction (no chain switch needed for AA)
     const handleAASendTransaction = useCallback(async (targetChainId, params) => {
         if (!aaAccount) {
@@ -153,14 +151,8 @@ export function useUnifiedChainSwitchAndExecute() {
         if (isActiveSmartWallet) {
             return handleAASendTransaction(targetChainId, params);
         }
-        else if (isActiveEOAWallet) {
-            return handleEOASwitchChainAndSendTransaction(targetChainId, params);
-        }
-        else {
-            toast.error("No wallet connected");
-            return undefined;
-        }
-    }, [isActiveSmartWallet, isActiveEOAWallet, handleAASendTransaction, handleEOASwitchChainAndSendTransaction]);
+        return handleEOASwitchChainAndSendTransaction(targetChainId, params);
+    }, [isActiveSmartWallet, handleAASendTransaction, handleEOASwitchChainAndSendTransaction]);
     return {
         switchChainAndExecute,
         switchChainAndExecuteWithEOA: handleEOASwitchChainAndSendTransaction,

package/dist/types/anyspend/react/hooks/useAnyspendFlow.d.ts

@@ -93,8 +93,12 @@ export declare function useAnyspendFlow({ paymentType, recipientAddress, loadOrd
     setDstAmount: import("react").Dispatch<import("react").SetStateAction<string>>;
     isSrcInputDirty: boolean;
     setIsSrcInputDirty: import("react").Dispatch<import("react").SetStateAction<boolean>>;
+    cryptoPaymentMethod: CryptoPaymentMethodType;
+    setCryptoPaymentMethod: (method: CryptoPaymentMethodType) => void;
     selectedCryptoPaymentMethod: CryptoPaymentMethodType;
-    setSelectedCryptoPaymentMethod: import("react").Dispatch<import("react").SetStateAction<CryptoPaymentMethodType>>;
+    setSelectedCryptoPaymentMethod: (method: CryptoPaymentMethodType) => void;
+    effectiveCryptoPaymentMethod: CryptoPaymentMethodType;
+    resetPaymentMethods: () => void;
     selectedFiatPaymentMethod: FiatPaymentMethod;
     setSelectedFiatPaymentMethod: import("react").Dispatch<import("react").SetStateAction<FiatPaymentMethod>>;
     selectedRecipientAddress: string | undefined;

package/dist/types/anyspend/react/hooks/useAutoSelectCryptoPaymentMethod.d.ts

@@ -2,10 +2,12 @@ import { CryptoPaymentMethodType } from "../components/common/CryptoPaymentMetho
 interface UseAutoSelectCryptoPaymentMethodParams {
     /** Current payment type (crypto or fiat) */
     paymentType?: "crypto" | "fiat";
-    /** Currently selected payment method */
+    /** Auto-selected payment method based on balance (not used in hook logic, but part of state management) */
+    cryptoPaymentMethod: CryptoPaymentMethodType;
+    /** Function to update the auto-selected payment method */
+    setCryptoPaymentMethod: (method: CryptoPaymentMethodType) => void;
+    /** User explicitly selected payment method (NONE means no explicit selection) */
     selectedCryptoPaymentMethod: CryptoPaymentMethodType;
-    /** Function to update the selected payment method */
-    setSelectedCryptoPaymentMethod: (method: CryptoPaymentMethodType) => void;
     /** Whether user has enough balance to pay */
     hasEnoughBalance: boolean;
     /** Whether balance is still loading */
@@ -16,11 +18,11 @@ interface UseAutoSelectCryptoPaymentMethodParams {
  * based on available wallets and balance.
  *
  * Auto-selection logic:
- * - Only auto-selects when payment method is NONE (doesn't override user choices)
+ * - Only auto-selects when selectedCryptoPaymentMethod is NONE (user hasn't explicitly chosen)
  * - If EOA/Wagmi wallet connected + has balance → CONNECT_WALLET
  * - If EOA/Wagmi wallet connected + insufficient balance → TRANSFER_CRYPTO
  * - If only Global wallet available → GLOBAL_WALLET
  * - If no wallets → remains NONE
  */
-export declare function useAutoSelectCryptoPaymentMethod({ paymentType, selectedCryptoPaymentMethod, setSelectedCryptoPaymentMethod, hasEnoughBalance, isBalanceLoading, }: UseAutoSelectCryptoPaymentMethodParams): void;
+export declare function useAutoSelectCryptoPaymentMethod({ paymentType, cryptoPaymentMethod: _cryptoPaymentMethod, setCryptoPaymentMethod, selectedCryptoPaymentMethod, hasEnoughBalance, isBalanceLoading, }: UseAutoSelectCryptoPaymentMethodParams): void;
 export {};

package/dist/types/anyspend/react/hooks/useCryptoPaymentMethodState.d.ts

@@ -0,0 +1,42 @@
+import { CryptoPaymentMethodType } from "../components/common/CryptoPaymentMethod";
+interface UseCryptoPaymentMethodStateResult {
+    /** Auto-selected payment method based on balance */
+    cryptoPaymentMethod: CryptoPaymentMethodType;
+    /** Function to update the auto-selected payment method */
+    setCryptoPaymentMethod: (method: CryptoPaymentMethodType) => void;
+    /** User explicitly selected payment method (NONE means no explicit selection) */
+    selectedCryptoPaymentMethod: CryptoPaymentMethodType;
+    /** Function to update the user-selected payment method */
+    setSelectedCryptoPaymentMethod: (method: CryptoPaymentMethodType) => void;
+    /** Effective payment method (user selection takes priority over auto-selection) */
+    effectiveCryptoPaymentMethod: CryptoPaymentMethodType;
+    /** Reset both payment method states to NONE */
+    resetPaymentMethods: () => void;
+}
+/**
+ * Custom hook to manage crypto payment method state with dual-state system:
+ *
+ * - `cryptoPaymentMethod`: Auto-selected based on wallet availability and balance
+ * - `selectedCryptoPaymentMethod`: Explicitly selected by user
+ * - `effectiveCryptoPaymentMethod`: User selection takes priority over auto-selection
+ *
+ * This allows automatic payment method suggestions while respecting explicit user choices.
+ *
+ * @example
+ * ```tsx
+ * const {
+ *   cryptoPaymentMethod,
+ *   setCryptoPaymentMethod,
+ *   selectedCryptoPaymentMethod,
+ *   setSelectedCryptoPaymentMethod,
+ *   effectiveCryptoPaymentMethod,
+ *   resetPaymentMethods
+ * } = useCryptoPaymentMethodState();
+ *
+ * // Use effectiveCryptoPaymentMethod for display
+ * // Use setSelectedCryptoPaymentMethod when user explicitly selects
+ * // Call resetPaymentMethods when switching tabs or going back
+ * ```
+ */
+export declare function useCryptoPaymentMethodState(): UseCryptoPaymentMethodStateResult;
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@b3dotfun/sdk",
-  "version": "0.0.65-alpha.0",
+  "version": "0.0.65-alpha.2",
   "source": "src/index.ts",
   "main": "./dist/cjs/index.js",
   "react-native": "./dist/cjs/index.native.js",