0xtrails 0.9.2 → 0.9.4

package/src/widget/hooks/useQuote.ts

@@ -191,6 +191,8 @@ export type Quote = {
   originTokenRate: string
   routeProviders: RouteProviderInfo[]
   destinationTokenRate: string
+  originTokenPriceUsd: number
+  destinationTokenPriceUsd: number
   gasCostUsd: number | null
   gasCostUsdDisplay: string
   gasCost: string
@@ -585,394 +587,429 @@ export function useQuote({
           return null
         }
 
-        // Get token balance using async method
-        let balances: any[] = []
+        // Create a 20-second timeout
+        const timeoutId = setTimeout(() => {
+          logger.console.warn(
+            "[trails-sdk] [useQuote] Quote request timed out after 20 seconds",
+          )
+          abortControllerRef.current.abort()
+        }, 20000) // 20 seconds
+
         try {
-          const result = await getTokenBalancesWithPrices({
-            account: walletClient.account!.address,
-            indexerGatewayClient,
-            trailsClient,
-          })
-          balances = result.balances
-        } catch (balanceError) {
-          const balanceErrorMessage = getFullErrorMessage(balanceError)
-          const isCorsError =
-            balanceErrorMessage.includes("Cross-Origin") ||
-            balanceErrorMessage.includes("CORS") ||
-            balanceErrorMessage.includes("Same Origin Policy")
-          const isNetworkError =
-            balanceErrorMessage.includes("fetch failed") ||
-            balanceErrorMessage.includes("network")
+          // Get token balance using async method
+          let balances: any[] = []
+          try {
+            const result = await getTokenBalancesWithPrices({
+              account: walletClient.account!.address,
+              indexerGatewayClient,
+              trailsClient,
+            })
+            balances = result.balances
+          } catch (balanceError) {
+            const balanceErrorMessage = getFullErrorMessage(balanceError)
+            const isCorsError =
+              balanceErrorMessage.includes("Cross-Origin") ||
+              balanceErrorMessage.includes("CORS") ||
+              balanceErrorMessage.includes("Same Origin Policy")
+            const isNetworkError =
+              balanceErrorMessage.includes("fetch failed") ||
+              balanceErrorMessage.includes("network")
 
-          if (isCorsError || isNetworkError) {
-            logger.console.warn(
-              "[trails-sdk] [useQuote] Network or CORS error fetching balances, proceeding with quote using zero balance:",
-              {
-                error: balanceErrorMessage,
-                account: walletClient.account!.address,
-              },
-            )
-            // Continue with empty balances instead of crashing
-            balances = []
-          } else {
-            throw balanceError
+            if (isCorsError || isNetworkError) {
+              logger.console.warn(
+                "[trails-sdk] [useQuote] Network or CORS error fetching balances, proceeding with quote using zero balance:",
+                {
+                  error: balanceErrorMessage,
+                  account: walletClient.account!.address,
+                },
+              )
+              // Continue with empty balances instead of crashing
+              balances = []
+            } else {
+              throw balanceError
+            }
           }
-        }
 
-        const originTokenBalance = balances.find(
-          (b) =>
-            b.chainId === fromChainId &&
-            (b.contractAddress?.toLowerCase() ===
-              fromTokenAddress.toLowerCase() ||
-              (!b.contractAddress && fromTokenAddress === zeroAddress)),
-        )
-
-        const originTokenBalanceAmount = originTokenBalance?.balance ?? "0"
+          const originTokenBalance = balances.find(
+            (b) =>
+              b.chainId === fromChainId &&
+              (b.contractAddress?.toLowerCase() ===
+                fromTokenAddress.toLowerCase() ||
+                (!b.contractAddress && fromTokenAddress === zeroAddress)),
+          )
 
-        // Note: Disable this check for now to allow fetching a quote even when the origin balance is zero
-        // if (originTokenBalanceAmount === "0") {
-        //   return null
-        // }
+          const originTokenBalanceAmount = originTokenBalance?.balance ?? "0"
 
-        // logger.console.log("supportedTokens", supportedTokens)
+          // Note: Disable this check for now to allow fetching a quote even when the origin balance is zero
+          // if (originTokenBalanceAmount === "0") {
+          //   return null
+          // }
 
-        // Get native token price for origin chain (for gas cost calculation)
-        let originNativeTokenPriceUsd = 0
-        try {
-          const originChain = getChainInfo(fromChainId)
-          const nativeTokenSymbol = originChain?.nativeCurrency?.symbol ?? ""
-          if (nativeTokenSymbol) {
-            const nativePrice = await getTokenPrice(trailsClient, {
-              tokenSymbol: nativeTokenSymbol,
-              tokenAddress: zeroAddress,
-              chainId: fromChainId,
-            })
-            originNativeTokenPriceUsd = nativePrice?.priceUsd ?? 0
-            logger.console.log(
-              "[trails-sdk] [useQuote] Origin native token price:",
-              {
-                chainId: fromChainId,
-                symbol: nativeTokenSymbol,
-                priceUsd: originNativeTokenPriceUsd,
-              },
-            )
-          }
-        } catch (error) {
-          logger.console.error(
-            "[trails-sdk] [useQuote] Error getting origin native token price:",
-            error,
-          )
-        }
+          // logger.console.log("supportedTokens", supportedTokens)
 
-        // Helper function to fetch decimals on-chain if not found in token list
-        const fetchDecimalsOnChain = async (
-          tokenAddress: string,
-          chainId: number,
-        ): Promise<number | null> => {
+          // Get native token price for origin chain (for gas cost calculation)
+          let originNativeTokenPriceUsd = 0
           try {
-            // Use the hook-based RPC clients that are already available
-            const publicClient =
-              chainId === fromChainId
-                ? originPublicClient
-                : chainId === toChainId
-                  ? destinationPublicClient
-                  : null
-
-            if (!publicClient) {
-              logger.console.warn(
-                `[trails-sdk] No RPC client available for chain ${chainId}`,
+            const originChain = getChainInfo(fromChainId)
+            const nativeTokenSymbol = originChain?.nativeCurrency?.symbol ?? ""
+            if (nativeTokenSymbol) {
+              const nativePrice = await getTokenPrice(trailsClient, {
+                tokenSymbol: nativeTokenSymbol,
+                tokenAddress: zeroAddress,
+                chainId: fromChainId,
+              })
+              originNativeTokenPriceUsd = nativePrice?.priceUsd ?? 0
+              logger.console.log(
+                "[trails-sdk] [useQuote] Origin native token price:",
+                {
+                  chainId: fromChainId,
+                  symbol: nativeTokenSymbol,
+                  priceUsd: originNativeTokenPriceUsd,
+                },
               )
-              return null
-            }
-
-            // For native tokens, return 18 decimals
-            if (tokenAddress.toLowerCase() === zeroAddress.toLowerCase()) {
-              const chainInfo = getChainInfo(chainId)
-              return chainInfo?.nativeCurrency.decimals ?? 18
             }
-
-            const decimals = await publicClient.readContract({
-              address: tokenAddress as `0x${string}`,
-              abi: erc20Abi,
-              functionName: "decimals",
-            })
-
-            logger.console.log(
-              `[trails-sdk] Fetched decimals on-chain for token ${tokenAddress} on chain ${chainId}: ${decimals}`,
-            )
-            return decimals
           } catch (error) {
             logger.console.error(
-              `[trails-sdk] Error fetching decimals on-chain for token ${tokenAddress} on chain ${chainId}:`,
+              "[trails-sdk] [useQuote] Error getting origin native token price:",
               error,
             )
-            return null
           }
-        }
 
-        const originToken = supportedTokens?.find(
-          (token) =>
-            token.contractAddress?.toLowerCase() ===
-              fromTokenAddress?.toLowerCase() && token.chainId === fromChainId,
-        )
-        const destinationToken = supportedTokens?.find(
-          (token) =>
-            token.contractAddress?.toLowerCase() ===
-              toTokenAddress?.toLowerCase() && token.chainId === toChainId,
-        )
+          // Helper function to fetch decimals on-chain if not found in token list
+          const fetchDecimalsOnChain = async (
+            tokenAddress: string,
+            chainId: number,
+          ): Promise<number | null> => {
+            try {
+              // Use the hook-based RPC clients that are already available
+              const publicClient =
+                chainId === fromChainId
+                  ? originPublicClient
+                  : chainId === toChainId
+                    ? destinationPublicClient
+                    : null
 
-        let sourceTokenDecimals = originToken?.decimals
-        if (!sourceTokenDecimals && fromTokenAddress && fromChainId) {
-          logger.console.warn(
-            "[trails-sdk] [useQuote] Source token decimals not found in token list, fetching on-chain:",
-            {
-              originToken,
-              fromTokenAddress,
-              fromChainId,
-            },
+              if (!publicClient) {
+                logger.console.warn(
+                  `[trails-sdk] No RPC client available for chain ${chainId}`,
+                )
+                return null
+              }
+
+              // For native tokens, return 18 decimals
+              if (tokenAddress.toLowerCase() === zeroAddress.toLowerCase()) {
+                const chainInfo = getChainInfo(chainId)
+                return chainInfo?.nativeCurrency.decimals ?? 18
+              }
+
+              const decimals = await publicClient.readContract({
+                address: tokenAddress as `0x${string}`,
+                abi: erc20Abi,
+                functionName: "decimals",
+              })
+
+              logger.console.log(
+                `[trails-sdk] Fetched decimals on-chain for token ${tokenAddress} on chain ${chainId}: ${decimals}`,
+              )
+              return decimals
+            } catch (error) {
+              logger.console.error(
+                `[trails-sdk] Error fetching decimals on-chain for token ${tokenAddress} on chain ${chainId}:`,
+                error,
+              )
+              return null
+            }
+          }
+
+          const originToken = supportedTokens?.find(
+            (token) =>
+              token.contractAddress?.toLowerCase() ===
+                fromTokenAddress?.toLowerCase() &&
+              token.chainId === fromChainId,
           )
-          const onChainDecimals = await fetchDecimalsOnChain(
-            fromTokenAddress,
-            fromChainId,
+          const destinationToken = supportedTokens?.find(
+            (token) =>
+              token.contractAddress?.toLowerCase() ===
+                toTokenAddress?.toLowerCase() && token.chainId === toChainId,
           )
-          if (onChainDecimals !== null) {
-            sourceTokenDecimals = onChainDecimals
-          }
-        }
-        if (!sourceTokenDecimals) {
-          logger.console.error(
-            "[trails-sdk] [useQuote] Source token decimals not found:",
-            {
-              originToken,
+
+          let sourceTokenDecimals = originToken?.decimals
+          if (!sourceTokenDecimals && fromTokenAddress && fromChainId) {
+            logger.console.warn(
+              "[trails-sdk] [useQuote] Source token decimals not found in token list, fetching on-chain:",
+              {
+                originToken,
+                fromTokenAddress,
+                fromChainId,
+              },
+            )
+            const onChainDecimals = await fetchDecimalsOnChain(
               fromTokenAddress,
               fromChainId,
-            },
-          )
-          throw new Error("Source token decimals not found")
-        }
-        let destinationTokenDecimals = destinationToken?.decimals
-        if (!destinationTokenDecimals && toTokenAddress && toChainId) {
-          logger.console.warn(
-            "[trails-sdk] Destination token decimals not found in token list, fetching on-chain:",
-            {
-              destinationToken,
-              toTokenAddress,
-              toChainId,
-            },
-          )
-          const onChainDecimals = await fetchDecimalsOnChain(
-            toTokenAddress,
-            toChainId,
-          )
-          if (onChainDecimals !== null) {
-            destinationTokenDecimals = onChainDecimals
+            )
+            if (onChainDecimals !== null) {
+              sourceTokenDecimals = onChainDecimals
+            }
           }
-        }
-        if (!destinationTokenDecimals) {
-          logger.console.error(
-            "[trails-sdk] Destination token decimals not found:",
-            {
-              destinationToken,
+          if (!sourceTokenDecimals) {
+            logger.console.error(
+              "[trails-sdk] [useQuote] Source token decimals not found:",
+              {
+                originToken,
+                fromTokenAddress,
+                fromChainId,
+              },
+            )
+            throw new Error("Source token decimals not found")
+          }
+          let destinationTokenDecimals = destinationToken?.decimals
+          if (!destinationTokenDecimals && toTokenAddress && toChainId) {
+            logger.console.warn(
+              "[trails-sdk] Destination token decimals not found in token list, fetching on-chain:",
+              {
+                destinationToken,
+                toTokenAddress,
+                toChainId,
+              },
+            )
+            const onChainDecimals = await fetchDecimalsOnChain(
               toTokenAddress,
               toChainId,
-            },
-          )
-          throw new Error("Destination token decimals not found")
-        }
-        const destinationTokenSymbol = destinationToken?.symbol ?? ""
-        const originTokenSymbol = originToken?.symbol ?? ""
+            )
+            if (onChainDecimals !== null) {
+              destinationTokenDecimals = onChainDecimals
+            }
+          }
+          if (!destinationTokenDecimals) {
+            logger.console.error(
+              "[trails-sdk] Destination token decimals not found:",
+              {
+                destinationToken,
+                toTokenAddress,
+                toChainId,
+              },
+            )
+            throw new Error("Destination token decimals not found")
+          }
+          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 === "onramp-exchange"
-            ? parseUnits("100", sourceTokenDecimals).toString()
-            : originTokenBalanceAmount
+          // 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 === "onramp-exchange"
+              ? parseUnits("100", sourceTokenDecimals).toString()
+              : originTokenBalanceAmount
 
-        const options: PrepareSendOptions = {
-          account: walletClient.account!,
-          originTokenAddress: fromTokenAddress,
-          originChainId: fromChainId,
-          originTokenBalance: effectiveOriginTokenBalance,
-          destinationChainId: toChainId,
-          recipient: effectiveToAddress,
-          destinationTokenAddress: toTokenAddress,
-          swapAmount: debouncedSwapAmount.toString(),
-          tradeType: tradeType ?? TradeType.EXACT_OUTPUT,
-          originTokenSymbol: originTokenSymbol,
-          destinationTokenSymbol: destinationTokenSymbol,
-          destinationCalldata: toCalldata as string,
-          client: walletClient,
-          trailsClient,
-          sourceTokenDecimals,
-          destinationTokenDecimals,
-          onTransactionStateChange: onStatusUpdate ?? (() => {}),
-          slippageTolerance: slippageTolerance?.toString(),
-          swapProvider: effectiveSwapProvider,
-          bridgeProvider: effectiveBridgeProvider,
-          paymasterUrl: paymasterUrl,
-          selectedFeeOption: selectedFeeOption ?? null,
-          abortSignal: combinedAbortSignal,
-          originNativeTokenPriceUsd: originNativeTokenPriceUsd,
-          commitIntentFn: commitIntentMutation.mutateAsync,
-          executeIntentFn: executeIntentMutation.mutateAsync,
-          checkoutOnHandlers,
-          sequenceIndexerUrl,
-          sequenceProjectAccessKey,
-          originPublicClient: originPublicClient ?? undefined,
-          destinationPublicClient: destinationPublicClient ?? undefined,
-          isSmartWallet: isSmartWallet ?? undefined,
-          trailsApiKey,
-          trailsApiUrl,
-          fundMethod: fundMethod ?? undefined,
-          onramp: onramp ?? undefined,
-        }
+          const options: PrepareSendOptions = {
+            account: walletClient.account!,
+            originTokenAddress: fromTokenAddress,
+            originChainId: fromChainId,
+            originTokenBalance: effectiveOriginTokenBalance,
+            destinationChainId: toChainId,
+            recipient: effectiveToAddress,
+            destinationTokenAddress: toTokenAddress,
+            swapAmount: debouncedSwapAmount.toString(),
+            tradeType: tradeType ?? TradeType.EXACT_OUTPUT,
+            originTokenSymbol: originTokenSymbol,
+            destinationTokenSymbol: destinationTokenSymbol,
+            destinationCalldata: toCalldata as string,
+            client: walletClient,
+            trailsClient,
+            sourceTokenDecimals,
+            destinationTokenDecimals,
+            onTransactionStateChange: onStatusUpdate ?? (() => {}),
+            slippageTolerance: slippageTolerance?.toString(),
+            swapProvider: effectiveSwapProvider,
+            bridgeProvider: effectiveBridgeProvider,
+            paymasterUrl: paymasterUrl,
+            selectedFeeOption: selectedFeeOption ?? null,
+            abortSignal: combinedAbortSignal,
+            originNativeTokenPriceUsd: originNativeTokenPriceUsd,
+            commitIntentFn: commitIntentMutation.mutateAsync,
+            executeIntentFn: executeIntentMutation.mutateAsync,
+            checkoutOnHandlers,
+            sequenceIndexerUrl,
+            sequenceProjectAccessKey,
+            originPublicClient: originPublicClient ?? undefined,
+            destinationPublicClient: destinationPublicClient ?? undefined,
+            isSmartWallet: isSmartWallet ?? undefined,
+            trailsApiKey,
+            trailsApiUrl,
+            fundMethod: fundMethod ?? undefined,
+            onramp: onramp ?? undefined,
+          }
 
-        logger.console.log("[trails-sdk] options", options)
+          logger.console.log("[trails-sdk] options", options)
 
-        const {
-          quote: prepareSendQuote,
-          send: prepareSendSend,
-          feeOptions: prepareSendFeeOptions,
-        } = await prepareSend(options)
+          const {
+            quote: prepareSendQuote,
+            send: prepareSendSend,
+            feeOptions: prepareSendFeeOptions,
+          } = await prepareSend(options)
 
-        const quote: Quote = {
-          // Backward compatible fields
-          fromAmount: prepareSendQuote.originAmount,
-          toAmount: prepareSendQuote.destinationAmount,
-          fromAmountMin: prepareSendQuote.originAmountMin,
-          toAmountMin: prepareSendQuote.destinationAmountMin,
-          fromAmountUsdDisplay: prepareSendQuote.originAmountUsdDisplay ?? "",
-          toAmountUsdDisplay:
-            prepareSendQuote.destinationAmountUsdDisplay ?? "",
-          toAmountMinUsdDisplay:
-            prepareSendQuote.destinationAmountMinUsdDisplay ?? "",
-          // 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 ?? 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 ?? [],
-          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,
-          expiresAt: prepareSendQuote.expiresAt ?? null,
-        }
+          const quote: Quote = {
+            // Backward compatible fields
+            fromAmount: prepareSendQuote.originAmount,
+            toAmount: prepareSendQuote.destinationAmount,
+            fromAmountMin: prepareSendQuote.originAmountMin,
+            toAmountMin: prepareSendQuote.destinationAmountMin,
+            fromAmountUsdDisplay: prepareSendQuote.originAmountUsdDisplay ?? "",
+            toAmountUsdDisplay:
+              prepareSendQuote.destinationAmountUsdDisplay ?? "",
+            toAmountMinUsdDisplay:
+              prepareSendQuote.destinationAmountMinUsdDisplay ?? "",
+            // 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 ?? null,
+            priceImpactUsdDisplay: prepareSendQuote.priceImpactUsdDisplay ?? "",
+            completionEstimateSeconds:
+              prepareSendQuote.completionEstimateSeconds,
+            completionEstimateDisplay:
+              prepareSendQuote.completionEstimateDisplay ?? "",
+            slippageTolerance: prepareSendQuote.slippageTolerance,
+            transactionStates: prepareSendQuote.transactionStates ?? [],
+            originTokenRate: prepareSendQuote.originTokenRate ?? "",
+            destinationTokenRate: prepareSendQuote.destinationTokenRate ?? "",
+            originTokenPriceUsd: prepareSendQuote.originTokenPriceUsd ?? 0,
+            destinationTokenPriceUsd:
+              prepareSendQuote.destinationTokenPriceUsd ?? 0,
+            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,
+            expiresAt: prepareSendQuote.expiresAt ?? null,
+          }
 
-        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 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 prepareSendSend({
-            selectedFeeOption: effectiveFeeOption,
-            onOriginSend: options?.onOriginSend,
-            depositTransactionHash: options?.depositTransactionHash,
-            skipCommit: options?.skipCommit,
-            commitOnly: options?.commitOnly,
-          })
+            const {
+              depositUserTxnReceipt,
+              destinationIntentTransaction,
+              totalCompletionSeconds,
+            } = await prepareSendSend({
+              selectedFeeOption: effectiveFeeOption,
+              onOriginSend: options?.onOriginSend,
+              depositTransactionHash: options?.depositTransactionHash,
+              skipCommit: options?.skipCommit,
+              commitOnly: options?.commitOnly,
+            })
 
-          return {
-            originTransaction: {
-              transactionHash: depositUserTxnReceipt?.transactionHash,
-              explorerUrl: getExplorerUrl({
-                txHash: depositUserTxnReceipt?.transactionHash as string,
-                chainId: fromChainId,
-              }),
-              receipt: depositUserTxnReceipt,
-            },
-            destinationTransaction: {
-              transactionHash: destinationIntentTransaction?.txnHash,
-              explorerUrl: getExplorerUrl({
-                txHash: destinationIntentTransaction?.txnHash as string,
-                chainId: toChainId,
-              }),
-              receipt: destinationIntentTransaction,
-            },
-            totalCompletionSeconds,
+            return {
+              originTransaction: {
+                transactionHash: depositUserTxnReceipt?.transactionHash,
+                explorerUrl: getExplorerUrl({
+                  txHash: depositUserTxnReceipt?.transactionHash as string,
+                  chainId: fromChainId,
+                }),
+                receipt: depositUserTxnReceipt,
+              },
+              destinationTransaction: {
+                transactionHash: destinationIntentTransaction?.txnHash,
+                explorerUrl: getExplorerUrl({
+                  txHash: destinationIntentTransaction?.txnHash as string,
+                  chainId: toChainId,
+                }),
+                receipt: destinationIntentTransaction,
+              },
+              totalCompletionSeconds,
+            }
           }
-        }
 
-        return {
-          quote,
-          send: sendTransaction,
-          feeOptions: prepareSendFeeOptions?.feeOptions ?? [],
+          // Clear the timeout on successful completion
+          clearTimeout(timeoutId)
+
+          return {
+            quote,
+            send: sendTransaction,
+            feeOptions: prepareSendFeeOptions?.feeOptions ?? [],
+          }
+        } finally {
+          // Always clear the timeout
+          clearTimeout(timeoutId)
         }
       } catch (error) {
+        // Check if this was aborted due to timeout
+        if (
+          (error as any)?.name === "AbortError" ||
+          abortControllerRef.current.signal.aborted
+        ) {
+          logger.console.error(
+            "[trails-sdk] [useQuote] Quote request timed out:",
+            error,
+          )
+          throw new Error("No route available")
+        }
+
         logger.console.error(
           "[trails-sdk] [useQuote] Error getting quote:",
           error,
@@ -999,7 +1036,7 @@ export function useQuote({
     refetchOnWindowFocus: false, // Don't refetch when window regains focus
     refetchOnMount: "always", // Always refetch on component remount to ensure fresh quote
     refetchInterval: false, // Disable automatic polling
-    retry: 2, // Limit retry attempts
+    retry: false, // Disable automatic retries - only make 1 request
     refetchOnReconnect: true, // Refetch when network reconnects
   })