@b3dotfun/sdk 0.1.70-alpha.16 → 0.1.70-alpha.18

package/dist/cjs/anyspend/react/components/AnySpendDeposit.js

@@ -5,6 +5,7 @@ const jsx_runtime_1 = require("react/jsx-runtime");
 const anyspend_1 = require("../../../anyspend");
 const react_1 = require("../../../global-account/react");
 const cn_1 = require("../../../shared/utils/cn");
+const number_1 = require("../../../shared/utils/number");
 const react_2 = require("@web3icons/react");
 const lucide_react_1 = require("lucide-react");
 const react_3 = require("react");
@@ -228,7 +229,9 @@ function AnySpendDeposit({ loadOrder, mode = "modal", recipientAddress, paymentT
                                         "anyspend-deposit-option-button anyspend-deposit-crypto-button border-border-primary hover:border-as-brand hover:bg-as-surface-secondary flex w-full items-center justify-between rounded-xl border p-4 text-left shadow-sm transition-all", children: [(0, jsx_runtime_1.jsx)("div", { className: depositClasses?.optionContent || "anyspend-deposit-option-content", children: (0, jsx_runtime_1.jsxs)("div", { className: depositClasses?.optionInfo || "anyspend-deposit-option-info", children: [(0, jsx_runtime_1.jsx)("span", { className: depositClasses?.optionTitle || "anyspend-deposit-option-title text-as-primary font-medium", children: "Deposit Crypto" }), (0, jsx_runtime_1.jsx)("p", { className: depositClasses?.optionDescription ||
                                                             "anyspend-deposit-option-description text-as-secondary text-xs", children: "Swap from any token on any chain" })] }) }), (0, jsx_runtime_1.jsx)(lucide_react_1.ChevronRight, { className: depositClasses?.optionChevron || "anyspend-deposit-option-chevron text-as-secondary h-5 w-5" })] }), (0, jsx_runtime_1.jsxs)("div", { className: depositClasses?.divider || "anyspend-deposit-divider flex items-center gap-3", children: [(0, jsx_runtime_1.jsx)("div", { className: depositClasses?.dividerLine || "bg-as-stroke h-px flex-1" }), (0, jsx_runtime_1.jsx)("span", { className: depositClasses?.dividerText || "anyspend-deposit-divider-text text-as-secondary text-sm", children: "More options" }), (0, jsx_runtime_1.jsx)("div", { className: depositClasses?.dividerLine || "bg-as-stroke h-px flex-1" })] }), (0, jsx_runtime_1.jsxs)("button", { onClick: handleSelectQrDeposit, className: depositClasses?.qrButton ||
                                         "anyspend-deposit-option-button anyspend-deposit-qr-button border-border-primary hover:border-as-brand hover:bg-as-surface-secondary flex w-full items-center justify-between rounded-xl border p-4 text-left shadow-sm transition-all", children: [(0, jsx_runtime_1.jsxs)("div", { className: depositClasses?.optionContent || "anyspend-deposit-option-content flex items-center gap-3", children: [(0, jsx_runtime_1.jsx)(QrCodeIcon_1.QrCodeIcon, { className: depositClasses?.optionIcon || "anyspend-deposit-option-icon h-10 w-10" }), (0, jsx_runtime_1.jsxs)("div", { className: depositClasses?.optionInfo || "anyspend-deposit-option-info", children: [(0, jsx_runtime_1.jsx)("span", { className: depositClasses?.optionTitle || "anyspend-deposit-option-title text-as-primary font-medium", children: "Deposit with QR Code" }), (0, jsx_runtime_1.jsx)("p", { className: depositClasses?.optionDescription ||
-                                                                "anyspend-deposit-option-description text-as-secondary text-xs", children: "Send tokens directly to deposit address" })] })] }), (0, jsx_runtime_1.jsx)(lucide_react_1.ChevronRight, { className: depositClasses?.optionChevron || "anyspend-deposit-option-chevron text-as-secondary h-5 w-5" })] }), showFiatOption && ((0, jsx_runtime_1.jsxs)("button", { onClick: handleSelectFiat, className: depositClasses?.fiatButton ||
+                                                                "anyspend-deposit-option-description text-as-secondary text-xs", children: pureTransferOnly
+                                                                ? "Send tokens directly to deposit address"
+                                                                : "Send any token — we'll convert it for you" })] })] }), (0, jsx_runtime_1.jsx)(lucide_react_1.ChevronRight, { className: depositClasses?.optionChevron || "anyspend-deposit-option-chevron text-as-secondary h-5 w-5" })] }), showFiatOption && ((0, jsx_runtime_1.jsxs)("button", { onClick: handleSelectFiat, className: depositClasses?.fiatButton ||
                                         "anyspend-deposit-option-button anyspend-deposit-fiat-button border-border-primary hover:border-as-brand hover:bg-as-surface-secondary flex w-full items-center justify-between rounded-xl border p-4 text-left transition-all", children: [(0, jsx_runtime_1.jsxs)("div", { className: depositClasses?.optionContent || "anyspend-deposit-option-content flex items-center gap-3", children: [(0, jsx_runtime_1.jsx)(CreditCardIcon_1.CreditCardIcon, { className: depositClasses?.optionIcon || "anyspend-deposit-option-icon h-10 w-10" }), (0, jsx_runtime_1.jsxs)("div", { className: depositClasses?.optionInfo || "anyspend-deposit-option-info", children: [(0, jsx_runtime_1.jsx)("span", { className: depositClasses?.optionTitle || "anyspend-deposit-option-title text-as-primary font-medium", children: "Fund with Fiat" }), (0, jsx_runtime_1.jsx)("p", { className: depositClasses?.optionDescription ||
                                                                 "anyspend-deposit-option-description text-as-secondary text-xs", children: "Pay with card or bank transfer" })] })] }), (0, jsx_runtime_1.jsx)(lucide_react_1.ChevronRight, { className: depositClasses?.optionChevron || "anyspend-deposit-option-chevron text-as-secondary h-5 w-5" })] }))] }), (0, jsx_runtime_1.jsx)(WarningText_1.ChainWarningText, { chainId: destinationTokenChainId, classes: classes?.chainWarningText || { root: "mt-2" } })] })] }));
     }
