0xtrails 0.8.2 → 0.8.3

package/src/widget/hooks/useQuote.ts

@@ -1,7 +1,8 @@
 import { useQuery } from "@tanstack/react-query"
-import { useRef } from "react"
+import { useRef, useMemo, useState, useEffect } from "react"
 import type { TransactionReceipt } from "viem"
-import { zeroAddress, erc20Abi } from "viem"
+import { zeroAddress, erc20Abi, parseUnits } from "viem"
+import { etherlink } from "viem/chains"
 import { useIndexerGatewayClient } from "../../indexerClient.js"
 import { getTokenBalancesWithPrices } from "../../tokenBalances.js"
 import { logger } from "../../logger.js"
@@ -14,12 +15,14 @@ import { prepareSend } from "../../prepareSend.js"
 import { abortControllerRegistry } from "../../abortController.js"
 import { TradeType } from "../../prepareSend.js"
 import { getChainInfo, useChainRpcClient } from "../../chains.js"
+import { getIsContract } from "../../contractUtils.js"
 import type { IntentTransaction } from "@0xtrails/api"
 import type { PrepareSendOptions } from "../../transactionIntent/types.js"
 import type { Chain } from "../../chains.js"
 import type { Token } from "../../tokens.js"
 import type { TransactionState } from "../../transactions.js"
 import type { PrepareSendFees } from "../../prepareSend.js"
+import type { TrailsFeeBreakdown } from "../../fees.js"
 import { getTokenPrice } from "../../prices.js"
 import { useCommitIntent, useExecuteIntent } from "../../mutations.js"
 import type { CheckoutOnHandlers } from "./useCheckout.js"
