@rozoai/intent-pay 0.1.37-beta.1 → 0.1.37-beta.2

package/build/src/hooks/useDepositAddressOptions.js

@@ -62,15 +62,14 @@ const fallbackOptions = [
  * - Ethereum (Chain ID: 1) - Ethereum mainnet
  * - BSC (Chain ID: 56) - Conditional support for MP app IDs
  */
-function useDepositAddressOptions({ trpc, usdRequired, mode, payParams, }) {
+function useDepositAddressOptions({ trpc, usdRequired, payParams, }) {
     const { data, isLoading, error } = useQuery({
-        enabled: usdRequired != null && usdRequired > 0 && mode != null,
-        queryKey: ["depositAddressOptions", usdRequired, mode],
+        enabled: usdRequired != null && usdRequired > 0,
+        queryKey: ["depositAddressOptions", usdRequired],
         queryFn: async () => {
             try {
                 return await trpc.getDepositAddressOptions.query({
-                    usdRequired,
-                    mode,
+                    usdRequired: usdRequired,
                 });
             }
             catch (err) {
@@ -86,26 +85,17 @@ function useDepositAddressOptions({ trpc, usdRequired, mode, payParams, }) {
     // Memoized configuration for deposit address options
     const filteredOptions = useMemo(() => {
         const options = data ?? [];
-        if (payParams?.preferredTokens && payParams?.preferredTokens.length > 0) {
-            // Address match: token addresses can differ in casing between the SDK
-            // token registry (EVM natives stored lowercase) and the API response
-            // (EIP-55 checksummed), so a strict `===` drops native ETH/POL/BNB
-            // deposit options. Normalize per-chain: EVM lowercase, Solana/Stellar
-            // case-sensitive.
-            const normalize = (chainId, addr) => normalizeTokenAddress(chainId, addr) ?? addr;
-            const preferred = new Set(payParams.preferredTokens.map((pt) => `${pt.chainId}:${normalize(pt.chainId, pt.token)}`));
-            return options.filter((option) => preferred.has(`${option.token.chainId}:${normalize(option.token.chainId, option.token.token)}`));
+        if (payParams?.preferredTokens && payParams.preferredTokens.length > 0) {
+            return options.filter((option) => payParams.preferredTokens?.some((pt) => pt.token != null &&
+                normalizeTokenAddress(option.token.chainId, pt.token) ===
+                    normalizeTokenAddress(option.token.chainId, option.token.token)));
         }
         return options;
     }, [data, payParams?.preferredTokens]);
     return {
         options: filteredOptions,
         loading: isLoading,
-        error: error
-            ? error instanceof Error
-                ? error.message
-                : "Failed to load deposit address options"
-            : null,
+        error: error ? String(error) : null,
     };
 }
 

package/build/src/hooks/useDepositAddressOptions.js.map

@@ -1 +1 @@
-{"version":3,"file":"useDepositAddressOptions.js","sources":["../../../src/hooks/useDepositAddressOptions.ts"],"sourcesContent":[null],"names":[],"mappings":"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"}
+{"version":3,"file":"useDepositAddressOptions.js","sources":["../../../src/hooks/useDepositAddressOptions.ts"],"sourcesContent":[null],"names":[],"mappings":"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"}

package/build/src/hooks/usePaymentState.js

@@ -1,11 +1,10 @@
-import { ExternalPaymentOptions, rozoStellar, TokenSymbol, assert, isNativeToken, getPayment, checkoutPayment, buildCheckoutPayload, createPayment, debugJson, formatPaymentResponseToHydratedOrder, bscUSDT, assertNotNull, isValidSolanaAddress, solanaSOL, stellarXLM, rozoStellarUSDC, rozoStellarEURC, solana, rozoSolana, stellar, FeeType, getChainById, getKnownToken, generateSolanaDeepLink, generateEVMDeepLink, writeRozoPayOrderID } from '@rozoai/intent-common';
+import { ExternalPaymentOptions, rozoStellar, TokenSymbol, assert, getPayment, checkoutPayment, buildCheckoutPayload, createPayment, debugJson, formatPaymentResponseToHydratedOrder, bscUSDT, assertNotNull, isValidSolanaAddress, rozoSolanaUSDC, rozoStellarUSDC, rozoStellarEURC, solana, rozoSolana, stellar, getChainById, getKnownToken, generateSolanaDeepLink, generateEVMDeepLink, writeRozoPayOrderID } from '@rozoai/intent-common';
 import { useWallet, useConnection } from '@solana/wallet-adapter-react';
-import { VersionedTransaction, PublicKey, SystemProgram, Transaction } from '@solana/web3.js';
+import { VersionedTransaction, PublicKey, Transaction } from '@solana/web3.js';
 import { useRef, useState, useEffect, useCallback, useMemo } from 'react';
-import { getAddress, erc20Abi, hexToBytes, parseUnits } from 'viem';
+import { parseUnits, zeroAddress, getAddress, erc20Abi, hexToBytes } from 'viem';
 import { useAccount, useSwitchChain, useSendTransaction, useWriteContract, useWalletClient, useCapabilities } from 'wagmi';
 import { useWriteContracts } from 'wagmi/experimental';
-import { tokenBaseAmountToDecimalString, tokenAmountToBaseUnits } from '../utils/format.js';
 import { convertPreferredSymbolsToTokens } from '../utils/token.js';
 import { createMemoInstruction } from '@solana/spl-memo';
 import { getAssociatedTokenAddress, createAssociatedTokenAccountInstruction, TOKEN_PROGRAM_ID, createTransferCheckedInstruction } from '@solana/spl-token';
@@ -53,7 +52,7 @@ function usePaymentState({ trpc, lockPayParams, setRoute, log, redirectReturnUrl
     const { data: walletClient } = useWalletClient();
     const { data: walletCapabilities, isPending: capabilitiesPending } = useCapabilities();
     const { writeContractsAsync } = useWriteContracts();
-    // order.metadata.dataSuffix survives ROZO_INVOICE_URL redirects where the
+    // ponytail: order.metadata.dataSuffix survives ROZO_INVOICE_URL redirects where the
     // consumer's wagmi config (globalDataSuffix) is absent. Invoice checkout fetches the
     // order first and passes metadata.dataSuffix into getDefaultConfig, but this fallback
     // covers the in-SDK path where the order is already loaded.
@@ -162,26 +161,12 @@ function usePaymentState({ trpc, lockPayParams, setRoute, log, redirectReturnUrl
         }
         // payId mode: derive filtering params from the loaded order so that
         // payment option hooks apply the same token filtering as appId mode.
-        // e.g. if destination is USDC, allow paying with USDC/USDT/native tokens
-        // (we don't support payout to native tokens yet, but paying *with* native
-        // source balances is fine). EURC destinations are payable only with EURC.
+        // e.g. if destination is USDC, only show USDC/USDT sources (not EURC).
         if (pay.order && pay.order.destFinalCallTokenAmount) {
             const destSymbol = pay.order.destFinalCallTokenAmount.token.symbol;
-            // Derive preferredSymbol from destination: EURC destinations must be
-            // paid with EURC only. Everything else defaults to USDC + USDT plus
-            // native tokens as payable sources (payout is still fixed to
-            // toChain/toToken and never native).
-            const preferredSymbol = destSymbol === TokenSymbol.EURC
-                ? [TokenSymbol.EURC]
-                : [
-                    TokenSymbol.USDC,
-                    TokenSymbol.USDT,
-                    TokenSymbol.ETH,
-                    TokenSymbol.BNB,
-                    TokenSymbol.POL,
-                    TokenSymbol.SOL,
-                    TokenSymbol.XLM,
-                ];
+            // Derive preferredSymbol from destination: EURC destinations show EURC,
+            // everything else defaults to USDC + USDT.
+            const preferredSymbol = destSymbol === TokenSymbol.EURC ? [TokenSymbol.EURC] : [TokenSymbol.USDC, TokenSymbol.USDT];
             const preferredTokens = convertPreferredSymbolsToTokens(preferredSymbol, undefined);
             return {
                 toChain: pay.order.destFinalCallTokenAmount.token.chainId,
@@ -229,7 +214,6 @@ function usePaymentState({ trpc, lockPayParams, setRoute, log, redirectReturnUrl
     const depositAddressOptions = useDepositAddressOptions({
         trpc,
         usdRequired,
-        mode: pay.order?.mode,
         payParams: stablePayParams,
     });
     const chainOrderUsdLimits = useOrderUsdLimits({ trpc });
@@ -269,14 +253,15 @@ function usePaymentState({ trpc, lockPayParams, setRoute, log, redirectReturnUrl
         // Read from ref instead of closure to get latest value and avoid stale state
         const payParams = currPayParamsRef.current;
         const order = pay.order;
+        // Narrow order to the specific shapes supported by buildCreatePaymentPayload.
+        // In error/idle states `pay.order` can be a plain RozoPayOrder or null,
+        // which is not assignable to the expected OrderLike type.
+        const orderForPayload = order && "org" in order
+            ? order
+            : undefined;
         // If payment already exists (payId mode or rozoPaymentId set), checkout instead of create.
-        // backend forbids `checkout` when rotating to a native source token
-        // (SOL/ETH/XLM) — "create a new order instead" — so route native sources to the
-        // create branch below instead of calling checkout.
         const existingPayId = order?.externalId ?? rozoPaymentId ?? undefined;
-        const rotateToNative = walletOption != null && isNativeToken(walletOption.required.token.token);
-        const shouldCheckout = !!existingPayId && !rotateToNative;
-        if (!payParams || shouldCheckout) {
+        if (!payParams || existingPayId) {
             if (!existingPayId) {
                 throw new Error("No pay params provided");
             }
@@ -285,20 +270,11 @@ function usePaymentState({ trpc, lockPayParams, setRoute, log, redirectReturnUrl
                 if (!paymentRes?.data) {
                     throw new Error("Failed to fetch payment");
                 }
-                // Use required.amount (base units, already priced by the backend)
-                // converted to a human-readable token amount — NOT required.usd,
-                // which only equals the token amount for 1:1-USD-pegged tokens
-                // (USDC/USDT). For native ETH/BNB/POL/SOL/XLM this would send the
-                // wrong amount to the backend (e.g. "1.00" instead of "0.0005").
-                // Some endpoints return required.amount as an already-human-readable
-                // decimal string instead of integer base units, so detect the shape
-                // first — BigInt() throws on decimal strings.
-                const sourceAmount = tokenBaseAmountToDecimalString(walletOption.required.amount, walletOption.required.token.decimals);
                 const checkoutRes = await checkoutPayment(existingPayId, buildCheckoutPayload(paymentRes.data, {
                     chainId: walletOption.required.token.chainId,
                     tokenSymbol: walletOption.required.token.symbol,
                     tokenAddress: walletOption.required.token.token,
-                    amount: sourceAmount,
+                    amount: String(walletOption.required.usd),
                 }));
                 if (!checkoutRes?.data) {
                     throw new Error("Failed to checkout payment");
@@ -317,14 +293,6 @@ function usePaymentState({ trpc, lockPayParams, setRoute, log, redirectReturnUrl
             }
         }
         try {
-            // Narrow order to the specific shapes supported by buildCreatePaymentPayload.
-            // In error/idle states `pay.order` can be a plain RozoPayOrder or null,
-            // which lacks `destFinalCallTokenAmount`; passing it through would throw
-            // when we derive the destination amount. Fall back to the payParams-only
-            // branch (order undefined) in that case.
-            const orderForPayload = order && "org" in order
-                ? order
-                : undefined;
             const payload = buildCreatePaymentPayload({
                 payParams,
                 order: orderForPayload,
@@ -365,11 +333,9 @@ function usePaymentState({ trpc, lockPayParams, setRoute, log, redirectReturnUrl
         if (!validatePaymentRequirements(walletOption, pay.paymentState)) {
             throw new Error(`[PAY TOKEN] required token ${debugJson(required)} does not match fees token ${debugJson(fees)}`);
         }
-        // Use required.amount (base units, already priced by the backend) —
-        // NOT required.usd, which only equals the token amount for 1:1-USD-pegged
-        // tokens (USDC/USDT). For native ETH/BNB/POL this would send the wrong
-        // amount (e.g. 1.00 ETH instead of ~0.0006 ETH for a $1 payment).
-        const paymentAmount = tokenAmountToBaseUnits(required.amount, required.token.decimals);
+        // @NOTE: Fee handled by Rozo API
+        // const paymentAmount = BigInt(required.amount) + BigInt(fees.amount);
+        const paymentAmount = parseUnits(required.usd.toString(), required.token.decimals);
         // Check if we need to create a new Rozo payment (cache this check)
         const previousChainId = pay.order.preferredChainId ? Number(pay.order.preferredChainId) : null;
         // If we have an existing payment and chain differs, MUST create new payment
@@ -381,11 +347,8 @@ function usePaymentState({ trpc, lockPayParams, setRoute, log, redirectReturnUrl
                 pay.order.destFinalCallTokenAmount?.token?.chainId !== required.token.chainId);
         log?.(`[PAY TOKEN] Chain check: previous=${previousChainId}, current=${required.token.chainId}, hasExistingPayment=${hasExistingPayment}, needRozoPayment=${needRozoPayment}`);
         // Prepare transaction parameters early (before async operations)
-        // Case-insensitive native detection: `required.token.token` is checksummed
-        // (from the API) while viem's `ethAddress` is lowercase, so a direct `===`
-        // would misclassify native ETH as an ERC20 and take the wrong transfer path.
-        const isNative = isNativeToken(required.token.token);
-        const tokenAddress = isNative ? null : getAddress(required.token.token);
+        const isNativeToken = required.token.token === zeroAddress;
+        const tokenAddress = isNativeToken ? null : getAddress(required.token.token);
         // Get hydrated order efficiently with parallel preparation
         let hydratedOrder;
         let paymentId;
@@ -482,14 +445,7 @@ function usePaymentState({ trpc, lockPayParams, setRoute, log, redirectReturnUrl
         // Execute transaction with optimized error handling
         const paymentTxHash = await (async () => {
             try {
-                if (required.token.chainId !== bscUSDT.chainId) {
-                    await switchChainAsync({ chainId: required.token.chainId });
-                }
-                log?.(`[PAY ERC20] dataSuffix: ${resolvedDataSuffix ?? "(none)"}`);
-                // EIP-5792 path: only when wallet advertises dataSuffix capability (Base App / Coinbase Wallet).
-                const chainCapabilities = walletCapabilities?.[required.token.chainId];
-                const supportsDataSuffix = !capabilitiesPending && resolvedDataSuffix != null && !!chainCapabilities?.dataSuffix;
-                if (isNative) {
+                if (isNativeToken) {
                     // dataSuffix intentionally omitted — appending data to bare ETH transfers
                     // changes wallet UI display; builder-code attribution targets contract calls.
                     return await sendTransactionAsync({
@@ -498,6 +454,13 @@ function usePaymentState({ trpc, lockPayParams, setRoute, log, redirectReturnUrl
                     });
                 }
                 else {
+                    if (required.token.chainId !== bscUSDT.chainId) {
+                        await switchChainAsync({ chainId: required.token.chainId });
+                    }
+                    log?.(`[PAY ERC20] dataSuffix: ${resolvedDataSuffix ?? "(none)"}`);
+                    // EIP-5792 path: only when wallet advertises dataSuffix capability (Base App / Coinbase Wallet).
+                    const chainCapabilities = walletCapabilities?.[required.token.chainId];
+                    const supportsDataSuffix = !capabilitiesPending && resolvedDataSuffix != null && !!chainCapabilities?.dataSuffix;
                     if (supportsDataSuffix) {
                         if (!walletClient)
                             throw new Error("No walletClient available");
@@ -630,9 +593,11 @@ function usePaymentState({ trpc, lockPayParams, setRoute, log, redirectReturnUrl
                 throw new Error(`Invalid Solana destination address format: ${rozoPayment.destAddress}`);
             }
             // Set up token addresses
+            let mintAddress;
             let fromKey;
             let toKey;
             try {
+                mintAddress = new PublicKey(walletPaymentOption.required.token.token);
                 fromKey = new PublicKey(payerPublicKey);
                 toKey = new PublicKey(rozoPayment.destAddress);
             }
@@ -640,77 +605,32 @@ function usePaymentState({ trpc, lockPayParams, setRoute, log, redirectReturnUrl
                 throw new Error(`Invalid Solana address format: ${error.message}. ` +
                     `Destination address: ${rozoPayment.destAddress}`);
             }
-            const isNativeSol = walletPaymentOption.required.token.token === solanaSOL.token;
-            if (isNativeSol) {
-                if (!rozoPayment.sourceAmount) {
-                    throw new Error("Source amount is required for native SOL payment");
-                }
-                // Native SOL: plain lamport transfer, no token account / mint involved.
-                // Use required.amount (already computed by the backend in lamports,
-                // correctly priced from USD via the live SOL/USD rate) instead of
-                // re-deriving from required.usd, which would incorrectly treat SOL
-                // as pegged 1:1 to USD.
-                log("[PAY SOLANA] Transaction details (native SOL):", {
-                    fromKey: fromKey.toString(),
-                    toKey: toKey.toString(),
-                    amount: walletPaymentOption.required.amount,
-                    usd: walletPaymentOption.required.usd,
-                    memo: rozoPayment.memo,
-                });
-                // Keep as bigint — SystemProgram.transfer accepts number | bigint.
-                // Converting to Number would lose precision for amounts > 2^53 base units.
-                const lamports = tokenAmountToBaseUnits(walletPaymentOption.required.amount, solanaSOL.decimals);
-                log("[PAY SOLANA] Transfer amount (lamports):", lamports.toString());
-                instructions.push(SystemProgram.transfer({
-                    fromPubkey: fromKey,
-                    toPubkey: toKey,
-                    lamports: parseUnits(rozoPayment.sourceAmount, solanaSOL.decimals),
-                }));
-            }
-            else {
-                let mintAddress;
-                try {
-                    mintAddress = new PublicKey(walletPaymentOption.required.token.token);
-                }
-                catch (error) {
-                    throw new Error(`Invalid Solana address format: ${error.message}. ` +
-                        `Destination address: ${rozoPayment.destAddress}`);
-                }
-                log("[PAY SOLANA] Transaction details:", {
-                    tokenMint: mintAddress.toString(),
-                    fromKey: fromKey.toString(),
-                    toKey: toKey.toString(),
-                    amount: walletPaymentOption.required.amount,
-                    usd: walletPaymentOption.required.usd,
-                    memo: rozoPayment.memo,
-                });
-                // Get token accounts for sender and recipient
-                log("[PAY SOLANA] Deriving associated token accounts...");
-                const senderTokenAccount = await getAssociatedTokenAddress(mintAddress, fromKey);
-                const recipientTokenAccount = await getAssociatedTokenAddress(mintAddress, toKey);
-                log("[PAY SOLANA] Sender token account:", senderTokenAccount.toString());
-                log("[PAY SOLANA] Recipient token account:", recipientTokenAccount.toString());
-                // Check if recipient token account exists
-                log("[PAY SOLANA] Checking if recipient token account exists...");
-                const recipientTokenInfo = await connection.getAccountInfo(recipientTokenAccount);
-                // Create recipient token account if it doesn't exist
-                if (!recipientTokenInfo) {
-                    log("[PAY SOLANA] Creating recipient token account...");
-                    instructions.push(createAssociatedTokenAccountInstruction(payerPublicKey, recipientTokenAccount, toKey, mintAddress, TOKEN_PROGRAM_ID));
-                }
-                // Add transfer instruction
-                // Use required.amount (already computed by the backend in the
-                // token's base units, correctly priced from USD) instead of
-                // re-deriving from required.usd with a hardcoded 6-decimal
-                // assumption, which silently breaks for non-1:1-USD or
-                // differently-decimaled SPL tokens.
-                log("[PAY SOLANA] Adding transfer instruction...");
-                // Keep as bigint — createTransferCheckedInstruction accepts number | bigint.
-                // Converting to Number would lose precision for amounts > 2^53 base units.
-                const transferAmount = tokenAmountToBaseUnits(walletPaymentOption.required.amount, walletPaymentOption.required.token.decimals);
-                log("[PAY SOLANA] Transfer amount (base units):", transferAmount.toString());
-                instructions.push(createTransferCheckedInstruction(senderTokenAccount, mintAddress, recipientTokenAccount, fromKey, transferAmount, walletPaymentOption.required.token.decimals));
+            log("[PAY SOLANA] Transaction details:", {
+                tokenMint: mintAddress.toString(),
+                fromKey: fromKey.toString(),
+                toKey: toKey.toString(),
+                amount: walletPaymentOption.required.usd,
+                memo: rozoPayment.memo,
+            });
+            // Get token accounts for sender and recipient
+            log("[PAY SOLANA] Deriving associated token accounts...");
+            const senderTokenAccount = await getAssociatedTokenAddress(mintAddress, fromKey);
+            const recipientTokenAccount = await getAssociatedTokenAddress(mintAddress, toKey);
+            log("[PAY SOLANA] Sender token account:", senderTokenAccount.toString());
+            log("[PAY SOLANA] Recipient token account:", recipientTokenAccount.toString());
+            // Check if recipient token account exists
+            log("[PAY SOLANA] Checking if recipient token account exists...");
+            const recipientTokenInfo = await connection.getAccountInfo(recipientTokenAccount);
+            // Create recipient token account if it doesn't exist
+            if (!recipientTokenInfo) {
+                log("[PAY SOLANA] Creating recipient token account...");
+                instructions.push(createAssociatedTokenAccountInstruction(payerPublicKey, recipientTokenAccount, toKey, mintAddress, TOKEN_PROGRAM_ID));
             }
+            // Add transfer instruction
+            log("[PAY SOLANA] Adding transfer instruction...");
+            const transferAmount = parseFloat(walletPaymentOption.required.usd.toString()) * 1_000_000;
+            log("[PAY SOLANA] Transfer amount (with decimals):", transferAmount);
+            instructions.push(createTransferCheckedInstruction(senderTokenAccount, mintAddress, recipientTokenAccount, fromKey, transferAmount, rozoSolanaUSDC.decimals));
             // Add memo if provided
             if (rozoPayment.memo) {
                 log("[PAY SOLANA] Adding memo instruction:", rozoPayment.memo);
@@ -773,29 +693,18 @@ function usePaymentState({ trpc, lockPayParams, setRoute, log, redirectReturnUrl
                 await setStellarWallet(stellarConnector);
             }
             const sourceAccount = await stellarServer.loadAccount(stellarPublicKey);
-            let destAsset;
-            if (walletPaymentOption.required.token.token === stellarXLM.token) {
-                destAsset = Asset.native();
-            }
-            else if (walletPaymentOption.required.token.token === rozoStellarUSDC.token) {
-                destAsset = new Asset(walletPaymentOption.required.token.symbol, rozoStellarUSDC.token.split(":")[1]);
+            let issuer = "";
+            if (walletPaymentOption.required.token.token === rozoStellarUSDC.token) {
+                issuer = rozoStellarUSDC.token.split(":")[1];
             }
             else if (walletPaymentOption.required.token.token === rozoStellarEURC.token) {
-                destAsset = new Asset(walletPaymentOption.required.token.symbol, rozoStellarEURC.token.split(":")[1]);
+                issuer = rozoStellarEURC.token.split(":")[1];
             }
             else {
                 throw new Error("Unsupported token");
             }
+            const destAsset = new Asset(walletPaymentOption.required.token.symbol, issuer);
             const fee = String(await stellarServer.fetchBaseFee());
-            // Use required.amount (base units, already priced by the backend)
-            // converted to a human-readable token amount — NOT required.usd,
-            // which only equals the token amount for 1:1-USD-pegged tokens
-            // (USDC/EURC). For native XLM this would send the wrong amount
-            // (e.g. "1.00" XLM instead of the correct ~2.7 XLM for a $1 payment).
-            // Some endpoints return required.amount as an already-human-readable
-            // decimal string instead of integer base units, so detect the shape
-            // first — BigInt() throws on decimal strings.
-            const paymentAmount = tokenBaseAmountToDecimalString(walletPaymentOption.required.amount, walletPaymentOption.required.token.decimals);
             // Build transaction
             const transaction = new TransactionBuilder(sourceAccount, {
                 fee,
@@ -804,7 +713,7 @@ function usePaymentState({ trpc, lockPayParams, setRoute, log, redirectReturnUrl
                 .addOperation(Operation.payment({
                 destination: destinationAddress,
                 asset: destAsset,
-                amount: paymentAmount,
+                amount: String(walletPaymentOption.required.usd),
             }))
                 .setTimeout(180);
             if (rozoPayment.memo) {
@@ -879,29 +788,17 @@ function usePaymentState({ trpc, lockPayParams, setRoute, log, redirectReturnUrl
             }
             else {
                 log?.("[PAY DEPOSIT ADDRESS] hydrating order");
-                // hydrateOrder needs required.amount so buildCreatePaymentPayload
-                // can set preferredAmountUnits. For BOTH native (SOL/ETH/XLM) and
-                // 1:1-USD-pegged sources, the amount must come from the fee response
-                // (BE-computed source amount in source units, fee-inclusive) — NOT the
-                // destination USD value. Otherwise tokenBaseAmountToDecimalString
-                // formats the toUnits through the source decimals and the BE rejects
-                // the underflowing pay-in (e.g. "10" with 6 decimals → "0.00001").
-                const isNativeSource = isNativeToken(option.token.token);
-                const sourceAmountUnits = String(fees?.source?.amount ??
-                    (isNativeSource ? "" : (pay.order?.destFinalCallTokenAmount?.usd ?? "0")));
-                if (isNativeSource && sourceAmountUnits === "") {
-                    throw new Error("Fee source amount required for native token deposit");
-                }
-                const actualFeeType = payParams?.feeType ?? FeeType.ExactIn;
                 const result = await pay.hydrateOrder(undefined, {
                     required: {
-                        amount: sourceAmountUnits,
-                        token: option.token,
+                        token: {
+                            token: option.token.token,
+                            chainId: option.token.chainId,
+                        },
                     },
                     fees: {
                         usd: fees?.source?.fee != null ? parseFloat(fees.source.fee) : 0,
                     },
-                }, actualFeeType);
+                });
                 order = result.order;
             }
             log?.(`[PAY DEPOSIT ADDRESS] hydrated order ${order.id} for ${order.usdValue} USD, checking out with deposit address: ${option}`);
@@ -918,23 +815,12 @@ function usePaymentState({ trpc, lockPayParams, setRoute, log, redirectReturnUrl
             if (!preferredToken) {
                 throw new Error("Preferred token not found");
             }
-            // Amount the user must send, in source-token units. Prefer the backend's
-            // source.amount (surfaced via metadata by formatPaymentResponseToHydratedOrder)
-            // over usdValue: for native sources (SOL/ETH/XLM) the source amount differs
-            // from the USD/destination value, so usdValue would show e.g. "1.3 SOL"
-            // instead of the correct ~0.0169 SOL. For 1:1-USD sources they coincide.
-            const isNativeDepositSource = isNativeToken(option.token.token);
-            const metaSourceAmount = order.metadata?.sourceAmountUnits;
-            if (isNativeDepositSource && metaSourceAmount == null) {
-                throw new Error("sourceAmountUnits missing on hydrated order for native deposit source");
-            }
-            const sourceAmountUnits = metaSourceAmount != null ? String(metaSourceAmount) : String(order.usdValue);
             let uriDeeplink = null;
             // Use Solana deep link if it's a Solana chain.
             // Solana pay-in no longer requires a memo.
             if ([solana.chainId, rozoSolana.chainId].includes(preferredToken.chainId)) {
                 uriDeeplink = generateSolanaDeepLink({
-                    amountUnits: sourceAmountUnits,
+                    amountUnits: order.destFinalCallTokenAmount.usd.toString(),
                     recipientAddress: order.intentAddr,
                     tokenAddress: preferredToken.token,
                 });
@@ -946,7 +832,7 @@ function usePaymentState({ trpc, lockPayParams, setRoute, log, redirectReturnUrl
             // Otherwise use EVM deep link
             else {
                 uriDeeplink = generateEVMDeepLink({
-                    amountUnits: parseUnits(sourceAmountUnits, preferredToken.decimals).toString(),
+                    amountUnits: parseUnits(order.destFinalCallTokenAmount.usd.toString(), preferredToken.decimals).toString(),
                     chainId: preferredToken.chainId,
                     recipientAddress: order.intentAddr,
                     tokenAddress: preferredToken.token,
@@ -954,7 +840,7 @@ function usePaymentState({ trpc, lockPayParams, setRoute, log, redirectReturnUrl
             }
             return {
                 address: order.intentAddr,
-                amount: sourceAmountUnits,
+                amount: String(order.usdValue),
                 suffix: `${option.token.symbol} ${chain.name}`,
                 uri: uriDeeplink ?? "",
                 expirationS: Math.floor(Date.now() / 1000) + 300,
@@ -969,7 +855,7 @@ function usePaymentState({ trpc, lockPayParams, setRoute, log, redirectReturnUrl
                 order: pay.order,
                 message,
             });
-            return undefined;
+            return null;
         }
         finally {
             // Remove from processing set when done (allow retries after completion/failure)