@@ -245,10 +248,21 @@ function AnySpendDeposit({ loadOrder, mode = "modal", recipientAddress, paymentT
         // `KNOWN_FUNDING_TOKENS` key — so `hasKnownDestination` is always true and this
         // branch never fires for them. The guard is defensive for FUTURE callers that pass
         // an unknown token together with `pureTransferOnly=true`.
+        // Only surface the fixed destination amount on the QR path when its decimals are trustworthy
+        // (a known funding token or a resolved API lookup) — otherwise `destinationToken.decimals`
+        // is the generic 18 fallback and formatting a 6-decimal token's wei against it would be off by
+        // 10^12. When unresolved we still show the destination token/chain, just without an amount.
+        const destinationDecimalsResolved = hasKnownDestination || !!destinationTokenData;
+        const destinationAmountDisplay = destinationTokenAmount &&
+            /^\d+$/.test(destinationTokenAmount) &&
+            BigInt(destinationTokenAmount) > 0n &&
+            destinationDecimalsResolved
+            ? (0, number_1.formatTokenAmount)(BigInt(destinationTokenAmount), destinationToken.decimals, 6, false)
+            : undefined;
         if (pureTransferOnly && !hasKnownDestination && !destinationTokenData && isDestinationTokenLoading) {
             return ((0, jsx_runtime_1.jsx)("div", { className: (0, cn_1.cn)("anyspend-deposit anyspend-deposit-qr-loading font-inter bg-as-surface-primary mx-auto w-full max-w-[460px] p-6", mode === "page" && "border-as-border-secondary overflow-hidden rounded-2xl border shadow-xl"), children: (0, jsx_runtime_1.jsxs)("div", { className: "anyspend-deposit-qr-loading-content flex flex-col items-center justify-center gap-4 py-12", children: [(0, jsx_runtime_1.jsx)(react_1.Skeleton, { className: "h-8 w-8 rounded-full" }), (0, jsx_runtime_1.jsx)(react_1.Skeleton, { className: "h-4 w-40" })] }) }));
         }
-        return ((0, jsx_runtime_1.jsx)(QRDeposit_1.QRDeposit, { mode: mode, recipientAddress: recipientAddress, destinationToken: destinationToken, destinationChainId: destinationTokenChainId, pureTransferOnly: pureTransferOnly, depositContractConfig: depositContractConfig, onBack: handleBack, onClose: onClose ?? handleBack, onSuccess: handleQRDepositSuccess, classes: classes?.qrDeposit }));
+        return ((0, jsx_runtime_1.jsx)(QRDeposit_1.QRDeposit, { mode: mode, recipientAddress: recipientAddress, destinationToken: destinationToken, destinationChainId: destinationTokenChainId, destinationAmountDisplay: destinationAmountDisplay, pureTransferOnly: pureTransferOnly, depositContractConfig: depositContractConfig, onBack: handleBack, onClose: onClose ?? handleBack, onSuccess: handleQRDepositSuccess, classes: classes?.qrDeposit }));
     }
     // Deposit view
     return ((0, jsx_runtime_1.jsxs)("div", { className: depositClasses?.form || "anyspend-deposit anyspend-deposit-form relative", children: [shouldShowChainSelection && ((0, jsx_runtime_1.jsxs)("button", { onClick: handleBack, className: depositClasses?.backButton ||

package/dist/cjs/anyspend/react/components/QRDeposit.d.ts

@@ -14,6 +14,14 @@ export interface QRDepositProps {
     destinationToken: components["schemas"]["Token"];
     /** The destination chain ID */
     destinationChainId: number;
+    /**
+     * Human-formatted destination amount (e.g. "9.365547"), shown as an APPROXIMATE
+     * target in swap mode only. The QR deposit path accepts an arbitrary sent amount,
+     * so this is never a guaranteed receive figure — the UI frames it as "any amount
+     * works". Omitted when no fixed amount is set or the destination decimals are
+     * unresolved (to avoid a mis-scaled number). Ignored in pure-transfer mode.
+     */
+    destinationAmountDisplay?: string;
     /**
      * When true, the deposit is a PURE TRANSFER: the destination token/chain mirror
      * the user's currently selected source token/chain, so the exact token the user
@@ -54,4 +62,4 @@ export interface QRDepositProps {
  *   onSuccess={(txHash) => console.log("Deposit complete:", txHash)}
  * />
  */
-export declare function QRDeposit({ mode, recipientAddress, sourceToken: sourceTokenProp, sourceChainId: sourceChainIdProp, destinationToken, destinationChainId, pureTransferOnly, creatorAddress, depositContractConfig, onBack, onClose, onOrderCreated, onSuccess, classes, }: QRDepositProps): import("react/jsx-runtime").JSX.Element;
+export declare function QRDeposit({ mode, recipientAddress, sourceToken: sourceTokenProp, sourceChainId: sourceChainIdProp, destinationToken, destinationChainId, destinationAmountDisplay, pureTransferOnly, creatorAddress, depositContractConfig, onBack, onClose, onOrderCreated, onSuccess, classes, }: QRDepositProps): import("react/jsx-runtime").JSX.Element;

package/dist/cjs/anyspend/react/components/QRDeposit.js

@@ -42,7 +42,7 @@ const DEFAULT_ETH_ON_BASE = {
  *   onSuccess={(txHash) => console.log("Deposit complete:", txHash)}
  * />
  */
-function QRDeposit({ mode = "modal", recipientAddress, sourceToken: sourceTokenProp, sourceChainId: sourceChainIdProp, destinationToken, destinationChainId, pureTransferOnly = false, creatorAddress, depositContractConfig, onBack, onClose, onOrderCreated, onSuccess, classes, }) {
+function QRDeposit({ mode = "modal", recipientAddress, sourceToken: sourceTokenProp, sourceChainId: sourceChainIdProp, destinationToken, destinationChainId, destinationAmountDisplay, pureTransferOnly = false, creatorAddress, depositContractConfig, onBack, onClose, onOrderCreated, onSuccess, classes, }) {
     const [copied, setCopied] = (0, react_2.useState)(false);
     const [orderId, setOrderId] = (0, react_2.useState)();
     const [globalAddress, setGlobalAddress] = (0, react_2.useState)();
@@ -174,8 +174,8 @@ function QRDeposit({ mode = "modal", recipientAddress, sourceToken: sourceTokenP
     }
     return ((0, jsx_runtime_1.jsx)("div", { className: classes?.container ||
             (0, cn_1.cn)("anyspend-container anyspend-qr-deposit font-inter bg-as-surface-primary mx-auto w-full max-w-[460px] p-6", mode === "page" && "border-as-border-secondary overflow-hidden rounded-2xl border shadow-xl"), children: (0, jsx_runtime_1.jsxs)("div", { className: classes?.content || "anyspend-qr-deposit-content flex flex-col gap-4", children: [(0, jsx_runtime_1.jsxs)("div", { className: classes?.header || "anyspend-qr-header flex items-center justify-between", children: [(0, jsx_runtime_1.jsx)("button", { onClick: handleBack, className: classes?.backButton || "anyspend-qr-back-button text-as-secondary hover:text-as-primary", children: (0, jsx_runtime_1.jsx)("svg", { className: "h-5 w-5", fill: "none", viewBox: "0 0 24 24", stroke: "currentColor", children: (0, jsx_runtime_1.jsx)("path", { strokeLinecap: "round", strokeLinejoin: "round", strokeWidth: 2, d: "M15 19l-7-7 7-7" }) }) }), (0, jsx_runtime_1.jsx)("h2", { className: classes?.title || "anyspend-qr-title text-as-primary text-base font-semibold", children: "Deposit" }), onClose ? ((0, jsx_runtime_1.jsx)("button", { onClick: handleClose, className: classes?.closeButton || "anyspend-qr-close-button text-as-secondary hover:text-as-primary", children: (0, jsx_runtime_1.jsx)("svg", { className: "h-5 w-5", fill: "none", viewBox: "0 0 24 24", stroke: "currentColor", children: (0, jsx_runtime_1.jsx)("path", { strokeLinecap: "round", strokeLinejoin: "round", strokeWidth: 2, d: "M6 18L18 6M6 6l12 12" }) }) })) : ((0, jsx_runtime_1.jsx)("div", { className: "w-5" }))] }), (0, jsx_runtime_1.jsxs)("div", { className: classes?.tokenSelectorContainer || "anyspend-qr-token-selector flex flex-col gap-1.5", children: [(0, jsx_runtime_1.jsx)("label", { className: classes?.tokenSelectorLabel || "anyspend-qr-token-label text-as-secondary text-sm", children: "Send" }), (0, jsx_runtime_1.jsx)(relay_kit_ui_1.TokenSelector, { chainIdsFilter: (0, anyspend_1.getAvailableChainIds)("from"), context: "from", fromChainWalletVMSupported: true, isValidAddress: true, lockedChainIds: (0, anyspend_1.getAvailableChainIds)("from"), multiWalletSupportEnabled: true, onAnalyticEvent: undefined, setToken: handleTokenSelect, supportedWalletVMs: ["evm"], token: undefined, trigger: (0, jsx_runtime_1.jsxs)(react_1.Button, { variant: "outline", role: "combobox", className: classes?.tokenSelectorTrigger ||
-                                    "anyspend-qr-token-trigger border-as-stroke bg-as-surface-secondary flex h-auto w-full items-center justify-between gap-2 rounded-xl border px-3 py-2.5", children: [(0, jsx_runtime_1.jsxs)("div", { className: "flex items-center gap-2", children: [sourceToken.metadata?.logoURI ? ((0, jsx_runtime_1.jsx)(ChainTokenIcon_1.ChainTokenIcon, { chainUrl: anyspend_1.ALL_CHAINS[sourceChainId]?.logoUrl, tokenUrl: sourceToken.metadata.logoURI, className: "h-8 min-h-8 w-8 min-w-8" })) : ((0, jsx_runtime_1.jsx)("div", { className: "h-8 w-8 rounded-full bg-gray-700" })), (0, jsx_runtime_1.jsxs)("div", { className: "flex flex-col items-start gap-0", children: [(0, jsx_runtime_1.jsx)("div", { className: "text-as-primary font-semibold", children: sourceToken.symbol }), (0, jsx_runtime_1.jsx)("div", { className: "text-as-primary/70 text-xs", children: anyspend_1.ALL_CHAINS[sourceChainId]?.name ?? "Unknown" })] })] }), (0, jsx_runtime_1.jsx)(lucide_react_1.ChevronsUpDown, { className: "h-4 w-4 shrink-0 opacity-70" })] }) })] }), (0, jsx_runtime_1.jsxs)("div", { className: classes?.qrContent || "anyspend-qr-content border-as-stroke flex items-start gap-4 rounded-xl border p-4", children: [(0, jsx_runtime_1.jsxs)("div", { className: classes?.qrCodeContainer || "anyspend-qr-code-container flex flex-col items-center gap-2", children: [(0, jsx_runtime_1.jsx)("div", { className: classes?.qrCode || "anyspend-qr-code rounded-lg bg-white p-2", children: (0, jsx_runtime_1.jsx)(qrcode_react_1.QRCodeSVG, { value: qrValue, size: 120, level: "M", marginSize: 0 }) }), (0, jsx_runtime_1.jsxs)("span", { className: classes?.qrScanHint || "anyspend-qr-scan-hint text-as-secondary text-xs", children: ["SCAN WITH ", (0, jsx_runtime_1.jsx)("span", { className: "inline-block", children: "\uD83E\uDD8A" })] })] }), (0, jsx_runtime_1.jsxs)("div", { className: classes?.addressContainer || "anyspend-qr-address-container flex flex-1 flex-col gap-1", children: [(0, jsx_runtime_1.jsx)("span", { className: classes?.addressLabel || "anyspend-qr-address-label text-as-secondary text-sm", children: "Deposit address:" }), (0, jsx_runtime_1.jsxs)("div", { className: classes?.addressRow || "anyspend-qr-address-row flex items-start gap-1", children: [(0, jsx_runtime_1.jsx)("span", { className: classes?.address || "anyspend-qr-address text-as-primary break-all font-mono text-sm leading-relaxed", children: displayAddress }), (0, jsx_runtime_1.jsx)("button", { onClick: handleCopyAddress, className: classes?.addressCopyIcon ||
-                                                "anyspend-qr-copy-icon text-as-secondary hover:text-as-primary mt-0.5 shrink-0", children: copied ? (0, jsx_runtime_1.jsx)(lucide_react_1.Check, { className: "h-4 w-4" }) : (0, jsx_runtime_1.jsx)(lucide_react_1.Copy, { className: "h-4 w-4" }) })] })] })] }), (0, jsx_runtime_1.jsx)(WarningText_1.ChainWarningText, { chainId: effectiveDestinationChainId }), (0, jsx_runtime_1.jsxs)(WarningText_1.WarningText, { children: ["Only send ", sourceToken.symbol, " on ", anyspend_1.ALL_CHAINS[sourceChainId]?.name ?? "the specified chain", ". Other tokens will not be converted."] }), isPureTransfer && isWatchingTransfer && ((0, jsx_runtime_1.jsxs)("div", { className: classes?.watchingIndicator ||
+                                    "anyspend-qr-token-trigger border-as-stroke bg-as-surface-secondary flex h-auto w-full items-center justify-between gap-2 rounded-xl border px-3 py-2.5", children: [(0, jsx_runtime_1.jsxs)("div", { className: "flex items-center gap-2", children: [sourceToken.metadata?.logoURI ? ((0, jsx_runtime_1.jsx)(ChainTokenIcon_1.ChainTokenIcon, { chainUrl: anyspend_1.ALL_CHAINS[sourceChainId]?.logoUrl, tokenUrl: sourceToken.metadata.logoURI, className: "h-8 min-h-8 w-8 min-w-8" })) : ((0, jsx_runtime_1.jsx)("div", { className: "h-8 w-8 rounded-full bg-gray-700" })), (0, jsx_runtime_1.jsxs)("div", { className: "flex flex-col items-start gap-0", children: [(0, jsx_runtime_1.jsx)("div", { className: "text-as-primary font-semibold", children: sourceToken.symbol }), (0, jsx_runtime_1.jsx)("div", { className: "text-as-primary/70 text-xs", children: anyspend_1.ALL_CHAINS[sourceChainId]?.name ?? "Unknown" })] })] }), (0, jsx_runtime_1.jsx)(lucide_react_1.ChevronsUpDown, { className: "h-4 w-4 shrink-0 opacity-70" })] }) })] }), !isPureTransfer && ((0, jsx_runtime_1.jsxs)("div", { className: "anyspend-qr-receive flex flex-col gap-1.5", children: [(0, jsx_runtime_1.jsx)("label", { className: "anyspend-qr-receive-label text-as-secondary text-sm", children: "Receive" }), (0, jsx_runtime_1.jsxs)("div", { className: "anyspend-qr-receive-row border-as-stroke bg-as-surface-secondary flex w-full items-center gap-2 rounded-xl border px-3 py-2.5", children: [effectiveDestinationToken.metadata?.logoURI ? ((0, jsx_runtime_1.jsx)(ChainTokenIcon_1.ChainTokenIcon, { chainUrl: anyspend_1.ALL_CHAINS[effectiveDestinationChainId]?.logoUrl, tokenUrl: effectiveDestinationToken.metadata.logoURI, className: "h-8 min-h-8 w-8 min-w-8" })) : ((0, jsx_runtime_1.jsx)("div", { className: "h-8 w-8 rounded-full bg-gray-700" })), (0, jsx_runtime_1.jsxs)("div", { className: "flex flex-col items-start gap-0", children: [(0, jsx_runtime_1.jsx)("div", { className: "text-as-primary font-semibold", children: effectiveDestinationToken.symbol || "Token" }), (0, jsx_runtime_1.jsx)("div", { className: "text-as-primary/70 text-xs", children: anyspend_1.ALL_CHAINS[effectiveDestinationChainId]?.name ?? "Unknown" })] })] })] })), (0, jsx_runtime_1.jsxs)("div", { className: classes?.qrContent || "anyspend-qr-content border-as-stroke flex items-start gap-4 rounded-xl border p-4", children: [(0, jsx_runtime_1.jsxs)("div", { className: classes?.qrCodeContainer || "anyspend-qr-code-container flex flex-col items-center gap-2", children: [(0, jsx_runtime_1.jsx)("div", { className: classes?.qrCode || "anyspend-qr-code rounded-lg bg-white p-2", children: (0, jsx_runtime_1.jsx)(qrcode_react_1.QRCodeSVG, { value: qrValue, size: 120, level: "M", marginSize: 0 }) }), (0, jsx_runtime_1.jsxs)("span", { className: classes?.qrScanHint || "anyspend-qr-scan-hint text-as-secondary text-xs", children: ["SCAN WITH ", (0, jsx_runtime_1.jsx)("span", { className: "inline-block", children: "\uD83E\uDD8A" })] })] }), (0, jsx_runtime_1.jsxs)("div", { className: classes?.addressContainer || "anyspend-qr-address-container flex flex-1 flex-col gap-1", children: [(0, jsx_runtime_1.jsx)("span", { className: classes?.addressLabel || "anyspend-qr-address-label text-as-secondary text-sm", children: "Deposit address:" }), (0, jsx_runtime_1.jsxs)("div", { className: classes?.addressRow || "anyspend-qr-address-row flex items-start gap-1", children: [(0, jsx_runtime_1.jsx)("span", { className: classes?.address || "anyspend-qr-address text-as-primary break-all font-mono text-sm leading-relaxed", children: displayAddress }), (0, jsx_runtime_1.jsx)("button", { onClick: handleCopyAddress, className: classes?.addressCopyIcon ||
+                                                "anyspend-qr-copy-icon text-as-secondary hover:text-as-primary mt-0.5 shrink-0", children: copied ? (0, jsx_runtime_1.jsx)(lucide_react_1.Check, { className: "h-4 w-4" }) : (0, jsx_runtime_1.jsx)(lucide_react_1.Copy, { className: "h-4 w-4" }) })] })] })] }), (0, jsx_runtime_1.jsx)(WarningText_1.ChainWarningText, { chainId: effectiveDestinationChainId }), isPureTransfer ? ((0, jsx_runtime_1.jsxs)(WarningText_1.WarningText, { children: ["Only send ", sourceToken.symbol, " on ", anyspend_1.ALL_CHAINS[sourceChainId]?.name ?? "the specified chain", ". Other tokens will not be converted."] })) : ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsxs)(WarningText_1.WarningText, { children: ["Only send ", sourceToken.symbol, " on ", anyspend_1.ALL_CHAINS[sourceChainId]?.name ?? "the specified chain", " to this address \u2014 it will be converted to ", effectiveDestinationToken.symbol || "the destination token", " on", " ", anyspend_1.ALL_CHAINS[effectiveDestinationChainId]?.name ?? "the destination chain", "."] }), destinationAmountDisplay && ((0, jsx_runtime_1.jsxs)("p", { className: "anyspend-qr-amount-hint text-as-secondary text-xs", children: ["Target \u2248 ", destinationAmountDisplay, " ", effectiveDestinationToken.symbol || "tokens", ". Any amount of", " ", sourceToken.symbol || "tokens", " works \u2014 you'll receive whatever your deposit converts to."] }))] })), isPureTransfer && isWatchingTransfer && ((0, jsx_runtime_1.jsxs)("div", { className: classes?.watchingIndicator ||
                         "anyspend-qr-watching flex items-center justify-center gap-2 rounded-lg bg-blue-500/10 p-3", children: [(0, jsx_runtime_1.jsx)(lucide_react_1.Loader2, { className: "h-4 w-4 animate-spin text-blue-500" }), (0, jsx_runtime_1.jsx)("span", { className: "text-sm text-blue-500", children: "Watching for incoming transfer..." })] })), (0, jsx_runtime_1.jsx)("button", { onClick: handleCopyAddress, className: classes?.copyButton ||
                         "anyspend-qr-copy-button flex w-full items-center justify-center gap-2 rounded-xl bg-blue-500 py-3.5 font-medium text-white transition-all hover:bg-blue-600", children: "Copy deposit address" })] }) }));
 }

package/dist/cjs/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>;
+    switchChainAndExecuteWithGlobalAccount: (targetChainId: number, params: UnifiedTransactionParams, expectedGlobalAccountAddress?: string) => Promise<string | undefined>;
     switchChainAndExecuteWithEOA: (targetChainId: number, params: UnifiedTransactionParams) => Promise<string | undefined>;
     isSwitchingOrExecuting: boolean;
     isActiveSmartWallet: boolean | undefined;

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

@@ -15,13 +15,11 @@ const thirdweb_2 = require("thirdweb");
 const viem_1 = require("viem");
 const wagmi_1 = require("wagmi");
 const B3ConfigProvider_1 = require("../components/B3Provider/B3ConfigProvider");
-const useB3Account_1 = require("../components/B3Provider/useB3Account");
 const useAccountWallet_1 = require("./useAccountWallet");
 function useUnifiedChainSwitchAndExecute() {
     const { switchChainAsync } = (0, wagmi_1.useSwitchChain)();
     const [isSwitchingOrExecuting, setIsSwitchingOrExecuting] = (0, react_2.useState)(false);
-    const { isActiveSmartWallet, isActiveEOAWallet, connectedEOAWallet } = (0, useAccountWallet_1.useAccountWallet)();
-    const aaAccount = (0, useB3Account_1.useB3Account)();
+    const { isActiveSmartWallet, isActiveEOAWallet, connectedSmartWallet, connectedEOAWallet } = (0, useAccountWallet_1.useAccountWallet)();
     // From context, not process.env: partnerId is hashed into the server intent key and must match the ecosystem wallet.
     const { partnerId } = (0, B3ConfigProvider_1.useB3Config)();
     // Handle EOA wallet chain switch and execute transaction
@@ -100,10 +98,18 @@ function useUnifiedChainSwitchAndExecute() {
             setIsSwitchingOrExecuting(false);
         }
     }, [connectedEOAWallet, switchChainAsync]);
-    // Handle AA wallet transaction (no chain switch needed for AA)
-    const handleAASendTransaction = (0, react_2.useCallback)(async (targetChainId, params) => {
-        if (!aaAccount) {
-            react_1.toast.error("Smart wallet not connected");
+    // Handle Global Account transaction (no chain switch needed for AA).
+    // Resolve the signer from the connected ecosystem wallet rather than the active
+    // wallet so callers can explicitly require the Global Account.
+    const handleGlobalAccountSendTransaction = (0, react_2.useCallback)(async (targetChainId, params, expectedGlobalAccountAddress) => {
+        const globalAccount = connectedSmartWallet?.getAccount();
+        if (!globalAccount) {
+            react_1.toast.error("Global Account not connected");
+            return;
+        }
+        if (expectedGlobalAccountAddress &&
+            globalAccount.address.toLowerCase() !== expectedGlobalAccountAddress.toLowerCase()) {
+            react_1.toast.error("Connected Global Account does not match the authenticated account");
             return;
         }
         try {
@@ -137,7 +143,7 @@ function useUnifiedChainSwitchAndExecute() {
             react_1.toast.info("Sending transaction…");
             const start = performance.now();
             const sendTxResponse = await (0, thirdweb_2.sendTransaction)({
-                account: aaAccount,
+                account: globalAccount,
                 transaction,
             });
             const end = performance.now();
@@ -153,17 +159,18 @@ function useUnifiedChainSwitchAndExecute() {
         finally {
             setIsSwitchingOrExecuting(false);
         }
-    }, [aaAccount, partnerId]);
+    }, [connectedSmartWallet, partnerId]);
     // Unified switch chain and execute function
     const switchChainAndExecute = (0, react_2.useCallback)(async (targetChainId, params) => {
         // Check which wallet type is active
         if (isActiveSmartWallet) {
-            return handleAASendTransaction(targetChainId, params);
+            return handleGlobalAccountSendTransaction(targetChainId, params);
         }
         return handleEOASwitchChainAndSendTransaction(targetChainId, params);
-    }, [isActiveSmartWallet, handleAASendTransaction, handleEOASwitchChainAndSendTransaction]);
+    }, [isActiveSmartWallet, handleGlobalAccountSendTransaction, handleEOASwitchChainAndSendTransaction]);
     return {
         switchChainAndExecute,
+        switchChainAndExecuteWithGlobalAccount: handleGlobalAccountSendTransaction,
         switchChainAndExecuteWithEOA: handleEOASwitchChainAndSendTransaction,
         isSwitchingOrExecuting,
         isActiveSmartWallet,

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

@@ -2,6 +2,7 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { USDC_BASE } from "../../../anyspend/index.js";
 import { Skeleton, useAccountWallet, useSimBalance, useTokenData } from "../../../global-account/react/index.js";
 import { cn } from "../../../shared/utils/cn.js";
+import { formatTokenAmount } from "../../../shared/utils/number.js";
 import { NetworkArbitrumOne, NetworkBase, NetworkBinanceSmartChain, NetworkEthereum, NetworkOptimism, NetworkPolygonPos, } from "@web3icons/react";
 import { ChevronRight } from "lucide-react";
 import { useCallback, useEffect, useMemo, useState } from "react";
@@ -225,7 +226,9 @@ export function AnySpendDeposit({ loadOrder, mode = "modal", recipientAddress, p
                                         "anyspend-deposit-option-button anyspend-deposit-crypto-button border-border-primary hover:border-as-brand hover:bg-as-surface-secondary flex w-full items-center justify-between rounded-xl border p-4 text-left shadow-sm transition-all", children: [_jsx("div", { className: depositClasses?.optionContent || "anyspend-deposit-option-content", children: _jsxs("div", { className: depositClasses?.optionInfo || "anyspend-deposit-option-info", children: [_jsx("span", { className: depositClasses?.optionTitle || "anyspend-deposit-option-title text-as-primary font-medium", children: "Deposit Crypto" }), _jsx("p", { className: depositClasses?.optionDescription ||
                                                             "anyspend-deposit-option-description text-as-secondary text-xs", children: "Swap from any token on any chain" })] }) }), _jsx(ChevronRight, { className: depositClasses?.optionChevron || "anyspend-deposit-option-chevron text-as-secondary h-5 w-5" })] }), _jsxs("div", { className: depositClasses?.divider || "anyspend-deposit-divider flex items-center gap-3", children: [_jsx("div", { className: depositClasses?.dividerLine || "bg-as-stroke h-px flex-1" }), _jsx("span", { className: depositClasses?.dividerText || "anyspend-deposit-divider-text text-as-secondary text-sm", children: "More options" }), _jsx("div", { className: depositClasses?.dividerLine || "bg-as-stroke h-px flex-1" })] }), _jsxs("button", { onClick: handleSelectQrDeposit, className: depositClasses?.qrButton ||
                                         "anyspend-deposit-option-button anyspend-deposit-qr-button border-border-primary hover:border-as-brand hover:bg-as-surface-secondary flex w-full items-center justify-between rounded-xl border p-4 text-left shadow-sm transition-all", children: [_jsxs("div", { className: depositClasses?.optionContent || "anyspend-deposit-option-content flex items-center gap-3", children: [_jsx(QrCodeIcon, { className: depositClasses?.optionIcon || "anyspend-deposit-option-icon h-10 w-10" }), _jsxs("div", { className: depositClasses?.optionInfo || "anyspend-deposit-option-info", children: [_jsx("span", { className: depositClasses?.optionTitle || "anyspend-deposit-option-title text-as-primary font-medium", children: "Deposit with QR Code" }), _jsx("p", { className: depositClasses?.optionDescription ||
-                                                                "anyspend-deposit-option-description text-as-secondary text-xs", children: "Send tokens directly to deposit address" })] })] }), _jsx(ChevronRight, { className: depositClasses?.optionChevron || "anyspend-deposit-option-chevron text-as-secondary h-5 w-5" })] }), showFiatOption && (_jsxs("button", { onClick: handleSelectFiat, className: depositClasses?.fiatButton ||
+                                                                "anyspend-deposit-option-description text-as-secondary text-xs", children: pureTransferOnly
+                                                                ? "Send tokens directly to deposit address"
+                                                                : "Send any token — we'll convert it for you" })] })] }), _jsx(ChevronRight, { className: depositClasses?.optionChevron || "anyspend-deposit-option-chevron text-as-secondary h-5 w-5" })] }), showFiatOption && (_jsxs("button", { onClick: handleSelectFiat, className: depositClasses?.fiatButton ||
                                         "anyspend-deposit-option-button anyspend-deposit-fiat-button border-border-primary hover:border-as-brand hover:bg-as-surface-secondary flex w-full items-center justify-between rounded-xl border p-4 text-left transition-all", children: [_jsxs("div", { className: depositClasses?.optionContent || "anyspend-deposit-option-content flex items-center gap-3", children: [_jsx(CreditCardIcon, { className: depositClasses?.optionIcon || "anyspend-deposit-option-icon h-10 w-10" }), _jsxs("div", { className: depositClasses?.optionInfo || "anyspend-deposit-option-info", children: [_jsx("span", { className: depositClasses?.optionTitle || "anyspend-deposit-option-title text-as-primary font-medium", children: "Fund with Fiat" }), _jsx("p", { className: depositClasses?.optionDescription ||
                                                                 "anyspend-deposit-option-description text-as-secondary text-xs", children: "Pay with card or bank transfer" })] })] }), _jsx(ChevronRight, { className: depositClasses?.optionChevron || "anyspend-deposit-option-chevron text-as-secondary h-5 w-5" })] }))] }), _jsx(ChainWarningText, { chainId: destinationTokenChainId, classes: classes?.chainWarningText || { root: "mt-2" } })] })] }));
     }