@@ -30,7 +33,7 @@ import type { FeeOption, RouteProvider } from "@0xtrails/api"
  *
  * All parameters are optional, but the hook will not fetch a quote until all required
  * parameters are provided (walletClient, fromTokenAddress, fromChainId, toTokenAddress,
- * toChainId, swapAmount, toRecipient).
+ * toChainId, swapAmount, toAddress).
  */
 export type UseQuoteProps = {
   /** The wallet client from wagmi (e.g., from `useWalletClient()`). Required for quote fetching. */
@@ -48,6 +51,10 @@ export type UseQuoteProps = {
   /** The amount to swap, as a string or bigint in the token's smallest unit (wei/smallest unit). For example, 1 USDC (6 decimals) = '1000000'. */
   swapAmount?: string | bigint
   /** The recipient address for the destination token. */
+  toAddress?: string | null
+  /**
+   * @deprecated Use `toAddress` instead. This will be removed in a future version.
+   */
   toRecipient?: string | null
   /** The trade type: `TradeType.EXACT_INPUT` (you specify input amount) or `TradeType.EXACT_OUTPUT` (you specify output amount). Defaults to `EXACT_OUTPUT`. */
   tradeType?: TradeType | null
@@ -100,6 +107,8 @@ export type UseQuoteProps = {
   nodeGatewayEnv?: "prod" | "dev" | "local" | "cors-anywhere"
   /** Optional flag to indicate if the wallet is a smart wallet. */
   isSmartWallet?: boolean | null
+  /** Optional fund method (e.g., 'wallet', 'qr-code', 'exchange'). Used to determine default balance for external deposit flows. */
+  fundMethod?: string | null
 }
 
 /**
@@ -138,10 +147,31 @@ export type RouteProviderInfo = {
  * and other relevant information for displaying to the user.
  */
 export type Quote = {
+  // Kept for backward compatibility (use origin*/destination* versions)
   fromAmount: string
   fromAmountMin: string
   toAmount: string
   toAmountMin: string
+  fromAmountUsdDisplay: string
+  toAmountUsdDisplay: string
+  // PrepareSendQuote compatible names
+  originAmount: string
+  originAmountMin: string
+  destinationAmount: string
+  destinationAmountMin: string
+  originAmountUsdDisplay: string
+  destinationAmountUsdDisplay: string
+  originAmountDisplay: string
+  destinationAmountDisplay: string
+  originAmountMinDisplay: string
+  originAmountMinUsdFormatted: string
+  originAmountMinUsdDisplay: string
+  destinationAmountMinDisplay: string
+  destinationAmountMinUsdFormatted: string
+  destinationAmountMinUsdDisplay: string
+  originAmountUsdFormatted: string
+  destinationAmountUsdFormatted: string
+  // Common fields
   originToken: Token
   destinationToken: Token
   originChain: Chain
@@ -149,38 +179,65 @@ export type Quote = {
   fees: PrepareSendFees
   slippageTolerance: string
   priceImpact: string
-  priceImpactUsd?: string
-  priceImpactUsdDisplay?: string
+  priceImpactUsd: string | null
+  priceImpactUsdDisplay: string
   completionEstimateSeconds: number
-  transactionStates?: TransactionState[]
-  originTokenRate?: string
-  routeProviders?: RouteProviderInfo[]
-  destinationTokenRate?: string
-  fromAmountUsdDisplay?: string
-  toAmountUsdDisplay?: string
-  gasCostUsd?: number
-  gasCostUsdDisplay?: string
-  gasCost?: string
-  gasCostFormatted?: string
-  totalFeesUsd?: number
-  totalFeesUsdDisplay?: string
-  totalGasUsd?: number
-  totalGasUsdDisplay?: string
-  allProviderFeesUsd?: number
-  allProviderFeesUsdDisplay?: string
+  completionEstimateDisplay: string
+  transactionStates: TransactionState[]
+  originTokenRate: string
+  routeProviders: RouteProviderInfo[]
+  destinationTokenRate: string
+  gasCostUsd: number | null
+  gasCostUsdDisplay: string
+  gasCost: string
+  gasCostFormatted: string
+  totalFeesUsd: number | null
+  totalFeesUsdDisplay: string
+  totalGasUsd: number | null
+  totalGasUsdDisplay: string
+  intentId: string | null
+  originAmountFormatted: string
+  destinationAmountFormatted: string
+  originDepositAddress: string
+  destinationDepositAddress: string
+  destinationAddress: string
+  destinationCalldata: string
+  trailsFeeBreakdown: TrailsFeeBreakdown | null
+  originGasUsd: number | null
+  originGasUsdDisplay: string
+  destinationGasUsd: number | null
+  destinationGasUsdDisplay: string
+  providerFeeUsd: number | null
+  providerFeeUsdDisplay: string
+  trailsFeeUsd: number | null
+  trailsFeeUsdDisplay: string
+  totalProviderFeesUsd: number | null
+  totalProviderFeesUsdDisplay: string
+  noSufficientBalance: boolean
 }
 
 /**
  * Return type for the {@link useQuote} hook.
  *
- * Provides the quote data, swap function, loading state, error information,
+ * Provides the quote data, send function, loading state, error information,
  * and utility functions for managing the quote lifecycle.
  */
+export type SendOptions = {
+  /** Override the fee option for this transaction (e.g., pay gas in USDC instead of ETH). */
+  selectedFeeOption?: FeeOption | null
+  /** Callback called when the wallet signature is confirmed and transaction is submitted. */
+  onOriginSend?: () => void
+}
+
 export type UseQuoteReturn = {
-  /** The quote object with swap details, or `null` if not available. */
+  /** The quote object with transaction details, or `null` if not available. */
   quote: Quote | null
-  /** A function to execute the swap, or `null` if not available. Returns a Promise that resolves to swap result with transaction receipts. */
-  swap: (() => Promise<SwapReturn | null>) | null
+  /** A function to execute the transaction, or `null` if not available. Returns a Promise that resolves to transaction result with receipts. Accepts optional SendOptions to override fee option. */
+  send: ((options?: SendOptions) => Promise<SwapReturn | null>) | null
+  /**
+   * @deprecated Use `send` instead. This will be removed in a future version.
+   */
+  swap: ((options?: SendOptions) => Promise<SwapReturn | null>) | null
   /** Boolean indicating if a quote is currently being fetched. */
   isLoadingQuote: boolean
   /** Any error that occurred while fetching the quote, or `null`. */
@@ -191,6 +248,14 @@ export type UseQuoteReturn = {
   refetchQuote: () => void
   /** Function to abort any in-flight quote requests. */
   abort: () => void
+  /** Fee options available for this quote (e.g., pay gas in different tokens). */
+  feeOptions: FeeOption[]
+  /** Whether the recipient address is a contract (null if not yet checked). */
+  isRecipientContract: boolean | null
+  /** Whether the sender address is a contract on the origin chain (null if not yet checked). */
+  isSenderContractOnOrigin: boolean | null
+  /** Whether the sender address is a contract on the destination chain (null if not yet checked). */
+  isSenderContractOnDestination: boolean | null
 }
 
 // TODO: consolidate useSendForm, prepareSend, and useQuote hooks into a single hook
@@ -213,7 +278,7 @@ export type UseQuoteReturn = {
  *   const { data: walletClient } = useWalletClient()
  *   const { address } = useAccount()
  *
- *   const { quote, swap, isLoadingQuote, quoteError, refetchQuote } = useQuote({
+ *   const { quote, send, isLoadingQuote, quoteError, refetchQuote } = useQuote({
  *     walletClient,
  *     fromTokenAddress: '0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48', // USDC
  *     fromChainId: 1, // Ethereum
@@ -221,7 +286,7 @@ export type UseQuoteReturn = {
  *     toChainId: 8453, // Base
  *     swapAmount: '1000000', // 1 USDC (6 decimals)
  *     tradeType: TradeType.EXACT_INPUT,
- *     toRecipient: address,
+ *     toAddress: address,
  *     slippageTolerance: '0.005', // 0.5%
  *     onStatusUpdate: (states) => {
  *       console.log('Transaction states:', states)
@@ -236,14 +301,14 @@ export type UseQuoteReturn = {
  *     return () => clearInterval(id)
  *   }, [refetchQuote])
  *
- *   const handleSwap = async () => {
- *     if (!swap) return
+ *   const handleSend = async () => {
+ *     if (!send) return
  *
  *     try {
- *       const result = await swap()
- *       console.log('Swap completed:', result)
+ *       const result = await send()
+ *       console.log('Transaction completed:', result)
  *     } catch (error) {
- *       console.error('Swap failed:', error)
+ *       console.error('Transaction failed:', error)
  *     }
  *   }
  *
@@ -255,7 +320,7 @@ export type UseQuoteReturn = {
  *     <div>
  *       <div>From: {quote.fromAmount} {quote.originToken.symbol}</div>
  *       <div>To: {quote.toAmount} {quote.destinationToken.symbol}</div>
- *       <button onClick={handleSwap}>Execute Swap</button>
+ *       <button onClick={handleSend}>Send</button>
  *     </div>
  *   )
  * }
@@ -269,7 +334,7 @@ export type UseQuoteReturn = {
  * @param props.toChainId - The chain ID of the destination chain
  * @param props.swapAmount - The amount to swap, as a string or bigint in the token's smallest unit (wei/smallest unit). For example, 1 USDC (6 decimals) = '1000000'
  * @param props.tradeType - The trade type: `TradeType.EXACT_INPUT` (you specify input amount) or `TradeType.EXACT_OUTPUT` (you specify output amount). Defaults to `EXACT_OUTPUT`
- * @param props.toRecipient - The recipient address for the destination token.
+ * @param props.toAddress - The recipient address for the destination token.
  * @param props.slippageTolerance - Slippage tolerance as a decimal string or number (e.g., '0.005' for 0.5%, '0.01' for 1%). Defaults to a reasonable value if not provided
  * @param props.toCalldata - Optional custom calldata for the destination chain. Used for executing arbitrary contract calls (e.g., swap and mint an NFT on destination chain)
  * @param props.onStatusUpdate - Optional callback function that receives transaction state updates during swap execution
@@ -284,8 +349,8 @@ export type UseQuoteReturn = {
  * @param props.isSmartWallet - Optional flag to indicate if the wallet is a smart wallet
  *
  * @returns An object containing:
- * - `quote` - The quote object with swap details, or `null` if not available
- * - `swap` - A function to execute the swap, or `null` if not available. Returns a Promise that resolves to swap result with transaction receipts
+ * - `quote` - The quote object with transaction details, or `null` if not available
+ * - `send` - A function to execute the transaction, or `null` if not available. Returns a Promise that resolves to transaction result with receipts
  * - `isLoadingQuote` - Boolean indicating if a quote is currently being fetched
  * - `quoteError` - Any error that occurred while fetching the quote, or `null`
  * - `quoteErrorPrettified` - A user-friendly error message string
@@ -312,6 +377,7 @@ export function useQuote({
   toChainId,
   swapAmount,
   tradeType,
+  toAddress,
   toRecipient,
   toCalldata,
   slippageTolerance,
@@ -325,7 +391,15 @@ export function useQuote({
   abortSignal: externalAbortSignal,
   apiKey,
   isSmartWallet,
+  fundMethod,
 }: Partial<UseQuoteProps> = {}): UseQuoteReturn {
+  // Handle deprecated toRecipient prop - prefer toAddress
+  if (toRecipient && !toAddress) {
+    logger.console.warn(
+      "[trails-sdk] [useQuote] Warning: 'toRecipient' is deprecated, use 'toAddress' instead",
+    )
+  }
+  const effectiveToAddress = toAddress ?? toRecipient
   // Set node gateway environment override for this quote session
   if (nodeGatewayEnv) {
     ;(globalThis as any).__testNodeGatewayEnv = nodeGatewayEnv
@@ -354,6 +428,15 @@ export function useQuote({
       })()
     : abortControllerRef.current.signal
 
+  // Debounce swapAmount to prevent excessive API calls while user is typing
+  const [debouncedSwapAmount, setDebouncedSwapAmount] = useState(swapAmount)
+  useEffect(() => {
+    const timer = setTimeout(() => {
+      setDebouncedSwapAmount(swapAmount)
+    }, 500)
+    return () => clearTimeout(timer)
+  }, [swapAmount])
+
   const { trailsApiKey, trailsApiUrl, sequenceIndexerUrl } = useTrails()
   // trailsApiKey is the same as sequenceProjectAccessKey
   const sequenceProjectAccessKey = trailsApiKey
@@ -374,6 +457,74 @@ export function useQuote({
   const commitIntentMutation = useCommitIntent()
   const executeIntentMutation = useExecuteIntent()
 
+  // Auto-detect swap/bridge provider for etherlink chains
+  const effectiveSwapProvider = useMemo((): RouteProvider | null => {
+    // Force lifi for etherlink chains when no provider specified
+    if (!swapProvider) {
+      if (fromChainId === etherlink.id || toChainId === etherlink.id) {
+        return "lifi" as RouteProvider
+      }
+    }
+    return swapProvider ?? null
+  }, [swapProvider, fromChainId, toChainId])
+
+  const effectiveBridgeProvider = useMemo((): RouteProvider | null => {
+    // Force lifi for etherlink chains when no provider specified
+    if (!bridgeProvider) {
+      if (fromChainId === etherlink.id || toChainId === etherlink.id) {
+        return "lifi" as RouteProvider
+      }
+    }
+    return bridgeProvider ?? null
+  }, [bridgeProvider, fromChainId, toChainId])
+
+  // Contract detection queries
+  const { data: isRecipientContract } = useQuery({
+    queryKey: ["isContract", "recipient", effectiveToAddress, toChainId],
+    queryFn: async () => {
+      if (!effectiveToAddress || !toChainId) return null
+      return getIsContract(effectiveToAddress as `0x${string}`, toChainId)
+    },
+    enabled: !!effectiveToAddress && !!toChainId,
+    staleTime: 60 * 1000, // Cache for 1 minute
+  })
+
+  const { data: isSenderContractOnOrigin } = useQuery({
+    queryKey: [
+      "isContract",
+      "senderOrigin",
+      walletClient?.account?.address,
+      fromChainId,
+    ],
+    queryFn: async () => {
+      if (!walletClient?.account?.address || !fromChainId) return null
+      return getIsContract(
+        walletClient.account.address as `0x${string}`,
+        fromChainId,
+      )
+    },
+    enabled: !!walletClient?.account?.address && !!fromChainId,
+    staleTime: 60 * 1000,
+  })
+
+  const { data: isSenderContractOnDestination } = useQuery({
+    queryKey: [
+      "isContract",
+      "senderDestination",
+      walletClient?.account?.address,
+      toChainId,
+    ],
+    queryFn: async () => {
+      if (!walletClient?.account?.address || !toChainId) return null
+      return getIsContract(
+        walletClient.account.address as `0x${string}`,
+        toChainId,
+      )
+    },
+    enabled: !!walletClient?.account?.address && !!toChainId,
+    staleTime: 60 * 1000,
+  })
+
   const { data, isLoading, error, refetch } = useQuery({
     queryKey: [
       "prepareSend",
@@ -381,8 +532,8 @@ export function useQuote({
       fromChainId,
       toTokenAddress,
       toChainId,
-      swapAmount?.toString(),
-      toRecipient,
+      debouncedSwapAmount?.toString(),
+      effectiveToAddress,
       toCalldata,
       tradeType,
       slippageTolerance,
@@ -390,6 +541,7 @@ export function useQuote({
       bridgeProvider,
       apiKey,
       isSmartWallet,
+      fundMethod,
     ],
     queryFn: async () => {
       try {
@@ -406,8 +558,8 @@ export function useQuote({
           !trailsClient ||
           !fromTokenAddress ||
           !toTokenAddress ||
-          !swapAmount ||
-          !toRecipient ||
+          !debouncedSwapAmount ||
+          !effectiveToAddress ||
           !fromChainId ||
           !toChainId ||
           !indexerGatewayClient
@@ -612,15 +764,22 @@ export function useQuote({
         const destinationTokenSymbol = destinationToken?.symbol ?? ""
         const originTokenSymbol = originToken?.symbol ?? ""
 
+        // For qr-code and exchange fund methods, use a default amount of 100 tokens
+        // since the user will deposit from an external wallet (their connected wallet balance may be 0)
+        const effectiveOriginTokenBalance =
+          fundMethod === "qr-code" || fundMethod === "exchange"
+            ? parseUnits("100", sourceTokenDecimals).toString()
+            : originTokenBalanceAmount
+
         const options: PrepareSendOptions = {
           account: walletClient.account!,
           originTokenAddress: fromTokenAddress,
           originChainId: fromChainId,
-          originTokenBalance: originTokenBalanceAmount,
+          originTokenBalance: effectiveOriginTokenBalance,
           destinationChainId: toChainId,
-          recipient: toRecipient,
+          recipient: effectiveToAddress,
           destinationTokenAddress: toTokenAddress,
-          swapAmount: swapAmount.toString(),
+          swapAmount: debouncedSwapAmount.toString(),
           tradeType: tradeType ?? TradeType.EXACT_OUTPUT,
           originTokenSymbol: originTokenSymbol,
           destinationTokenSymbol: destinationTokenSymbol,
@@ -629,12 +788,10 @@ export function useQuote({
           trailsClient,
           sourceTokenDecimals,
           destinationTokenDecimals,
-          fee: "0",
-          dryMode: false,
           onTransactionStateChange: onStatusUpdate ?? (() => {}),
           slippageTolerance: slippageTolerance?.toString(),
-          swapProvider: swapProvider,
-          bridgeProvider: bridgeProvider,
+          swapProvider: effectiveSwapProvider,
+          bridgeProvider: effectiveBridgeProvider,
           paymasterUrl: paymasterUrl,
           selectedFeeOption: selectedFeeOption ?? null,
           abortSignal: combinedAbortSignal,
@@ -649,57 +806,119 @@ export function useQuote({
           isSmartWallet: isSmartWallet ?? undefined,
           trailsApiKey,
           trailsApiUrl,
+          fundMethod: fundMethod ?? undefined,
         }
 
         logger.console.log("[trails-sdk] options", options)
 
-        const { quote: prepareSendQuote, send } = await prepareSend(options)
+        const {
+          quote: prepareSendQuote,
+          send: prepareSendSend,
+          feeOptions: prepareSendFeeOptions,
+        } = await prepareSend(options)
 
-        const quote = {
+        const quote: Quote = {
+          // Backward compatible fields
           fromAmount: prepareSendQuote.originAmount,
           toAmount: prepareSendQuote.destinationAmount,
           fromAmountMin: prepareSendQuote.originAmountMin,
           toAmountMin: prepareSendQuote.destinationAmountMin,
+          fromAmountUsdDisplay: prepareSendQuote.originAmountUsdDisplay ?? "",
+          toAmountUsdDisplay:
+            prepareSendQuote.destinationAmountUsdDisplay ?? "",
+          // PrepareSendQuote compatible fields
+          originAmount: prepareSendQuote.originAmount,
+          originAmountMin: prepareSendQuote.originAmountMin,
+          destinationAmount: prepareSendQuote.destinationAmount,
+          destinationAmountMin: prepareSendQuote.destinationAmountMin,
+          originAmountUsdDisplay: prepareSendQuote.originAmountUsdDisplay ?? "",
+          destinationAmountUsdDisplay:
+            prepareSendQuote.destinationAmountUsdDisplay ?? "",
+          originAmountDisplay: prepareSendQuote.originAmountDisplay ?? "",
+          destinationAmountDisplay:
+            prepareSendQuote.destinationAmountDisplay ?? "",
+          originAmountMinDisplay: prepareSendQuote.originAmountMinDisplay ?? "",
+          originAmountMinUsdFormatted:
+            prepareSendQuote.originAmountMinUsdFormatted ?? "",
+          originAmountMinUsdDisplay:
+            prepareSendQuote.originAmountMinUsdDisplay ?? "",
+          destinationAmountMinDisplay:
+            prepareSendQuote.destinationAmountMinDisplay ?? "",
+          destinationAmountMinUsdFormatted:
+            prepareSendQuote.destinationAmountMinUsdFormatted ?? "",
+          destinationAmountMinUsdDisplay:
+            prepareSendQuote.destinationAmountMinUsdDisplay ?? "",
+          originAmountUsdFormatted:
+            prepareSendQuote.originAmountUsdFormatted ?? "",
+          destinationAmountUsdFormatted:
+            prepareSendQuote.destinationAmountUsdFormatted ?? "",
+          // Common fields
           originToken: prepareSendQuote.originToken,
           destinationToken: prepareSendQuote.destinationToken,
           originChain: prepareSendQuote.originChain,
           destinationChain: prepareSendQuote.destinationChain,
           fees: prepareSendQuote.fees,
           priceImpact: prepareSendQuote.priceImpact,
-          priceImpactUsd: prepareSendQuote.priceImpactUsd ?? undefined,
-          priceImpactUsdDisplay:
-            prepareSendQuote.priceImpactUsdDisplay ?? undefined,
+          priceImpactUsd: prepareSendQuote.priceImpactUsd ?? null,
+          priceImpactUsdDisplay: prepareSendQuote.priceImpactUsdDisplay ?? "",
           completionEstimateSeconds: prepareSendQuote.completionEstimateSeconds,
+          completionEstimateDisplay:
+            prepareSendQuote.completionEstimateDisplay ?? "",
           slippageTolerance: prepareSendQuote.slippageTolerance,
-          transactionStates: prepareSendQuote.transactionStates,
-          originTokenRate: prepareSendQuote.originTokenRate,
-          destinationTokenRate: prepareSendQuote.destinationTokenRate,
-          routeProviders: prepareSendQuote.routeProviders,
-          fromAmountUsdDisplay:
-            prepareSendQuote.originAmountUsdDisplay ?? undefined,
-          toAmountUsdDisplay:
-            prepareSendQuote.destinationAmountUsdDisplay ?? undefined,
-          gasCostUsd: prepareSendQuote.gasCostUsd ?? undefined,
-          gasCostUsdDisplay: prepareSendQuote.gasCostUsdDisplay ?? undefined,
-          gasCost: prepareSendQuote.gasCost ?? undefined,
-          gasCostFormatted: prepareSendQuote.gasCostFormatted ?? undefined,
-          totalFeesUsd: prepareSendQuote.grandTotalUsd ?? undefined,
-          totalFeesUsdDisplay:
-            prepareSendQuote.grandTotalUsdDisplay ?? undefined,
-          totalGasUsd: prepareSendQuote.totalGasUsd ?? undefined,
-          totalGasUsdDisplay: prepareSendQuote.totalGasUsdDisplay ?? undefined,
-          allProviderFeesUsd: prepareSendQuote.allProviderFeesUsd ?? undefined,
-          allProviderFeesUsdDisplay:
-            prepareSendQuote.allProviderFeesUsdDisplay ?? undefined,
+          transactionStates: prepareSendQuote.transactionStates ?? [],
+          originTokenRate: prepareSendQuote.originTokenRate ?? "",
+          destinationTokenRate: prepareSendQuote.destinationTokenRate ?? "",
+          routeProviders: prepareSendQuote.routeProviders ?? [],
+          gasCostUsd: prepareSendQuote.gasCostUsd ?? null,
+          gasCostUsdDisplay: prepareSendQuote.gasCostUsdDisplay ?? "",
+          gasCost: prepareSendQuote.gasCost ?? "",
+          gasCostFormatted: prepareSendQuote.gasCostFormatted ?? "",
+          totalFeesUsd: prepareSendQuote.totalFeesUsd ?? null,
+          totalFeesUsdDisplay: prepareSendQuote.totalFeesUsdDisplay ?? "",
+          totalGasUsd: prepareSendQuote.totalGasUsd ?? null,
+          totalGasUsdDisplay: prepareSendQuote.totalGasUsdDisplay ?? "",
+          intentId: prepareSendQuote.intentId ?? null,
+          originAmountFormatted: prepareSendQuote.originAmountFormatted ?? "",
+          destinationAmountFormatted:
+            prepareSendQuote.destinationAmountFormatted ?? "",
+          originDepositAddress: prepareSendQuote.originDepositAddress ?? "",
+          destinationDepositAddress:
+            prepareSendQuote.destinationDepositAddress ?? "",
+          destinationAddress: prepareSendQuote.destinationAddress ?? "",
+          destinationCalldata: prepareSendQuote.destinationCalldata ?? "",
+          // Fee breakdown fields
+          trailsFeeBreakdown: prepareSendQuote.trailsFeeBreakdown ?? null,
+          originGasUsd: prepareSendQuote.originGasUsd ?? null,
+          originGasUsdDisplay: prepareSendQuote.originGasUsdDisplay ?? "",
+          destinationGasUsd: prepareSendQuote.destinationGasUsd ?? null,
+          destinationGasUsdDisplay:
+            prepareSendQuote.destinationGasUsdDisplay ?? "",
+          providerFeeUsd: prepareSendQuote.providerFeeUsd ?? null,
+          providerFeeUsdDisplay: prepareSendQuote.providerFeeUsdDisplay ?? "",
+          trailsFeeUsd: prepareSendQuote.trailsFeeUsd ?? null,
+          trailsFeeUsdDisplay: prepareSendQuote.trailsFeeUsdDisplay ?? "",
+          totalProviderFeesUsd: prepareSendQuote.totalProviderFeesUsd ?? null,
+          totalProviderFeesUsdDisplay:
+            prepareSendQuote.totalProviderFeesUsdDisplay ?? "",
+          noSufficientBalance: prepareSendQuote.noSufficientBalance ?? false,
         }
 
-        const swap = async (): Promise<SwapReturn> => {
+        const sendTransaction = async (
+          options?: SendOptions,
+        ): Promise<SwapReturn> => {
+          // Use fee option from send() call if provided, otherwise fall back to prop value
+          const effectiveFeeOption =
+            options?.selectedFeeOption !== undefined
+              ? options.selectedFeeOption
+              : (selectedFeeOption ?? null)
+
           const {
             depositUserTxnReceipt,
             destinationIntentTransaction,
             totalCompletionSeconds,
-          } = await send({
-            selectedFeeOption: selectedFeeOption ?? null,
+          } = await prepareSendSend({
+            selectedFeeOption: effectiveFeeOption,
+            onOriginSend: options?.onOriginSend,
           })
 
           return {
@@ -725,7 +944,8 @@ export function useQuote({
 
         return {
           quote,
-          swap,
+          send: sendTransaction,
+          feeOptions: prepareSendFeeOptions?.feeOptions ?? [],
         }
       } catch (error) {
         logger.console.error(
@@ -741,8 +961,8 @@ export function useQuote({
         trailsClient &&
         fromTokenAddress &&
         toTokenAddress &&
-        swapAmount &&
-        toRecipient &&
+        debouncedSwapAmount &&
+        effectiveToAddress &&
         fromChainId &&
         toChainId &&
         indexerGatewayClient &&
@@ -758,9 +978,22 @@ export function useQuote({
     refetchOnReconnect: true, // Refetch when network reconnects
   })
 
+  const sendFn = data?.send || null
+
+  // Create deprecated swap wrapper
+  const swapFn = sendFn
+    ? async (options?: SendOptions) => {
+        logger.console.warn(
+          "[trails-sdk] [useQuote] Warning: 'swap' is deprecated, use 'send' instead",
+        )
+        return sendFn(options)
+      }
+    : null
+
   return {
     quote: data?.quote || null,
-    swap: data?.swap || null,
+    send: sendFn,
+    swap: swapFn,
     isLoadingQuote: isLoading,
     quoteError: error,
     quoteErrorPrettified: getPrettifiedErrorMessage(error),
@@ -783,5 +1016,10 @@ export function useQuote({
         abortControllerRegistry.getAll(),
       )
     },
+    feeOptions: data?.feeOptions || [],
+    // Contract detection results
+    isRecipientContract: isRecipientContract ?? null,
+    isSenderContractOnOrigin: isSenderContractOnOrigin ?? null,
+    isSenderContractOnDestination: isSenderContractOnDestination ?? null,
   }
 }