@b3dotfun/sdk 0.1.65-alpha.1 → 0.1.65-alpha.3

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

@@ -131,6 +131,8 @@ function QRDeposit({ mode = "modal", recipientAddress, sourceToken: sourceTokenP
     (0, useOnOrderSuccess_1.useOnOrderSuccess)({ orderData: oat, orderId, onSuccess });
     // For pure transfers, always use recipient address; for orders, use global address
     const displayAddress = isPureTransfer ? recipientAddress : globalAddress || recipientAddress;
+    // Generate EIP-681 payment URI for the QR code so wallets know which chain/token to use
+    const qrValue = (0, anyspend_1.getPaymentUrl)(displayAddress, undefined, sourceToken.address === anyspend_1.ZERO_ADDRESS ? "ETH" : sourceToken.address, sourceChainId, sourceToken.decimals);
     const handleCopyAddress = async () => {
         if (displayAddress) {
             await navigator.clipboard.writeText(displayAddress);
@@ -163,7 +165,7 @@ 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: displayAddress, 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-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: destinationChainId }), (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-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/anyspend/utils/chain.d.ts

@@ -82,7 +82,7 @@ export declare function isTestnet(chainId: number): boolean;
 export declare function getDefaultToken(chainId: number): components["schemas"]["Token"];
 export declare function getChainName(chainId: number): string;
 export declare function getCoingeckoName(chainId: number): string | null;
-export declare function getPaymentUrl(address: string, amount: bigint, currency: string, chainId: number, decimals?: number): string;
+export declare function getPaymentUrl(address: string, amount: bigint | undefined, currency: string, chainId: number, decimals?: number): string;
 export declare function getExplorerTxUrl(chainId: number, txHash: string): string;
 export declare function getExplorerAddressUrl(chainId: number, address: string): string;
 export declare function getMulticall3Address(chainId: number): string;

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

@@ -392,8 +392,8 @@ function getPaymentUrl(address, amount, currency, chainId, decimals) {
             // For EVM chains, follow EIP-681 format
             // Format: ethereum:[address]@[chainId]?value=[amount]&symbol=[symbol]
             const params = new URLSearchParams();
-            // Add value for native token transfers
-            if (currency === chain.nativeToken.symbol) {
+            // Add value for native token transfers (skip if amount not provided, e.g. deposit_first)
+            if (currency === chain.nativeToken.symbol && amount !== undefined) {
                 params.append("value", amount.toString());
             }
             // Handle token transfers differently from native transfers
@@ -408,28 +408,31 @@ function getPaymentUrl(address, amount, currency, chainId, decimals) {
                 }
                 // For ERC20 tokens, convert from smallest unit to display units using decimals
                 // For example: 2400623 (raw) with 6 decimals becomes "2.400623"
-                let displayAmount;
-                if (decimals !== undefined && currency !== chain.nativeToken.symbol) {
-                    // Convert from smallest unit to display unit for ERC20 tokens
-                    const divisor = BigInt(10 ** decimals);
-                    const wholePart = amount / divisor;
-                    const fractionalPart = amount % divisor;
-                    if (fractionalPart === BigInt(0)) {
-                        displayAmount = wholePart.toString();
+                // Skip amount if not provided (e.g. deposit_first orders)
+                if (amount !== undefined) {
+                    let displayAmount;
+                    if (decimals !== undefined && currency !== chain.nativeToken.symbol) {
+                        // Convert from smallest unit to display unit for ERC20 tokens
+                        const divisor = BigInt(10 ** decimals);
+                        const wholePart = amount / divisor;
+                        const fractionalPart = amount % divisor;
+                        if (fractionalPart === BigInt(0)) {
+                            displayAmount = wholePart.toString();
+                        }
+                        else {
+                            // Format fractional part with leading zeros if needed
+                            const fractionalStr = fractionalPart.toString().padStart(decimals, "0");
+                            // Remove trailing zeros
+                            const trimmedFractional = fractionalStr.replace(/0+$/, "");
+                            displayAmount = trimmedFractional ? `${wholePart}.${trimmedFractional}` : wholePart.toString();
+                        }
                     }
                     else {
-                        // Format fractional part with leading zeros if needed
-                        const fractionalStr = fractionalPart.toString().padStart(decimals, "0");
-                        // Remove trailing zeros
-                        const trimmedFractional = fractionalStr.replace(/0+$/, "");
-                        displayAmount = trimmedFractional ? `${wholePart}.${trimmedFractional}` : wholePart.toString();
+                        // For native tokens or when decimals not provided, use raw amount
+                        displayAmount = amount.toString();
                     }
+                    tokenParams.append("amount", displayAmount);
                 }
-                else {
-                    // For native tokens or when decimals not provided, use raw amount
-                    displayAmount = amount.toString();
-                }
-                tokenParams.append("amount", displayAmount);
                 tokenParams.append("address", address); // recipient address
                 // For Arbitrum and other L2s, try a more explicit format
                 if (chainId !== chains_1.mainnet.id) {
@@ -449,7 +452,9 @@ function getPaymentUrl(address, amount, currency, chainId, decimals) {
                 // to make sure wallets recognize the correct chain
                 const nativeParams = new URLSearchParams();
                 nativeParams.append("chainId", chainId.toString());
-                nativeParams.append("value", amount.toString());
+                if (amount !== undefined) {
+                    nativeParams.append("value", amount.toString());
+                }
                 const url = `ethereum:${address}@${chainId}?${nativeParams.toString()}`;
                 return url;
             }
@@ -468,60 +473,65 @@ function getPaymentUrl(address, amount, currency, chainId, decimals) {
             const isNativeSOL = currency === chain.nativeToken.symbol || currency === "SOL" || currency === "11111111111111111111111111111111";
             if (isNativeSOL) {
                 // Native SOL transfers - convert from lamports to SOL
-                let displayAmount;
-                if (decimals !== undefined) {
-                    const divisor = BigInt(10 ** decimals);
-                    const wholePart = amount / divisor;
-                    const fractionalPart = amount % divisor;
-                    if (fractionalPart === BigInt(0)) {
-                        displayAmount = wholePart.toString();
-                    }
-                    else {
-                        const fractionalStr = fractionalPart.toString().padStart(decimals, "0");
-                        const trimmedFractional = fractionalStr.replace(/0+$/, "");
-                        displayAmount = trimmedFractional ? `${wholePart}.${trimmedFractional}` : wholePart.toString();
-                    }
-                }
-                else {
-                    // Fallback: assume SOL has 9 decimals
-                    const divisor = BigInt(1000000000); // 1e9
-                    const wholePart = amount / divisor;
-                    const fractionalPart = amount % divisor;
-                    if (fractionalPart === BigInt(0)) {
-                        displayAmount = wholePart.toString();
+                if (amount !== undefined) {
+                    let displayAmount;
+                    if (decimals !== undefined) {
+                        const divisor = BigInt(10 ** decimals);
+                        const wholePart = amount / divisor;
+                        const fractionalPart = amount % divisor;
+                        if (fractionalPart === BigInt(0)) {
+                            displayAmount = wholePart.toString();
+                        }
+                        else {
+                            const fractionalStr = fractionalPart.toString().padStart(decimals, "0");
+                            const trimmedFractional = fractionalStr.replace(/0+$/, "");
+                            displayAmount = trimmedFractional ? `${wholePart}.${trimmedFractional}` : wholePart.toString();
+                        }
                     }
                     else {
-                        const fractionalStr = fractionalPart.toString().padStart(9, "0");
-                        const trimmedFractional = fractionalStr.replace(/0+$/, "");
-                        displayAmount = trimmedFractional ? `${wholePart}.${trimmedFractional}` : wholePart.toString();
+                        // Fallback: assume SOL has 9 decimals
+                        const divisor = BigInt(1000000000); // 1e9
+                        const wholePart = amount / divisor;
+                        const fractionalPart = amount % divisor;
+                        if (fractionalPart === BigInt(0)) {
+                            displayAmount = wholePart.toString();
+                        }
+                        else {
+                            const fractionalStr = fractionalPart.toString().padStart(9, "0");
+                            const trimmedFractional = fractionalStr.replace(/0+$/, "");
+                            displayAmount = trimmedFractional ? `${wholePart}.${trimmedFractional}` : wholePart.toString();
+                        }
                     }
+                    // For native SOL, use simple format without spl-token parameter
+                    params.append("amount", displayAmount);
                 }
-                // For native SOL, use simple format without spl-token parameter
-                params.append("amount", displayAmount);
             }
             else {
                 // SPL token transfers
-                let displayAmount;
-                if (decimals !== undefined) {
-                    const divisor = BigInt(10 ** decimals);
-                    const wholePart = amount / divisor;
-                    const fractionalPart = amount % divisor;
-                    if (fractionalPart === BigInt(0)) {
-                        displayAmount = wholePart.toString();
+                if (amount !== undefined) {
+                    let displayAmount;
+                    if (decimals !== undefined) {
+                        const divisor = BigInt(10 ** decimals);
+                        const wholePart = amount / divisor;
+                        const fractionalPart = amount % divisor;
+                        if (fractionalPart === BigInt(0)) {
+                            displayAmount = wholePart.toString();
+                        }
+                        else {
+                            const fractionalStr = fractionalPart.toString().padStart(decimals, "0");
+                            const trimmedFractional = fractionalStr.replace(/0+$/, "");
+                            displayAmount = trimmedFractional ? `${wholePart}.${trimmedFractional}` : wholePart.toString();
+                        }
                     }
                     else {
-                        const fractionalStr = fractionalPart.toString().padStart(decimals, "0");
-                        const trimmedFractional = fractionalStr.replace(/0+$/, "");
-                        displayAmount = trimmedFractional ? `${wholePart}.${trimmedFractional}` : wholePart.toString();
+                        displayAmount = amount.toString();
                     }
+                    params.append("amount", displayAmount);
                 }
-                else {
-                    displayAmount = amount.toString();
-                }
-                params.append("amount", displayAmount);
                 params.append("spl-token", currency); // token mint address
             }
-            const url = `solana:${address}?${params.toString()}`;
+            const queryString = params.toString();
+            const url = queryString ? `solana:${address}?${queryString}` : `solana:${address}`;
             console.log("Solana URL (isNativeSOL:", isNativeSOL, "):", url);
             return url;
         }

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

@@ -14,6 +14,16 @@ function useUserQuery() {
     const user = (0, userStore_1.useUserStore)(state => state.user);
     const setUserStore = (0, userStore_1.useUserStore)(state => state.setUser);
     const clearUserStore = (0, userStore_1.useUserStore)(state => state.clearUser);
+    // Manually rehydrate persisted store inside useLayoutEffect to avoid
+    // updating AuthenticationProvider state during Hydrate render.
+    // useLayoutEffect (not useEffect) ensures rehydration triggers a
+    // synchronous re-render before any useEffect callbacks fire, so
+    // downstream effects always see the persisted user value.
+    (0, react_1.useLayoutEffect)(() => {
+        if (!userStore_1.useUserStore.persist.hasHydrated()) {
+            userStore_1.useUserStore.persist.rehydrate();
+        }
+    }, []);
     // Listen for storage events from other tabs/windows
     (0, react_1.useEffect)(() => {
         const handleStorageChange = (e) => {

package/dist/cjs/global-account/react/stores/userStore.js

@@ -22,6 +22,7 @@ exports.useUserStore = (0, zustand_1.create)()((0, middleware_1.persist)(set =>
     },
 }), {
     name: "b3-user",
+    skipHydration: true,
     onRehydrateStorage: () => (_, error) => {
         if (error) {
             console.warn("Failed to rehydrate user store:", error);

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

@@ -1,5 +1,5 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { ALL_CHAINS, getAvailableChainIds, isSameChainAndToken } from "../../../anyspend/index.js";
+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";
 import { TokenSelector } from "@relayprotocol/relay-kit-ui";
@@ -128,6 +128,8 @@ export function QRDeposit({ mode = "modal", recipientAddress, sourceToken: sourc
     useOnOrderSuccess({ orderData: oat, orderId, onSuccess });
     // For pure transfers, always use recipient address; for orders, use global address
     const displayAddress = isPureTransfer ? recipientAddress : globalAddress || recipientAddress;
+    // Generate EIP-681 payment URI for the QR code so wallets know which chain/token to use
+    const qrValue = getPaymentUrl(displayAddress, undefined, sourceToken.address === ZERO_ADDRESS ? "ETH" : sourceToken.address, sourceChainId, sourceToken.decimals);
     const handleCopyAddress = async () => {
         if (displayAddress) {
             await navigator.clipboard.writeText(displayAddress);
@@ -160,7 +162,7 @@ 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: displayAddress, 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-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: destinationChainId }), _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-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/anyspend/utils/chain.d.ts

@@ -82,7 +82,7 @@ export declare function isTestnet(chainId: number): boolean;
 export declare function getDefaultToken(chainId: number): components["schemas"]["Token"];
 export declare function getChainName(chainId: number): string;
 export declare function getCoingeckoName(chainId: number): string | null;
-export declare function getPaymentUrl(address: string, amount: bigint, currency: string, chainId: number, decimals?: number): string;
+export declare function getPaymentUrl(address: string, amount: bigint | undefined, currency: string, chainId: number, decimals?: number): string;
 export declare function getExplorerTxUrl(chainId: number, txHash: string): string;
 export declare function getExplorerAddressUrl(chainId: number, address: string): string;
 export declare function getMulticall3Address(chainId: number): string;

package/dist/esm/anyspend/utils/chain.js

@@ -362,8 +362,8 @@ export function getPaymentUrl(address, amount, currency, chainId, decimals) {
             // For EVM chains, follow EIP-681 format
             // Format: ethereum:[address]@[chainId]?value=[amount]&symbol=[symbol]
             const params = new URLSearchParams();
-            // Add value for native token transfers
-            if (currency === chain.nativeToken.symbol) {
+            // Add value for native token transfers (skip if amount not provided, e.g. deposit_first)
+            if (currency === chain.nativeToken.symbol && amount !== undefined) {
                 params.append("value", amount.toString());
             }
             // Handle token transfers differently from native transfers
@@ -378,28 +378,31 @@ export function getPaymentUrl(address, amount, currency, chainId, decimals) {
                 }
                 // For ERC20 tokens, convert from smallest unit to display units using decimals
                 // For example: 2400623 (raw) with 6 decimals becomes "2.400623"
-                let displayAmount;
-                if (decimals !== undefined && currency !== chain.nativeToken.symbol) {
-                    // Convert from smallest unit to display unit for ERC20 tokens
-                    const divisor = BigInt(10 ** decimals);
-                    const wholePart = amount / divisor;
-                    const fractionalPart = amount % divisor;
-                    if (fractionalPart === BigInt(0)) {
-                        displayAmount = wholePart.toString();
+                // Skip amount if not provided (e.g. deposit_first orders)
+                if (amount !== undefined) {
+                    let displayAmount;
+                    if (decimals !== undefined && currency !== chain.nativeToken.symbol) {
+                        // Convert from smallest unit to display unit for ERC20 tokens
+                        const divisor = BigInt(10 ** decimals);
+                        const wholePart = amount / divisor;
+                        const fractionalPart = amount % divisor;
+                        if (fractionalPart === BigInt(0)) {
+                            displayAmount = wholePart.toString();
+                        }
+                        else {
+                            // Format fractional part with leading zeros if needed
+                            const fractionalStr = fractionalPart.toString().padStart(decimals, "0");
+                            // Remove trailing zeros
+                            const trimmedFractional = fractionalStr.replace(/0+$/, "");
+                            displayAmount = trimmedFractional ? `${wholePart}.${trimmedFractional}` : wholePart.toString();
+                        }
                     }
                     else {
-                        // Format fractional part with leading zeros if needed
-                        const fractionalStr = fractionalPart.toString().padStart(decimals, "0");
-                        // Remove trailing zeros
-                        const trimmedFractional = fractionalStr.replace(/0+$/, "");
-                        displayAmount = trimmedFractional ? `${wholePart}.${trimmedFractional}` : wholePart.toString();
+                        // For native tokens or when decimals not provided, use raw amount
+                        displayAmount = amount.toString();
                     }
+                    tokenParams.append("amount", displayAmount);
                 }
-                else {
-                    // For native tokens or when decimals not provided, use raw amount
-                    displayAmount = amount.toString();
-                }
-                tokenParams.append("amount", displayAmount);
                 tokenParams.append("address", address); // recipient address
                 // For Arbitrum and other L2s, try a more explicit format
                 if (chainId !== mainnet.id) {
@@ -419,7 +422,9 @@ export function getPaymentUrl(address, amount, currency, chainId, decimals) {
                 // to make sure wallets recognize the correct chain
                 const nativeParams = new URLSearchParams();
                 nativeParams.append("chainId", chainId.toString());
-                nativeParams.append("value", amount.toString());
+                if (amount !== undefined) {
+                    nativeParams.append("value", amount.toString());
+                }
                 const url = `ethereum:${address}@${chainId}?${nativeParams.toString()}`;
                 return url;
             }
@@ -438,60 +443,65 @@ export function getPaymentUrl(address, amount, currency, chainId, decimals) {
             const isNativeSOL = currency === chain.nativeToken.symbol || currency === "SOL" || currency === "11111111111111111111111111111111";
             if (isNativeSOL) {
                 // Native SOL transfers - convert from lamports to SOL
-                let displayAmount;
-                if (decimals !== undefined) {
-                    const divisor = BigInt(10 ** decimals);
-                    const wholePart = amount / divisor;
-                    const fractionalPart = amount % divisor;
-                    if (fractionalPart === BigInt(0)) {
-                        displayAmount = wholePart.toString();
-                    }
-                    else {
-                        const fractionalStr = fractionalPart.toString().padStart(decimals, "0");
-                        const trimmedFractional = fractionalStr.replace(/0+$/, "");
-                        displayAmount = trimmedFractional ? `${wholePart}.${trimmedFractional}` : wholePart.toString();
-                    }
-                }
-                else {
-                    // Fallback: assume SOL has 9 decimals
-                    const divisor = BigInt(1000000000); // 1e9
-                    const wholePart = amount / divisor;
-                    const fractionalPart = amount % divisor;
-                    if (fractionalPart === BigInt(0)) {
-                        displayAmount = wholePart.toString();
+                if (amount !== undefined) {
+                    let displayAmount;
+                    if (decimals !== undefined) {
+                        const divisor = BigInt(10 ** decimals);
+                        const wholePart = amount / divisor;
+                        const fractionalPart = amount % divisor;
+                        if (fractionalPart === BigInt(0)) {
+                            displayAmount = wholePart.toString();
+                        }
+                        else {
+                            const fractionalStr = fractionalPart.toString().padStart(decimals, "0");
+                            const trimmedFractional = fractionalStr.replace(/0+$/, "");
+                            displayAmount = trimmedFractional ? `${wholePart}.${trimmedFractional}` : wholePart.toString();
+                        }
                     }
                     else {
-                        const fractionalStr = fractionalPart.toString().padStart(9, "0");
-                        const trimmedFractional = fractionalStr.replace(/0+$/, "");
-                        displayAmount = trimmedFractional ? `${wholePart}.${trimmedFractional}` : wholePart.toString();
+                        // Fallback: assume SOL has 9 decimals
+                        const divisor = BigInt(1000000000); // 1e9
+                        const wholePart = amount / divisor;
+                        const fractionalPart = amount % divisor;
+                        if (fractionalPart === BigInt(0)) {
+                            displayAmount = wholePart.toString();
+                        }
+                        else {
+                            const fractionalStr = fractionalPart.toString().padStart(9, "0");
+                            const trimmedFractional = fractionalStr.replace(/0+$/, "");
+                            displayAmount = trimmedFractional ? `${wholePart}.${trimmedFractional}` : wholePart.toString();
+                        }
                     }
+                    // For native SOL, use simple format without spl-token parameter
+                    params.append("amount", displayAmount);
                 }
-                // For native SOL, use simple format without spl-token parameter
-                params.append("amount", displayAmount);
             }
             else {
                 // SPL token transfers
-                let displayAmount;
-                if (decimals !== undefined) {
-                    const divisor = BigInt(10 ** decimals);
-                    const wholePart = amount / divisor;
-                    const fractionalPart = amount % divisor;
-                    if (fractionalPart === BigInt(0)) {
-                        displayAmount = wholePart.toString();
+                if (amount !== undefined) {
+                    let displayAmount;
+                    if (decimals !== undefined) {
+                        const divisor = BigInt(10 ** decimals);
+                        const wholePart = amount / divisor;
+                        const fractionalPart = amount % divisor;
+                        if (fractionalPart === BigInt(0)) {
+                            displayAmount = wholePart.toString();
+                        }
+                        else {
+                            const fractionalStr = fractionalPart.toString().padStart(decimals, "0");
+                            const trimmedFractional = fractionalStr.replace(/0+$/, "");
+                            displayAmount = trimmedFractional ? `${wholePart}.${trimmedFractional}` : wholePart.toString();
+                        }
                     }
                     else {
-                        const fractionalStr = fractionalPart.toString().padStart(decimals, "0");
-                        const trimmedFractional = fractionalStr.replace(/0+$/, "");
-                        displayAmount = trimmedFractional ? `${wholePart}.${trimmedFractional}` : wholePart.toString();
+                        displayAmount = amount.toString();
                     }
+                    params.append("amount", displayAmount);
                 }
-                else {
-                    displayAmount = amount.toString();
-                }
-                params.append("amount", displayAmount);
                 params.append("spl-token", currency); // token mint address
             }
-            const url = `solana:${address}?${params.toString()}`;
+            const queryString = params.toString();
+            const url = queryString ? `solana:${address}?${queryString}` : `solana:${address}`;
             console.log("Solana URL (isNativeSOL:", isNativeSOL, "):", url);
             return url;
         }

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

@@ -1,4 +1,4 @@
-import { useEffect } from "react";
+import { useEffect, useLayoutEffect } from "react";
 import { useUserStore } from "../stores/userStore.js";
 const USER_QUERY_KEY = ["b3-user"];
 /**
@@ -11,6 +11,16 @@ export function useUserQuery() {
     const user = useUserStore(state => state.user);
     const setUserStore = useUserStore(state => state.setUser);
     const clearUserStore = useUserStore(state => state.clearUser);
+    // Manually rehydrate persisted store inside useLayoutEffect to avoid
+    // updating AuthenticationProvider state during Hydrate render.
+    // useLayoutEffect (not useEffect) ensures rehydration triggers a
+    // synchronous re-render before any useEffect callbacks fire, so
+    // downstream effects always see the persisted user value.
+    useLayoutEffect(() => {
+        if (!useUserStore.persist.hasHydrated()) {
+            useUserStore.persist.rehydrate();
+        }
+    }, []);
     // Listen for storage events from other tabs/windows
     useEffect(() => {
         const handleStorageChange = (e) => {

package/dist/esm/global-account/react/stores/userStore.js

@@ -19,6 +19,7 @@ export const useUserStore = create()(persist(set => ({
     },
 }), {
     name: "b3-user",
+    skipHydration: true,
     onRehydrateStorage: () => (_, error) => {
         if (error) {
             console.warn("Failed to rehydrate user store:", error);

package/dist/types/anyspend/utils/chain.d.ts

@@ -82,7 +82,7 @@ export declare function isTestnet(chainId: number): boolean;
 export declare function getDefaultToken(chainId: number): components["schemas"]["Token"];
 export declare function getChainName(chainId: number): string;
 export declare function getCoingeckoName(chainId: number): string | null;
-export declare function getPaymentUrl(address: string, amount: bigint, currency: string, chainId: number, decimals?: number): string;
+export declare function getPaymentUrl(address: string, amount: bigint | undefined, currency: string, chainId: number, decimals?: number): string;
 export declare function getExplorerTxUrl(chainId: number, txHash: string): string;
 export declare function getExplorerAddressUrl(chainId: number, address: string): string;
 export declare function getMulticall3Address(chainId: number): string;

package/package.json

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

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

@@ -1,4 +1,10 @@
-import { ALL_CHAINS, getAvailableChainIds, isSameChainAndToken } from "@b3dotfun/sdk/anyspend";
+import {
+  ALL_CHAINS,
+  getAvailableChainIds,
+  getPaymentUrl,
+  isSameChainAndToken,
+  ZERO_ADDRESS,
+} from "@b3dotfun/sdk/anyspend";
 import { components } from "@b3dotfun/sdk/anyspend/types/api";
 import { Button, toast } from "@b3dotfun/sdk/global-account/react";
 import { cn } from "@b3dotfun/sdk/shared/utils/cn";
@@ -194,6 +200,15 @@ export function QRDeposit({
   // For pure transfers, always use recipient address; for orders, use global address
   const displayAddress = isPureTransfer ? recipientAddress : globalAddress || recipientAddress;
 
+  // Generate EIP-681 payment URI for the QR code so wallets know which chain/token to use
+  const qrValue = getPaymentUrl(
+    displayAddress,
+    undefined,
+    sourceToken.address === ZERO_ADDRESS ? "ETH" : sourceToken.address,
+    sourceChainId,
+    sourceToken.decimals,
+  );
+
   const handleCopyAddress = async () => {
     if (displayAddress) {
       await navigator.clipboard.writeText(displayAddress);
@@ -376,7 +391,7 @@ export function QRDeposit({
           {/* QR Code */}
           <div className={classes?.qrCodeContainer || "anyspend-qr-code-container flex flex-col items-center gap-2"}>
             <div className={classes?.qrCode || "anyspend-qr-code rounded-lg bg-white p-2"}>
-              <QRCodeSVG value={displayAddress} size={120} level="M" marginSize={0} />
+              <QRCodeSVG value={qrValue} size={120} level="M" marginSize={0} />
             </div>
             <span className={classes?.qrScanHint || "anyspend-qr-scan-hint text-as-secondary text-xs"}>
               SCAN WITH <span className="inline-block">🦊</span>

package/src/anyspend/utils/chain.ts

@@ -421,7 +421,13 @@ export function getCoingeckoName(chainId: number): string | null {
   return ALL_CHAINS[chainId].coingeckoName;
 }
 
-export function getPaymentUrl(address: string, amount: bigint, currency: string, chainId: number, decimals?: number) {
+export function getPaymentUrl(
+  address: string,
+  amount: bigint | undefined,
+  currency: string,
+  chainId: number,
+  decimals?: number,
+) {
   // Get chain type to determine URL format
   const chainType = getChainType(chainId);
   const chain = ALL_CHAINS[chainId];
@@ -433,8 +439,8 @@ export function getPaymentUrl(address: string, amount: bigint, currency: string,
       // Format: ethereum:[address]@[chainId]?value=[amount]&symbol=[symbol]
       const params = new URLSearchParams();
 
-      // Add value for native token transfers
-      if (currency === chain.nativeToken.symbol) {
+      // Add value for native token transfers (skip if amount not provided, e.g. deposit_first)
+      if (currency === chain.nativeToken.symbol && amount !== undefined) {
         params.append("value", amount.toString());
       }
 
@@ -453,28 +459,31 @@ export function getPaymentUrl(address: string, amount: bigint, currency: string,
 
         // For ERC20 tokens, convert from smallest unit to display units using decimals
         // For example: 2400623 (raw) with 6 decimals becomes "2.400623"
-        let displayAmount: string;
-        if (decimals !== undefined && currency !== chain.nativeToken.symbol) {
-          // Convert from smallest unit to display unit for ERC20 tokens
-          const divisor = BigInt(10 ** decimals);
-          const wholePart = amount / divisor;
-          const fractionalPart = amount % divisor;
-
-          if (fractionalPart === BigInt(0)) {
-            displayAmount = wholePart.toString();
+        // Skip amount if not provided (e.g. deposit_first orders)
+        if (amount !== undefined) {
+          let displayAmount: string;
+          if (decimals !== undefined && currency !== chain.nativeToken.symbol) {
+            // Convert from smallest unit to display unit for ERC20 tokens
+            const divisor = BigInt(10 ** decimals);
+            const wholePart = amount / divisor;
+            const fractionalPart = amount % divisor;
+
+            if (fractionalPart === BigInt(0)) {
+              displayAmount = wholePart.toString();
+            } else {
+              // Format fractional part with leading zeros if needed
+              const fractionalStr = fractionalPart.toString().padStart(decimals, "0");
+              // Remove trailing zeros
+              const trimmedFractional = fractionalStr.replace(/0+$/, "");
+              displayAmount = trimmedFractional ? `${wholePart}.${trimmedFractional}` : wholePart.toString();
+            }
           } else {
-            // Format fractional part with leading zeros if needed
-            const fractionalStr = fractionalPart.toString().padStart(decimals, "0");
-            // Remove trailing zeros
-            const trimmedFractional = fractionalStr.replace(/0+$/, "");
-            displayAmount = trimmedFractional ? `${wholePart}.${trimmedFractional}` : wholePart.toString();
+            // For native tokens or when decimals not provided, use raw amount
+            displayAmount = amount.toString();
           }
-        } else {
-          // For native tokens or when decimals not provided, use raw amount
-          displayAmount = amount.toString();
-        }
 
-        tokenParams.append("amount", displayAmount);
+          tokenParams.append("amount", displayAmount);
+        }
         tokenParams.append("address", address); // recipient address
 
         // For Arbitrum and other L2s, try a more explicit format
@@ -495,7 +504,9 @@ export function getPaymentUrl(address: string, amount: bigint, currency: string,
         // to make sure wallets recognize the correct chain
         const nativeParams = new URLSearchParams();
         nativeParams.append("chainId", chainId.toString());
-        nativeParams.append("value", amount.toString());
+        if (amount !== undefined) {
+          nativeParams.append("value", amount.toString());
+        }
         const url = `ethereum:${address}@${chainId}?${nativeParams.toString()}`;
         return url;
       } else {
@@ -517,60 +528,65 @@ export function getPaymentUrl(address: string, amount: bigint, currency: string,
 
       if (isNativeSOL) {
         // Native SOL transfers - convert from lamports to SOL
-        let displayAmount: string;
-        if (decimals !== undefined) {
-          const divisor = BigInt(10 ** decimals);
-          const wholePart = amount / divisor;
-          const fractionalPart = amount % divisor;
-
-          if (fractionalPart === BigInt(0)) {
-            displayAmount = wholePart.toString();
+        if (amount !== undefined) {
+          let displayAmount: string;
+          if (decimals !== undefined) {
+            const divisor = BigInt(10 ** decimals);
+            const wholePart = amount / divisor;
+            const fractionalPart = amount % divisor;
+
+            if (fractionalPart === BigInt(0)) {
+              displayAmount = wholePart.toString();
+            } else {
+              const fractionalStr = fractionalPart.toString().padStart(decimals, "0");
+              const trimmedFractional = fractionalStr.replace(/0+$/, "");
+              displayAmount = trimmedFractional ? `${wholePart}.${trimmedFractional}` : wholePart.toString();
+            }
           } else {
-            const fractionalStr = fractionalPart.toString().padStart(decimals, "0");
-            const trimmedFractional = fractionalStr.replace(/0+$/, "");
-            displayAmount = trimmedFractional ? `${wholePart}.${trimmedFractional}` : wholePart.toString();
+            // Fallback: assume SOL has 9 decimals
+            const divisor = BigInt(1000000000); // 1e9
+            const wholePart = amount / divisor;
+            const fractionalPart = amount % divisor;
+
+            if (fractionalPart === BigInt(0)) {
+              displayAmount = wholePart.toString();
+            } else {
+              const fractionalStr = fractionalPart.toString().padStart(9, "0");
+              const trimmedFractional = fractionalStr.replace(/0+$/, "");
+              displayAmount = trimmedFractional ? `${wholePart}.${trimmedFractional}` : wholePart.toString();
+            }
           }
-        } else {
-          // Fallback: assume SOL has 9 decimals
-          const divisor = BigInt(1000000000); // 1e9
-          const wholePart = amount / divisor;
-          const fractionalPart = amount % divisor;
 
-          if (fractionalPart === BigInt(0)) {
-            displayAmount = wholePart.toString();
-          } else {
-            const fractionalStr = fractionalPart.toString().padStart(9, "0");
-            const trimmedFractional = fractionalStr.replace(/0+$/, "");
-            displayAmount = trimmedFractional ? `${wholePart}.${trimmedFractional}` : wholePart.toString();
-          }
+          // For native SOL, use simple format without spl-token parameter
+          params.append("amount", displayAmount);
         }
-
-        // For native SOL, use simple format without spl-token parameter
-        params.append("amount", displayAmount);
       } else {
         // SPL token transfers
-        let displayAmount: string;
-        if (decimals !== undefined) {
-          const divisor = BigInt(10 ** decimals);
-          const wholePart = amount / divisor;
-          const fractionalPart = amount % divisor;
-
-          if (fractionalPart === BigInt(0)) {
-            displayAmount = wholePart.toString();
+        if (amount !== undefined) {
+          let displayAmount: string;
+          if (decimals !== undefined) {
+            const divisor = BigInt(10 ** decimals);
+            const wholePart = amount / divisor;
+            const fractionalPart = amount % divisor;
+
+            if (fractionalPart === BigInt(0)) {
+              displayAmount = wholePart.toString();
+            } else {
+              const fractionalStr = fractionalPart.toString().padStart(decimals, "0");
+              const trimmedFractional = fractionalStr.replace(/0+$/, "");
+              displayAmount = trimmedFractional ? `${wholePart}.${trimmedFractional}` : wholePart.toString();
+            }
           } else {
-            const fractionalStr = fractionalPart.toString().padStart(decimals, "0");
-            const trimmedFractional = fractionalStr.replace(/0+$/, "");
-            displayAmount = trimmedFractional ? `${wholePart}.${trimmedFractional}` : wholePart.toString();
+            displayAmount = amount.toString();
           }
-        } else {
-          displayAmount = amount.toString();
-        }
 
-        params.append("amount", displayAmount);
+          params.append("amount", displayAmount);
+        }
         params.append("spl-token", currency); // token mint address
       }
 
-      const url = `solana:${address}?${params.toString()}`;
+      const queryString = params.toString();
+      const url = queryString ? `solana:${address}?${queryString}` : `solana:${address}`;
       console.log("Solana URL (isNativeSOL:", isNativeSOL, "):", url);
       return url;
     }

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

@@ -1,5 +1,5 @@
 import { Users } from "@b3dotfun/b3-api";
-import { useEffect } from "react";
+import { useEffect, useLayoutEffect } from "react";
 import { useUserStore } from "../stores/userStore";
 
 const USER_QUERY_KEY = ["b3-user"];
@@ -15,6 +15,17 @@ export function useUserQuery() {
   const setUserStore = useUserStore(state => state.setUser);
   const clearUserStore = useUserStore(state => state.clearUser);
 
+  // Manually rehydrate persisted store inside useLayoutEffect to avoid
+  // updating AuthenticationProvider state during Hydrate render.
+  // useLayoutEffect (not useEffect) ensures rehydration triggers a
+  // synchronous re-render before any useEffect callbacks fire, so
+  // downstream effects always see the persisted user value.
+  useLayoutEffect(() => {
+    if (!useUserStore.persist.hasHydrated()) {
+      useUserStore.persist.rehydrate();
+    }
+  }, []);
+
   // Listen for storage events from other tabs/windows
   useEffect(() => {
     const handleStorageChange = (e: StorageEvent) => {

package/src/global-account/react/stores/userStore.ts

@@ -31,6 +31,7 @@ export const useUserStore = create<UserStore>()(
     }),
     {
       name: "b3-user",
+      skipHydration: true,
       onRehydrateStorage: () => (_, error) => {
         if (error) {
           console.warn("Failed to rehydrate user store:", error);