@@ -242,10 +245,21 @@ export function AnySpendDeposit({ loadOrder, mode = "modal", recipientAddress, p
         // `KNOWN_FUNDING_TOKENS` key — so `hasKnownDestination` is always true and this
         // branch never fires for them. The guard is defensive for FUTURE callers that pass
         // an unknown token together with `pureTransferOnly=true`.
+        // Only surface the fixed destination amount on the QR path when its decimals are trustworthy
+        // (a known funding token or a resolved API lookup) — otherwise `destinationToken.decimals`
+        // is the generic 18 fallback and formatting a 6-decimal token's wei against it would be off by
+        // 10^12. When unresolved we still show the destination token/chain, just without an amount.
+        const destinationDecimalsResolved = hasKnownDestination || !!destinationTokenData;
+        const destinationAmountDisplay = destinationTokenAmount &&
+            /^\d+$/.test(destinationTokenAmount) &&
+            BigInt(destinationTokenAmount) > 0n &&
+            destinationDecimalsResolved
+            ? formatTokenAmount(BigInt(destinationTokenAmount), destinationToken.decimals, 6, false)
+            : undefined;
         if (pureTransferOnly && !hasKnownDestination && !destinationTokenData && isDestinationTokenLoading) {
             return (_jsx("div", { className: cn("anyspend-deposit anyspend-deposit-qr-loading font-inter bg-as-surface-primary mx-auto w-full max-w-[460px] p-6", mode === "page" && "border-as-border-secondary overflow-hidden rounded-2xl border shadow-xl"), children: _jsxs("div", { className: "anyspend-deposit-qr-loading-content flex flex-col items-center justify-center gap-4 py-12", children: [_jsx(Skeleton, { className: "h-8 w-8 rounded-full" }), _jsx(Skeleton, { className: "h-4 w-40" })] }) }));
         }
-        return (_jsx(QRDeposit, { mode: mode, recipientAddress: recipientAddress, destinationToken: destinationToken, destinationChainId: destinationTokenChainId, pureTransferOnly: pureTransferOnly, depositContractConfig: depositContractConfig, onBack: handleBack, onClose: onClose ?? handleBack, onSuccess: handleQRDepositSuccess, classes: classes?.qrDeposit }));
+        return (_jsx(QRDeposit, { mode: mode, recipientAddress: recipientAddress, destinationToken: destinationToken, destinationChainId: destinationTokenChainId, destinationAmountDisplay: destinationAmountDisplay, pureTransferOnly: pureTransferOnly, depositContractConfig: depositContractConfig, onBack: handleBack, onClose: onClose ?? handleBack, onSuccess: handleQRDepositSuccess, classes: classes?.qrDeposit }));
     }
     // Deposit view
     return (_jsxs("div", { className: depositClasses?.form || "anyspend-deposit anyspend-deposit-form relative", children: [shouldShowChainSelection && (_jsxs("button", { onClick: handleBack, className: depositClasses?.backButton ||

package/dist/esm/anyspend/react/components/QRDeposit.d.ts

@@ -14,6 +14,14 @@ export interface QRDepositProps {
     destinationToken: components["schemas"]["Token"];
     /** The destination chain ID */
     destinationChainId: number;
+    /**
+     * Human-formatted destination amount (e.g. "9.365547"), shown as an APPROXIMATE
+     * target in swap mode only. The QR deposit path accepts an arbitrary sent amount,
+     * so this is never a guaranteed receive figure — the UI frames it as "any amount
+     * works". Omitted when no fixed amount is set or the destination decimals are
+     * unresolved (to avoid a mis-scaled number). Ignored in pure-transfer mode.
+     */
+    destinationAmountDisplay?: string;
     /**
      * When true, the deposit is a PURE TRANSFER: the destination token/chain mirror
      * the user's currently selected source token/chain, so the exact token the user
@@ -54,4 +62,4 @@ export interface QRDepositProps {
  *   onSuccess={(txHash) => console.log("Deposit complete:", txHash)}
  * />
  */
-export declare function QRDeposit({ mode, recipientAddress, sourceToken: sourceTokenProp, sourceChainId: sourceChainIdProp, destinationToken, destinationChainId, pureTransferOnly, creatorAddress, depositContractConfig, onBack, onClose, onOrderCreated, onSuccess, classes, }: QRDepositProps): import("react/jsx-runtime").JSX.Element;
+export declare function QRDeposit({ mode, recipientAddress, sourceToken: sourceTokenProp, sourceChainId: sourceChainIdProp, destinationToken, destinationChainId, destinationAmountDisplay, pureTransferOnly, creatorAddress, depositContractConfig, onBack, onClose, onOrderCreated, onSuccess, classes, }: QRDepositProps): import("react/jsx-runtime").JSX.Element;

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

@@ -1,4 +1,4 @@
-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 { ALL_CHAINS, getAvailableChainIds, getPaymentUrl, isSameChainAndToken, ZERO_ADDRESS, } from "../../../anyspend/index.js";
 import { Button, toast } from "../../../global-account/react/index.js";
 import { cn } from "../../../shared/utils/cn.js";
@@ -39,7 +39,7 @@ const DEFAULT_ETH_ON_BASE = {
  *   onSuccess={(txHash) => console.log("Deposit complete:", txHash)}
  * />
  */
-export function QRDeposit({ mode = "modal", recipientAddress, sourceToken: sourceTokenProp, sourceChainId: sourceChainIdProp, destinationToken, destinationChainId, pureTransferOnly = false, creatorAddress, depositContractConfig, onBack, onClose, onOrderCreated, onSuccess, classes, }) {
+export function QRDeposit({ mode = "modal", recipientAddress, sourceToken: sourceTokenProp, sourceChainId: sourceChainIdProp, destinationToken, destinationChainId, destinationAmountDisplay, pureTransferOnly = false, creatorAddress, depositContractConfig, onBack, onClose, onOrderCreated, onSuccess, classes, }) {
     const [copied, setCopied] = useState(false);
     const [orderId, setOrderId] = useState();
     const [globalAddress, setGlobalAddress] = useState();
@@ -171,8 +171,8 @@ export function QRDeposit({ mode = "modal", recipientAddress, sourceToken: sourc
     }
     return (_jsx("div", { className: classes?.container ||
             cn("anyspend-container anyspend-qr-deposit font-inter bg-as-surface-primary mx-auto w-full max-w-[460px] p-6", mode === "page" && "border-as-border-secondary overflow-hidden rounded-2xl border shadow-xl"), children: _jsxs("div", { className: classes?.content || "anyspend-qr-deposit-content flex flex-col gap-4", children: [_jsxs("div", { className: classes?.header || "anyspend-qr-header flex items-center justify-between", children: [_jsx("button", { onClick: handleBack, className: classes?.backButton || "anyspend-qr-back-button text-as-secondary hover:text-as-primary", children: _jsx("svg", { className: "h-5 w-5", fill: "none", viewBox: "0 0 24 24", stroke: "currentColor", children: _jsx("path", { strokeLinecap: "round", strokeLinejoin: "round", strokeWidth: 2, d: "M15 19l-7-7 7-7" }) }) }), _jsx("h2", { className: classes?.title || "anyspend-qr-title text-as-primary text-base font-semibold", children: "Deposit" }), onClose ? (_jsx("button", { onClick: handleClose, className: classes?.closeButton || "anyspend-qr-close-button text-as-secondary hover:text-as-primary", children: _jsx("svg", { className: "h-5 w-5", fill: "none", viewBox: "0 0 24 24", stroke: "currentColor", children: _jsx("path", { strokeLinecap: "round", strokeLinejoin: "round", strokeWidth: 2, d: "M6 18L18 6M6 6l12 12" }) }) })) : (_jsx("div", { className: "w-5" }))] }), _jsxs("div", { className: classes?.tokenSelectorContainer || "anyspend-qr-token-selector flex flex-col gap-1.5", children: [_jsx("label", { className: classes?.tokenSelectorLabel || "anyspend-qr-token-label text-as-secondary text-sm", children: "Send" }), _jsx(TokenSelector, { chainIdsFilter: getAvailableChainIds("from"), context: "from", fromChainWalletVMSupported: true, isValidAddress: true, lockedChainIds: getAvailableChainIds("from"), multiWalletSupportEnabled: true, onAnalyticEvent: undefined, setToken: handleTokenSelect, supportedWalletVMs: ["evm"], token: undefined, trigger: _jsxs(Button, { variant: "outline", role: "combobox", className: classes?.tokenSelectorTrigger ||
-                                    "anyspend-qr-token-trigger border-as-stroke bg-as-surface-secondary flex h-auto w-full items-center justify-between gap-2 rounded-xl border px-3 py-2.5", children: [_jsxs("div", { className: "flex items-center gap-2", children: [sourceToken.metadata?.logoURI ? (_jsx(ChainTokenIcon, { chainUrl: ALL_CHAINS[sourceChainId]?.logoUrl, tokenUrl: sourceToken.metadata.logoURI, className: "h-8 min-h-8 w-8 min-w-8" })) : (_jsx("div", { className: "h-8 w-8 rounded-full bg-gray-700" })), _jsxs("div", { className: "flex flex-col items-start gap-0", children: [_jsx("div", { className: "text-as-primary font-semibold", children: sourceToken.symbol }), _jsx("div", { className: "text-as-primary/70 text-xs", children: ALL_CHAINS[sourceChainId]?.name ?? "Unknown" })] })] }), _jsx(ChevronsUpDown, { className: "h-4 w-4 shrink-0 opacity-70" })] }) })] }), _jsxs("div", { className: classes?.qrContent || "anyspend-qr-content border-as-stroke flex items-start gap-4 rounded-xl border p-4", children: [_jsxs("div", { className: classes?.qrCodeContainer || "anyspend-qr-code-container flex flex-col items-center gap-2", children: [_jsx("div", { className: classes?.qrCode || "anyspend-qr-code rounded-lg bg-white p-2", children: _jsx(QRCodeSVG, { value: qrValue, size: 120, level: "M", marginSize: 0 }) }), _jsxs("span", { className: classes?.qrScanHint || "anyspend-qr-scan-hint text-as-secondary text-xs", children: ["SCAN WITH ", _jsx("span", { className: "inline-block", children: "\uD83E\uDD8A" })] })] }), _jsxs("div", { className: classes?.addressContainer || "anyspend-qr-address-container flex flex-1 flex-col gap-1", children: [_jsx("span", { className: classes?.addressLabel || "anyspend-qr-address-label text-as-secondary text-sm", children: "Deposit address:" }), _jsxs("div", { className: classes?.addressRow || "anyspend-qr-address-row flex items-start gap-1", children: [_jsx("span", { className: classes?.address || "anyspend-qr-address text-as-primary break-all font-mono text-sm leading-relaxed", children: displayAddress }), _jsx("button", { onClick: handleCopyAddress, className: classes?.addressCopyIcon ||
-                                                "anyspend-qr-copy-icon text-as-secondary hover:text-as-primary mt-0.5 shrink-0", children: copied ? _jsx(Check, { className: "h-4 w-4" }) : _jsx(Copy, { className: "h-4 w-4" }) })] })] })] }), _jsx(ChainWarningText, { chainId: effectiveDestinationChainId }), _jsxs(WarningText, { children: ["Only send ", sourceToken.symbol, " on ", ALL_CHAINS[sourceChainId]?.name ?? "the specified chain", ". Other tokens will not be converted."] }), isPureTransfer && isWatchingTransfer && (_jsxs("div", { className: classes?.watchingIndicator ||
+                                    "anyspend-qr-token-trigger border-as-stroke bg-as-surface-secondary flex h-auto w-full items-center justify-between gap-2 rounded-xl border px-3 py-2.5", children: [_jsxs("div", { className: "flex items-center gap-2", children: [sourceToken.metadata?.logoURI ? (_jsx(ChainTokenIcon, { chainUrl: ALL_CHAINS[sourceChainId]?.logoUrl, tokenUrl: sourceToken.metadata.logoURI, className: "h-8 min-h-8 w-8 min-w-8" })) : (_jsx("div", { className: "h-8 w-8 rounded-full bg-gray-700" })), _jsxs("div", { className: "flex flex-col items-start gap-0", children: [_jsx("div", { className: "text-as-primary font-semibold", children: sourceToken.symbol }), _jsx("div", { className: "text-as-primary/70 text-xs", children: ALL_CHAINS[sourceChainId]?.name ?? "Unknown" })] })] }), _jsx(ChevronsUpDown, { className: "h-4 w-4 shrink-0 opacity-70" })] }) })] }), !isPureTransfer && (_jsxs("div", { className: "anyspend-qr-receive flex flex-col gap-1.5", children: [_jsx("label", { className: "anyspend-qr-receive-label text-as-secondary text-sm", children: "Receive" }), _jsxs("div", { className: "anyspend-qr-receive-row border-as-stroke bg-as-surface-secondary flex w-full items-center gap-2 rounded-xl border px-3 py-2.5", children: [effectiveDestinationToken.metadata?.logoURI ? (_jsx(ChainTokenIcon, { chainUrl: ALL_CHAINS[effectiveDestinationChainId]?.logoUrl, tokenUrl: effectiveDestinationToken.metadata.logoURI, className: "h-8 min-h-8 w-8 min-w-8" })) : (_jsx("div", { className: "h-8 w-8 rounded-full bg-gray-700" })), _jsxs("div", { className: "flex flex-col items-start gap-0", children: [_jsx("div", { className: "text-as-primary font-semibold", children: effectiveDestinationToken.symbol || "Token" }), _jsx("div", { className: "text-as-primary/70 text-xs", children: ALL_CHAINS[effectiveDestinationChainId]?.name ?? "Unknown" })] })] })] })), _jsxs("div", { className: classes?.qrContent || "anyspend-qr-content border-as-stroke flex items-start gap-4 rounded-xl border p-4", children: [_jsxs("div", { className: classes?.qrCodeContainer || "anyspend-qr-code-container flex flex-col items-center gap-2", children: [_jsx("div", { className: classes?.qrCode || "anyspend-qr-code rounded-lg bg-white p-2", children: _jsx(QRCodeSVG, { value: qrValue, size: 120, level: "M", marginSize: 0 }) }), _jsxs("span", { className: classes?.qrScanHint || "anyspend-qr-scan-hint text-as-secondary text-xs", children: ["SCAN WITH ", _jsx("span", { className: "inline-block", children: "\uD83E\uDD8A" })] })] }), _jsxs("div", { className: classes?.addressContainer || "anyspend-qr-address-container flex flex-1 flex-col gap-1", children: [_jsx("span", { className: classes?.addressLabel || "anyspend-qr-address-label text-as-secondary text-sm", children: "Deposit address:" }), _jsxs("div", { className: classes?.addressRow || "anyspend-qr-address-row flex items-start gap-1", children: [_jsx("span", { className: classes?.address || "anyspend-qr-address text-as-primary break-all font-mono text-sm leading-relaxed", children: displayAddress }), _jsx("button", { onClick: handleCopyAddress, className: classes?.addressCopyIcon ||
+                                                "anyspend-qr-copy-icon text-as-secondary hover:text-as-primary mt-0.5 shrink-0", children: copied ? _jsx(Check, { className: "h-4 w-4" }) : _jsx(Copy, { className: "h-4 w-4" }) })] })] })] }), _jsx(ChainWarningText, { chainId: effectiveDestinationChainId }), isPureTransfer ? (_jsxs(WarningText, { children: ["Only send ", sourceToken.symbol, " on ", ALL_CHAINS[sourceChainId]?.name ?? "the specified chain", ". Other tokens will not be converted."] })) : (_jsxs(_Fragment, { children: [_jsxs(WarningText, { children: ["Only send ", sourceToken.symbol, " on ", ALL_CHAINS[sourceChainId]?.name ?? "the specified chain", " to this address \u2014 it will be converted to ", effectiveDestinationToken.symbol || "the destination token", " on", " ", ALL_CHAINS[effectiveDestinationChainId]?.name ?? "the destination chain", "."] }), destinationAmountDisplay && (_jsxs("p", { className: "anyspend-qr-amount-hint text-as-secondary text-xs", children: ["Target \u2248 ", destinationAmountDisplay, " ", effectiveDestinationToken.symbol || "tokens", ". Any amount of", " ", sourceToken.symbol || "tokens", " works \u2014 you'll receive whatever your deposit converts to."] }))] })), isPureTransfer && isWatchingTransfer && (_jsxs("div", { className: classes?.watchingIndicator ||
                         "anyspend-qr-watching flex items-center justify-center gap-2 rounded-lg bg-blue-500/10 p-3", children: [_jsx(Loader2, { className: "h-4 w-4 animate-spin text-blue-500" }), _jsx("span", { className: "text-sm text-blue-500", children: "Watching for incoming transfer..." })] })), _jsx("button", { onClick: handleCopyAddress, className: classes?.copyButton ||
                         "anyspend-qr-copy-button flex w-full items-center justify-center gap-2 rounded-xl bg-blue-500 py-3.5 font-medium text-white transition-all hover:bg-blue-600", children: "Copy deposit address" })] }) }));
 }

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>;
+    switchChainAndExecuteWithGlobalAccount: (targetChainId: number, params: UnifiedTransactionParams, expectedGlobalAccountAddress?: string) => Promise<string | undefined>;
     switchChainAndExecuteWithEOA: (targetChainId: number, params: UnifiedTransactionParams) => Promise<string | undefined>;
     isSwitchingOrExecuting: boolean;
     isActiveSmartWallet: boolean | undefined;

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

@@ -9,13 +9,11 @@ import { prepareTransaction, sendTransaction as twSendTransaction } from "thirdw
 import { isAddress } from "viem";
 import { useSwitchChain } from "wagmi";
 import { useB3Config } from "../components/B3Provider/B3ConfigProvider.js";
-import { useB3Account } from "../components/B3Provider/useB3Account.js";
 import { useAccountWallet } from "./useAccountWallet.js";
 export function useUnifiedChainSwitchAndExecute() {
     const { switchChainAsync } = useSwitchChain();
     const [isSwitchingOrExecuting, setIsSwitchingOrExecuting] = useState(false);
-    const { isActiveSmartWallet, isActiveEOAWallet, connectedEOAWallet } = useAccountWallet();
-    const aaAccount = useB3Account();
+    const { isActiveSmartWallet, isActiveEOAWallet, connectedSmartWallet, connectedEOAWallet } = useAccountWallet();
     // From context, not process.env: partnerId is hashed into the server intent key and must match the ecosystem wallet.
     const { partnerId } = useB3Config();
     // Handle EOA wallet chain switch and execute transaction
@@ -94,10 +92,18 @@ export function useUnifiedChainSwitchAndExecute() {
             setIsSwitchingOrExecuting(false);
         }
     }, [connectedEOAWallet, switchChainAsync]);
-    // Handle AA wallet transaction (no chain switch needed for AA)
-    const handleAASendTransaction = useCallback(async (targetChainId, params) => {
-        if (!aaAccount) {
-            toast.error("Smart wallet not connected");
+    // Handle Global Account transaction (no chain switch needed for AA).
+    // Resolve the signer from the connected ecosystem wallet rather than the active
+    // wallet so callers can explicitly require the Global Account.
+    const handleGlobalAccountSendTransaction = useCallback(async (targetChainId, params, expectedGlobalAccountAddress) => {
+        const globalAccount = connectedSmartWallet?.getAccount();
+        if (!globalAccount) {
+            toast.error("Global Account not connected");
+            return;
+        }
+        if (expectedGlobalAccountAddress &&
+            globalAccount.address.toLowerCase() !== expectedGlobalAccountAddress.toLowerCase()) {
+            toast.error("Connected Global Account does not match the authenticated account");
             return;
         }
         try {
@@ -131,7 +137,7 @@ export function useUnifiedChainSwitchAndExecute() {
             toast.info("Sending transaction…");
             const start = performance.now();
             const sendTxResponse = await twSendTransaction({
-                account: aaAccount,
+                account: globalAccount,
                 transaction,
             });
             const end = performance.now();
@@ -147,17 +153,18 @@ export function useUnifiedChainSwitchAndExecute() {
         finally {
             setIsSwitchingOrExecuting(false);
         }
-    }, [aaAccount, partnerId]);
+    }, [connectedSmartWallet, partnerId]);
     // Unified switch chain and execute function
     const switchChainAndExecute = useCallback(async (targetChainId, params) => {
         // Check which wallet type is active
         if (isActiveSmartWallet) {
-            return handleAASendTransaction(targetChainId, params);
+            return handleGlobalAccountSendTransaction(targetChainId, params);
         }
         return handleEOASwitchChainAndSendTransaction(targetChainId, params);
-    }, [isActiveSmartWallet, handleAASendTransaction, handleEOASwitchChainAndSendTransaction]);
+    }, [isActiveSmartWallet, handleGlobalAccountSendTransaction, handleEOASwitchChainAndSendTransaction]);
     return {
         switchChainAndExecute,
+        switchChainAndExecuteWithGlobalAccount: handleGlobalAccountSendTransaction,
         switchChainAndExecuteWithEOA: handleEOASwitchChainAndSendTransaction,
         isSwitchingOrExecuting,
         isActiveSmartWallet,

package/dist/types/anyspend/react/components/QRDeposit.d.ts

@@ -14,6 +14,14 @@ export interface QRDepositProps {
     destinationToken: components["schemas"]["Token"];
     /** The destination chain ID */
     destinationChainId: number;
+    /**
+     * Human-formatted destination amount (e.g. "9.365547"), shown as an APPROXIMATE
+     * target in swap mode only. The QR deposit path accepts an arbitrary sent amount,
+     * so this is never a guaranteed receive figure — the UI frames it as "any amount
+     * works". Omitted when no fixed amount is set or the destination decimals are
+     * unresolved (to avoid a mis-scaled number). Ignored in pure-transfer mode.
+     */
+    destinationAmountDisplay?: string;
     /**
      * When true, the deposit is a PURE TRANSFER: the destination token/chain mirror
      * the user's currently selected source token/chain, so the exact token the user
@@ -54,4 +62,4 @@ export interface QRDepositProps {
  *   onSuccess={(txHash) => console.log("Deposit complete:", txHash)}
  * />
  */
-export declare function QRDeposit({ mode, recipientAddress, sourceToken: sourceTokenProp, sourceChainId: sourceChainIdProp, destinationToken, destinationChainId, pureTransferOnly, creatorAddress, depositContractConfig, onBack, onClose, onOrderCreated, onSuccess, classes, }: QRDepositProps): import("react/jsx-runtime").JSX.Element;
+export declare function QRDeposit({ mode, recipientAddress, sourceToken: sourceTokenProp, sourceChainId: sourceChainIdProp, destinationToken, destinationChainId, destinationAmountDisplay, pureTransferOnly, creatorAddress, depositContractConfig, onBack, onClose, onOrderCreated, onSuccess, classes, }: QRDepositProps): import("react/jsx-runtime").JSX.Element;

package/dist/types/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>;
+    switchChainAndExecuteWithGlobalAccount: (targetChainId: number, params: UnifiedTransactionParams, expectedGlobalAccountAddress?: string) => Promise<string | undefined>;
     switchChainAndExecuteWithEOA: (targetChainId: number, params: UnifiedTransactionParams) => Promise<string | undefined>;
     isSwitchingOrExecuting: boolean;
     isActiveSmartWallet: boolean | undefined;

package/package.json

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

package/src/anyspend/react/components/AnySpendDeposit.tsx

@@ -3,6 +3,7 @@ import { components } from "@b3dotfun/sdk/anyspend/types/api";
 import { GetQuoteResponse } from "@b3dotfun/sdk/anyspend/types/api_req_res";
 import { Skeleton, useAccountWallet, useSimBalance, useTokenData } from "@b3dotfun/sdk/global-account/react";
 import { cn } from "@b3dotfun/sdk/shared/utils/cn";
+import { formatTokenAmount } from "@b3dotfun/sdk/shared/utils/number";
 import {
   NetworkArbitrumOne,
   NetworkBase,
@@ -631,7 +632,9 @@ export function AnySpendDeposit({
                       "anyspend-deposit-option-description text-as-secondary text-xs"
                     }
                   >
-                    Send tokens directly to deposit address
+                    {pureTransferOnly
+                      ? "Send tokens directly to deposit address"
+                      : "Send any token — we'll convert it for you"}
                   </p>
                 </div>
               </div>
@@ -700,6 +703,19 @@ export function AnySpendDeposit({
     // `KNOWN_FUNDING_TOKENS` key — so `hasKnownDestination` is always true and this
     // branch never fires for them. The guard is defensive for FUTURE callers that pass
     // an unknown token together with `pureTransferOnly=true`.
+    // Only surface the fixed destination amount on the QR path when its decimals are trustworthy
+    // (a known funding token or a resolved API lookup) — otherwise `destinationToken.decimals`
+    // is the generic 18 fallback and formatting a 6-decimal token's wei against it would be off by
+    // 10^12. When unresolved we still show the destination token/chain, just without an amount.
+    const destinationDecimalsResolved = hasKnownDestination || !!destinationTokenData;
+    const destinationAmountDisplay =
+      destinationTokenAmount &&
+      /^\d+$/.test(destinationTokenAmount) &&
+      BigInt(destinationTokenAmount) > 0n &&
+      destinationDecimalsResolved
+        ? formatTokenAmount(BigInt(destinationTokenAmount), destinationToken.decimals, 6, false)
+        : undefined;
+
     if (pureTransferOnly && !hasKnownDestination && !destinationTokenData && isDestinationTokenLoading) {
       return (
         <div
@@ -722,6 +738,7 @@ export function AnySpendDeposit({
         recipientAddress={recipientAddress}
         destinationToken={destinationToken}
         destinationChainId={destinationTokenChainId}
+        destinationAmountDisplay={destinationAmountDisplay}
         pureTransferOnly={pureTransferOnly}
         depositContractConfig={depositContractConfig}
         onBack={handleBack}

package/src/anyspend/react/components/QRDeposit.tsx

@@ -36,6 +36,14 @@ export interface QRDepositProps {
   destinationToken: components["schemas"]["Token"];
   /** The destination chain ID */
   destinationChainId: number;
+  /**
+   * Human-formatted destination amount (e.g. "9.365547"), shown as an APPROXIMATE
+   * target in swap mode only. The QR deposit path accepts an arbitrary sent amount,
+   * so this is never a guaranteed receive figure — the UI frames it as "any amount
+   * works". Omitted when no fixed amount is set or the destination decimals are
+   * unresolved (to avoid a mis-scaled number). Ignored in pure-transfer mode.
+   */
+  destinationAmountDisplay?: string;
   /**
    * When true, the deposit is a PURE TRANSFER: the destination token/chain mirror
    * the user's currently selected source token/chain, so the exact token the user
@@ -96,6 +104,7 @@ export function QRDeposit({
   sourceChainId: sourceChainIdProp,
   destinationToken,
   destinationChainId,
+  destinationAmountDisplay,
   pureTransferOnly = false,
   creatorAddress,
   depositContractConfig,
@@ -410,6 +419,32 @@ export function QRDeposit({
           />
         </div>
 
+        {/* Receive (swap mode only) — makes the conversion explicit: what the sent token
+            becomes and on which chain. Gated on the computed isPureTransfer (not the static
+            prop) so a runtime source change back to the same token correctly hides it. */}
+        {!isPureTransfer && (
+          <div className="anyspend-qr-receive flex flex-col gap-1.5">
+            <label className="anyspend-qr-receive-label text-as-secondary text-sm">Receive</label>
+            <div className="anyspend-qr-receive-row border-as-stroke bg-as-surface-secondary flex w-full items-center gap-2 rounded-xl border px-3 py-2.5">
+              {effectiveDestinationToken.metadata?.logoURI ? (
+                <ChainTokenIcon
+                  chainUrl={ALL_CHAINS[effectiveDestinationChainId]?.logoUrl}
+                  tokenUrl={effectiveDestinationToken.metadata.logoURI}
+                  className="h-8 min-h-8 w-8 min-w-8"
+                />
+              ) : (
+                <div className="h-8 w-8 rounded-full bg-gray-700" />
+              )}
+              <div className="flex flex-col items-start gap-0">
+                <div className="text-as-primary font-semibold">{effectiveDestinationToken.symbol || "Token"}</div>
+                <div className="text-as-primary/70 text-xs">
+                  {ALL_CHAINS[effectiveDestinationChainId]?.name ?? "Unknown"}
+                </div>
+              </div>
+            </div>
+          </div>
+        )}
+
         {/* QR Code and Address - horizontal layout */}
         <div
           className={
@@ -454,10 +489,26 @@ export function QRDeposit({
 
         {/* Warnings */}
         <ChainWarningText chainId={effectiveDestinationChainId} />
-        <WarningText>
-          Only send {sourceToken.symbol} on {ALL_CHAINS[sourceChainId]?.name ?? "the specified chain"}. Other tokens
-          will not be converted.
-        </WarningText>
+        {isPureTransfer ? (
+          <WarningText>
+            Only send {sourceToken.symbol} on {ALL_CHAINS[sourceChainId]?.name ?? "the specified chain"}. Other tokens
+            will not be converted.
+          </WarningText>
+        ) : (
+          <>
+            <WarningText>
+              Only send {sourceToken.symbol} on {ALL_CHAINS[sourceChainId]?.name ?? "the specified chain"} to this
+              address — it will be converted to {effectiveDestinationToken.symbol || "the destination token"} on{" "}
+              {ALL_CHAINS[effectiveDestinationChainId]?.name ?? "the destination chain"}.
+            </WarningText>
+            {destinationAmountDisplay && (
+              <p className="anyspend-qr-amount-hint text-as-secondary text-xs">
+                Target ≈ {destinationAmountDisplay} {effectiveDestinationToken.symbol || "tokens"}. Any amount of{" "}
+                {sourceToken.symbol || "tokens"} works — you'll receive whatever your deposit converts to.
+              </p>
+            )}
+          </>
+        )}
 
         {/* Watching indicator for pure transfers */}
         {isPureTransfer && isWatchingTransfer && (

package/src/anyspend/react/components/__tests__/QRDeposit.test.tsx

@@ -164,6 +164,11 @@ describe("QRDeposit pureTransferOnly (Fund Wallet)", () => {
 
     // The displayed deposit address is the recipient's own address, NOT a global/order address.
     expect(screen.getByText(RECIPIENT)).toBeTruthy();
+
+    // Pure-transfer UI is unchanged: NO "Receive" row (there is no distinct destination),
+    // and the accurate "will not be converted" warning is kept verbatim.
+    expect(screen.queryByText("Receive")).toBeNull();
+    expect(screen.getByText(/Other tokens will not be converted/)).toBeTruthy();
   });
 
   it("Test B — switching the source token stays a pure transfer (no order; mirror follows selection)", async () => {
@@ -206,7 +211,14 @@ describe("QRDeposit pureTransferOnly (Fund Wallet)", () => {
 
     // No pureTransferOnly: source defaults to ETH-on-Base, which differs from the USDC dest,
     // so this is a real swap and the normal deposit_first order path must run.
-    render(<QRDeposit recipientAddress={RECIPIENT} destinationToken={USDC_BASE} destinationChainId={8453} />);
+    const { container } = render(
+      <QRDeposit
+        recipientAddress={RECIPIENT}
+        destinationToken={USDC_BASE}
+        destinationChainId={8453}
+        destinationAmountDisplay="9.365547"
+      />,
+    );
 
     // The flag is what gates the pure-transfer behavior: without it, an order IS created once.
     expect(createOrderSpy).toHaveBeenCalledTimes(1);
@@ -218,6 +230,32 @@ describe("QRDeposit pureTransferOnly (Fund Wallet)", () => {
     expect(orderArgs.dstToken.decimals).toBe(6);
     // Source defaulted to native ETH on Base (the differing token that forces a swap).
     expect(orderArgs.srcToken.address).toBe("0x0000000000000000000000000000000000000000");
+
+    // Swap-mode UX clarity: a read-only "Receive" row now discloses the destination token…
+    expect(screen.getByText("Receive")).toBeTruthy();
+    // …the misleading "will not be converted" copy is gone…
+    expect(screen.queryByText(/will not be converted/)).toBeNull();
+    // …the warning states the conversion explicitly, and the fixed amount shows as an
+    // approximate target (never a guaranteed receive figure).
+    expect(container.textContent).toContain("it will be converted to USDC on Base");
+    expect(container.textContent).toContain("Target ≈ 9.365547 USDC");
+  });
+
+  it("Test C2 — swap mode without a fixed amount shows the Receive row but no target hint", async () => {
+    const QRDeposit = await loadQRDeposit();
+
+    // Swap mode (source ETH-on-Base != USDC dest) but NO destinationAmountDisplay — the common
+    // open-ended funding case. The destination must still be disclosed, but there must be no
+    // dangling "Target ≈" line (and no blank amount).
+    const { container } = render(
+      <QRDeposit recipientAddress={RECIPIENT} destinationToken={USDC_BASE} destinationChainId={8453} />,
+    );
+
+    // Destination is still disclosed…
+    expect(screen.getByText("Receive")).toBeTruthy();
+    expect(container.textContent).toContain("it will be converted to USDC on Base");
+    // …but no amount hint is rendered when no amount is provided.
+    expect(container.textContent).not.toContain("Target ≈");
   });
 });
 

package/src/global-account/react/hooks/__tests__/useUnifiedChainSwitchAndExecute.test.tsx

@@ -0,0 +1,156 @@
+import { act, renderHook } from "@testing-library/react";
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import { useUnifiedChainSwitchAndExecute } from "../useUnifiedChainSwitchAndExecute";
+
+const mocks = vi.hoisted(() => ({
+  eoaGetAccount: vi.fn(),
+  globalAccountGetAccount: vi.fn(),
+  intentCreate: vi.fn(),
+  prepareTransaction: vi.fn(),
+  sendTransaction: vi.fn(),
+  toastError: vi.fn(),
+  toastInfo: vi.fn(),
+  toastSuccess: vi.fn(),
+  useAccountWallet: vi.fn(),
+}));
+
+vi.mock("@b3dotfun/sdk/anyspend", () => ({
+  getChainName: (chainId: number) => `Chain ${chainId}`,
+  getNativeToken: () => ({ name: "Ether", symbol: "ETH", decimals: 18 }),
+}));
+
+vi.mock("@b3dotfun/sdk/global-account/app", () => ({
+  default: {
+    service: () => ({ create: mocks.intentCreate }),
+  },
+}));
+
+vi.mock("@b3dotfun/sdk/global-account/react", () => ({
+  toast: {
+    dismiss: vi.fn(),
+    error: mocks.toastError,
+    info: mocks.toastInfo,
+    success: mocks.toastSuccess,
+  },
+}));
+
+vi.mock("@b3dotfun/sdk/shared/constants/chains/supported", () => ({
+  getThirdwebChain: (chainId: number) => ({ id: chainId }),
+  supportedChains: [],
+}));
+
+vi.mock("@b3dotfun/sdk/shared/utils/thirdweb", () => ({ client: {} }));
+
+vi.mock("thirdweb", () => ({
+  prepareTransaction: mocks.prepareTransaction,
+  sendTransaction: mocks.sendTransaction,
+}));
+
+vi.mock("viem", () => ({ isAddress: () => true }));
+
+vi.mock("wagmi", () => ({
+  useSwitchChain: () => ({ switchChainAsync: vi.fn() }),
+}));
+
+vi.mock("../../components/B3Provider/B3ConfigProvider", () => ({
+  useB3Config: () => ({ partnerId: "test-partner" }),
+}));
+
+vi.mock("../useAccountWallet", () => ({
+  useAccountWallet: mocks.useAccountWallet,
+}));
+
+const GLOBAL_ACCOUNT_ADDRESS = "0x1111111111111111111111111111111111111111";
+const OTHER_GLOBAL_ACCOUNT_ADDRESS = "0x2222222222222222222222222222222222222222";
+const EOA_ADDRESS = "0x3333333333333333333333333333333333333333";
+const TRANSACTION_HASH = `0x${"a".repeat(64)}`;
+
+const globalAccount = { address: GLOBAL_ACCOUNT_ADDRESS };
+const preparedTransaction = { prepared: true };
+const transactionParams = {
+  to: "0x4444444444444444444444444444444444444444",
+  data: "0x1234",
+  value: BigInt(0),
+};
+
+describe("useUnifiedChainSwitchAndExecute", () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+
+    mocks.globalAccountGetAccount.mockReturnValue(globalAccount);
+    mocks.eoaGetAccount.mockReturnValue({ address: EOA_ADDRESS });
+    mocks.intentCreate.mockResolvedValue({});
+    mocks.prepareTransaction.mockReturnValue(preparedTransaction);
+    mocks.sendTransaction.mockResolvedValue({ transactionHash: TRANSACTION_HASH });
+    mocks.useAccountWallet.mockReturnValue({
+      connectedSmartWallet: { getAccount: mocks.globalAccountGetAccount },
+      connectedEOAWallet: { getAccount: mocks.eoaGetAccount },
+      isActiveSmartWallet: false,
+      isActiveEOAWallet: true,
+    });
+  });
+
+  it("uses the connected Global Account even when the EOA wallet is active", async () => {
+    const { result } = renderHook(() => useUnifiedChainSwitchAndExecute());
+
+    let transactionHash: string | undefined;
+    await act(async () => {
+      transactionHash = await result.current.switchChainAndExecuteWithGlobalAccount(
+        8453,
+        transactionParams,
+        GLOBAL_ACCOUNT_ADDRESS,
+      );
+    });
+
+    expect(transactionHash).toBe(TRANSACTION_HASH);
+    expect(mocks.globalAccountGetAccount).toHaveBeenCalledOnce();
+    expect(mocks.eoaGetAccount).not.toHaveBeenCalled();
+    expect(mocks.sendTransaction).toHaveBeenCalledWith({
+      account: globalAccount,
+      transaction: preparedTransaction,
+    });
+  });
+
+  it("rejects a signer that does not match the authenticated Global Account", async () => {
+    const { result } = renderHook(() => useUnifiedChainSwitchAndExecute());
+
+    let transactionHash: string | undefined;
+    await act(async () => {
+      transactionHash = await result.current.switchChainAndExecuteWithGlobalAccount(
+        8453,
+        transactionParams,
+        OTHER_GLOBAL_ACCOUNT_ADDRESS,
+      );
+    });
+
+    expect(transactionHash).toBeUndefined();
+    expect(mocks.toastError).toHaveBeenCalledWith("Connected Global Account does not match the authenticated account");
+    expect(mocks.prepareTransaction).not.toHaveBeenCalled();
+    expect(mocks.sendTransaction).not.toHaveBeenCalled();
+    expect(mocks.eoaGetAccount).not.toHaveBeenCalled();
+  });
+
+  it("fails closed when no Global Account signer is connected", async () => {
+    mocks.useAccountWallet.mockReturnValue({
+      connectedSmartWallet: undefined,
+      connectedEOAWallet: { getAccount: mocks.eoaGetAccount },
+      isActiveSmartWallet: false,
+      isActiveEOAWallet: true,
+    });
+    const { result } = renderHook(() => useUnifiedChainSwitchAndExecute());
+
+    let transactionHash: string | undefined;
+    await act(async () => {
+      transactionHash = await result.current.switchChainAndExecuteWithGlobalAccount(
+        8453,
+        transactionParams,
+        GLOBAL_ACCOUNT_ADDRESS,
+      );
+    });
+
+    expect(transactionHash).toBeUndefined();
+    expect(mocks.toastError).toHaveBeenCalledWith("Global Account not connected");
+    expect(mocks.sendTransaction).not.toHaveBeenCalled();
+    expect(mocks.eoaGetAccount).not.toHaveBeenCalled();
+  });
+});

package/src/global-account/react/hooks/useUnifiedChainSwitchAndExecute.ts

@@ -10,7 +10,6 @@ import { prepareTransaction, sendTransaction as twSendTransaction } from "thirdw
 import { isAddress } from "viem";
 import { useSwitchChain } from "wagmi";
 import { useB3Config } from "../components/B3Provider/B3ConfigProvider";
-import { useB3Account } from "../components/B3Provider/useB3Account";
 import { useAccountWallet } from "./useAccountWallet";
 
 export interface UnifiedTransactionParams {
@@ -23,8 +22,7 @@ export function useUnifiedChainSwitchAndExecute() {
   const { switchChainAsync } = useSwitchChain();
   const [isSwitchingOrExecuting, setIsSwitchingOrExecuting] = useState(false);
 
-  const { isActiveSmartWallet, isActiveEOAWallet, connectedEOAWallet } = useAccountWallet();
-  const aaAccount = useB3Account();
+  const { isActiveSmartWallet, isActiveEOAWallet, connectedSmartWallet, connectedEOAWallet } = useAccountWallet();
 
   // From context, not process.env: partnerId is hashed into the server intent key and must match the ecosystem wallet.
   const { partnerId } = useB3Config();
@@ -119,11 +117,26 @@ export function useUnifiedChainSwitchAndExecute() {
     [connectedEOAWallet, switchChainAsync],
   );
 
-  // Handle AA wallet transaction (no chain switch needed for AA)
-  const handleAASendTransaction = useCallback(
-    async (targetChainId: number, params: UnifiedTransactionParams): Promise<string | undefined> => {
-      if (!aaAccount) {
-        toast.error("Smart wallet not connected");
+  // Handle Global Account transaction (no chain switch needed for AA).
+  // Resolve the signer from the connected ecosystem wallet rather than the active
+  // wallet so callers can explicitly require the Global Account.
+  const handleGlobalAccountSendTransaction = useCallback(
+    async (
+      targetChainId: number,
+      params: UnifiedTransactionParams,
+      expectedGlobalAccountAddress?: string,
+    ): Promise<string | undefined> => {
+      const globalAccount = connectedSmartWallet?.getAccount();
+      if (!globalAccount) {
+        toast.error("Global Account not connected");
+        return;
+      }
+
+      if (
+        expectedGlobalAccountAddress &&
+        globalAccount.address.toLowerCase() !== expectedGlobalAccountAddress.toLowerCase()
+      ) {
+        toast.error("Connected Global Account does not match the authenticated account");
         return;
       }
 
@@ -162,7 +175,7 @@ export function useUnifiedChainSwitchAndExecute() {
         toast.info("Sending transaction…");
         const start = performance.now();
         const sendTxResponse = await twSendTransaction({
-          account: aaAccount,
+          account: globalAccount,
           transaction,
         });
         const end = performance.now();
@@ -178,7 +191,7 @@ export function useUnifiedChainSwitchAndExecute() {
         setIsSwitchingOrExecuting(false);
       }
     },
-    [aaAccount, partnerId],
+    [connectedSmartWallet, partnerId],
   );
 
   // Unified switch chain and execute function
@@ -186,15 +199,16 @@ export function useUnifiedChainSwitchAndExecute() {
     async (targetChainId: number, params: UnifiedTransactionParams): Promise<string | undefined> => {
       // Check which wallet type is active
       if (isActiveSmartWallet) {
-        return handleAASendTransaction(targetChainId, params);
+        return handleGlobalAccountSendTransaction(targetChainId, params);
       }
       return handleEOASwitchChainAndSendTransaction(targetChainId, params);
     },
-    [isActiveSmartWallet, handleAASendTransaction, handleEOASwitchChainAndSendTransaction],
+    [isActiveSmartWallet, handleGlobalAccountSendTransaction, handleEOASwitchChainAndSendTransaction],
   );
 
   return {
     switchChainAndExecute,
+    switchChainAndExecuteWithGlobalAccount: handleGlobalAccountSendTransaction,
     switchChainAndExecuteWithEOA: handleEOASwitchChainAndSendTransaction,
     isSwitchingOrExecuting,
     isActiveSmartWallet,