0xtrails 0.13.1 → 0.13.2

package/src/widget/components/WalletImage.tsx

@@ -1,6 +1,9 @@
+import {
+  getWalletIcon,
+  wagmiConnectorToWalletId,
+} from "@0xtrails/wallet-registry"
 import type React from "react"
 import { useAccount } from "wagmi"
-import { getWalletIcon, wagmiConnectorToWalletId } from "../../wallets.js"
 import { Wallet } from "lucide-react"
 
 interface WalletImageProps {
@@ -14,7 +17,7 @@ export const WalletImage: React.FC<WalletImageProps> = ({ size, walletId }) => {
   // Use provided walletId or derive from current connector
   const currentWalletId =
     walletId || (connector ? wagmiConnectorToWalletId(connector) : null)
-  const walletIcon = currentWalletId ? getWalletIcon(currentWalletId) : null
+  const walletIcon = currentWalletId ? getWalletIcon(currentWalletId) : ""
 
   // If no icon found, show default wallet icon
   if (!walletIcon) {
@@ -26,25 +29,10 @@ export const WalletImage: React.FC<WalletImageProps> = ({ size, walletId }) => {
     )
   }
 
-  // Handle React component icons (like WalletIcon from lucide-react)
-  if (typeof walletIcon === "function") {
-    const IconComponent = walletIcon as React.ComponentType<{
-      className?: string
-      style?: React.CSSProperties
-    }>
-    return (
-      <IconComponent
-        className="text-gray-500 dark:text-gray-400"
-        style={{ width: size, height: size }}
-      />
-    )
-  }
-
-  // Handle string URLs/data URIs
   return (
     <div className="relative inline-block">
       <img
-        src={walletIcon as string}
+        src={walletIcon}
         alt={`${currentWalletId} wallet`}
         style={{ width: size, height: size }}
         onError={(e) => {

package/src/widget/components/WalletList.tsx

@@ -1,8 +1,8 @@
 import { ChevronRight, Search, Wallet } from "lucide-react"
+import { topShownWallets } from "@0xtrails/wallet-registry"
 import type React from "react"
 import { useMemo, useState } from "react"
 import type { WalletConfig } from "../../wallets.js"
-import { topShownWallets } from "../../wallets.js"
 import { ScreenHeader } from "./ScreenHeader.js"
 
 export interface WalletListProps {

package/src/widget/components/Withdraw.tsx

@@ -19,9 +19,9 @@ import { useDestinationSelectedToken } from "../hooks/useDestinationSelectedToke
 import { useOriginSelectedToken } from "../hooks/useOriginSelectedToken.js"
 import type { ProcessedFeeOption } from "../hooks/useSelectedFeeOption.js"
 import { useSelectedRecipient } from "../hooks/useSelectedRecipient.js"
-import { useSendForm } from "../hooks/useSendForm.js"
+import { useSendForm, type OnCompleteProps } from "../hooks/useSendForm.js"
 import { useSwapState } from "../hooks/useSwapState.js"
-import { useTokenWithFreshBalance } from "../hooks/useTokenWithFreshBalance.js"
+import { useAccountTokenBalanceOnchain } from "../../query/balance.hooks.js"
 import type { BaseProps } from "../types/commonProps.js"
 import { isWithinCooldown, SECOND_MS } from "../../utils/time.js"
 import { forexRateStore } from "../utils/forexRateStore.js"
@@ -97,7 +97,7 @@ const Withdraw: React.FC<WithdrawProps> = ({
   const {
     token: freshOriginToken,
     isLoadingBalance: isLoadingFreshOriginBalance,
-  } = useTokenWithFreshBalance(originToken, account?.address)
+  } = useAccountTokenBalanceOnchain(originToken, account?.address)
 
   const { selectedRecipient, setSelectedRecipient } = useSelectedRecipient()
   const prevToRecipientRef = useRef<string | undefined>(toRecipient)
@@ -126,6 +126,7 @@ const Withdraw: React.FC<WithdrawProps> = ({
     setSellAmount,
     buyAmount,
     setBuyAmount,
+    resetSwapState,
     enterFormMode,
   } = useSwapState()
 
@@ -181,6 +182,23 @@ const Withdraw: React.FC<WithdrawProps> = ({
   const [_isUserTyping, setIsUserTyping] = useState(false)
   const typingTimeoutRef = useRef<NodeJS.Timeout | null>(null)
 
+  useEffect(() => {
+    return () => {
+      if (typingTimeoutRef.current) {
+        clearTimeout(typingTimeoutRef.current)
+      }
+    }
+  }, [])
+
+  const handleCompleteAndClearAmounts = useCallback(
+    (result: OnCompleteProps) => {
+      setInputDisplayValue("")
+      resetSwapState()
+      onComplete(result)
+    },
+    [onComplete, resetSwapState],
+  )
+
   const {
     amount,
     amountRaw,
@@ -219,7 +237,7 @@ const Withdraw: React.FC<WithdrawProps> = ({
     paymasterUrls,
     onSend,
     onConfirm,
-    onComplete,
+    onComplete: handleCompleteAndClearAmounts,
     selectedToken: originToken ?? undefined,
     setWalletConfirmRetryHandler,
     tradeType: tradeType,

package/src/widget/hooks/useAddressWalletIcon.ts

@@ -1,7 +1,8 @@
 import { useMemo } from "react"
-import { useWallets, wagmiConnectorToWalletId } from "../../wallets.js"
+import { wagmiConnectorToWalletId } from "@0xtrails/wallet-registry"
 import { type Connector, useConnections } from "wagmi"
 import type { Address } from "viem"
+import { useWallets } from "../../wallets.js"
 
 /**
  * Hook to get the wallet icon for an connected address

package/src/widget/hooks/useCustomTokenSearch.tsx

@@ -1,11 +1,10 @@
 import { useMemo, useEffect, useCallback } from "react"
 import { isAddress } from "viem"
-import { useQuery } from "@tanstack/react-query"
+import { useQuery, useQueryClient } from "@tanstack/react-query"
 import { getChainInfo } from "../../chains.js"
 import { useSupportedChains } from "../../query/chains.hooks.js"
-import { getSupportedTokens, getTokenInfo } from "../../tokens.js"
+import { getSupportedTokens, searchTokenByAddress } from "../../tokens.js"
 import { useCustomTokens } from "../../customTokens.js"
-// Removed convertTokenToSupportedToken import - addCustomToken now accepts Token directly
 import type { Token } from "../../tokens.js"
 import { logger } from "../../logger.js"
 import { MINUTE_MS, DAY_MS } from "../../utils/time.js"
@@ -17,10 +16,15 @@ interface UseCustomTokenSearchProps {
   searchQuery: string
   filteredTokensFormatted: Token[]
   filterByChainId: number | null
+  /** True once the API search (getTokenList) for an address query
+   *  has completed with zero results. */
+  isApiAddressSearchComplete: boolean
 }
 
 interface UseCustomTokenSearchReturn {
   chainFilteredTokens: Token[]
+  /** All tokens found by findContractInfo across every supported chain (unfiltered by chain selector). */
+  foundTokensAllChains: Token[]
   isLoadingCustomToken: boolean
   customTokenError: Error | null
   isCustomToken: (chainId: number, contractAddress: string) => boolean
@@ -34,21 +38,23 @@ export function useCustomTokenSearch({
   searchQuery,
   filteredTokensFormatted,
   filterByChainId,
+  isApiAddressSearchComplete,
 }: UseCustomTokenSearchProps): UseCustomTokenSearchReturn {
   const { data: supportedChains = [] } = useSupportedChains()
   const { addCustomToken, customTokens } = useCustomTokens()
   const trailsConfig = useTrails()
+  const queryClient = useQueryClient()
   // Get official supported tokens (before merging with custom tokens) to check if token is truly custom
-  const { data: officialSupportedTokens = [] } = useQuery({
-    queryKey: [
-      "supportedTokens",
-      trailsConfig.trailsApiUrl,
-      trailsConfig.trailsApiKey,
-    ],
+  const {
+    data: officialSupportedTokens = [],
+    isSuccess: officialTokensLoaded,
+  } = useQuery({
+    queryKey: ["supportedTokens"],
     queryFn: () =>
       getSupportedTokens({
         trailsApiKey: trailsConfig.trailsApiKey,
         trailsApiUrl: trailsConfig.trailsApiUrl,
+        queryClient,
       }),
     staleTime: DAY_MS, // 24 hours - token list is static
     gcTime: DAY_MS, // 24 hours
@@ -96,7 +102,12 @@ export function useCustomTokenSearch({
     )
   }, [searchAddress, filteredTokensFormatted, filterByChainId, customTokens])
 
-  // Fetch custom token info from ALL supported chains when address is detected and not in list
+  // Single request to find the token across all chains via SearchContractInfo
+  const supportedChainIds = useMemo(
+    () => new Set(supportedChains.map((c) => c.id)),
+    [supportedChains],
+  )
+
   const {
     data: foundTokensAllChains = [],
     isLoading: isLoadingCustomToken,
@@ -110,24 +121,15 @@ export function useCustomTokenSearch({
         `[trails-sdk] Searching for token ${searchAddress} across all chains`,
       )
 
-      // Attempt to fetch from all supported chains in parallel
-      const results = await Promise.allSettled(
-        supportedChains.map(async (chain) => {
-          const tokenInfo = await getTokenInfo(chain.id, searchAddress, {
-            trailsApiKey: trailsConfig.trailsApiKey,
-            trailsApiUrl: trailsConfig.trailsApiUrl,
-            sequenceMetadataUrl: trailsConfig.sequenceMetadataUrl,
-          })
-          return tokenInfo ? { ...tokenInfo, chainId: chain.id } : null
-        }),
-      )
+      const allTokens = await searchTokenByAddress(searchAddress, {
+        sequenceMetadataUrl: trailsConfig.sequenceMetadataUrl,
+        trailsApiKey: trailsConfig.trailsApiKey,
+      })
 
-      // Extract successful results
-      const validTokens = results
-        .filter(
-          (result) => result.status === "fulfilled" && result.value !== null,
-        )
-        .map((result) => (result as PromiseFulfilledResult<Token>).value)
+      // Keep only tokens on supported chains
+      const validTokens = allTokens.filter(
+        (t) => t.chainId != null && supportedChainIds.has(t.chainId),
+      )
 
       logger.console.log(
         `[trails-sdk] Found ${validTokens.length} tokens across all chains`,
@@ -136,24 +138,37 @@ export function useCustomTokenSearch({
       return validTokens
     },
     enabled:
-      !!searchAddress && !addressExistsInList && supportedChains.length > 0,
+      !!searchAddress &&
+      !addressExistsInList &&
+      supportedChains.length > 0 &&
+      isApiAddressSearchComplete,
     staleTime: 5 * MINUTE_MS,
     gcTime: DAY_MS,
     retry: 1,
     refetchOnWindowFocus: false,
   })
 
-  // Add found tokens to storage
+  // Add found tokens to storage only after officialSupportedTokens has loaded
+  // to avoid incorrectly persisting official tokens as custom tokens.
   useEffect(() => {
-    if (foundTokensAllChains.length > 0 && !customTokenError) {
+    if (
+      foundTokensAllChains.length > 0 &&
+      !customTokenError &&
+      officialTokensLoaded
+    ) {
       foundTokensAllChains.forEach((tokenInfo) => {
         const existsInOfficialTokens = officialSupportedTokens.some(
           (token) =>
             token.chainId === tokenInfo.chainId &&
             addressEqual(token.contractAddress, tokenInfo.contractAddress),
         )
+        const existsInCustomTokens = customTokens.some(
+          (token) =>
+            token.chainId === tokenInfo.chainId &&
+            addressEqual(token.contractAddress, tokenInfo.contractAddress),
+        )
 
-        if (!existsInOfficialTokens) {
+        if (!existsInOfficialTokens && !existsInCustomTokens) {
           addCustomToken(tokenInfo)
           logger.console.log(
             "[trails-sdk] Added custom token to storage:",
@@ -167,6 +182,8 @@ export function useCustomTokenSearch({
     customTokenError,
     addCustomToken,
     officialSupportedTokens,
+    officialTokensLoaded,
+    customTokens,
   ])
 
   // Show error if custom token fetch failed
@@ -190,9 +207,10 @@ export function useCustomTokenSearch({
   }, [filteredTokensFormatted])
 
   // Convert custom tokens from localStorage to TokenFormatted format
-  // Always include in search results, but prefer balance info from filteredTokensFormatted if available
+  // Only include custom tokens that match the current search query
   const customTokensFromStorage = useMemo(() => {
     const searchAddressLower = searchAddress?.toLowerCase()
+    const trimmedQuery = searchQuery.trim().toLowerCase()
 
     return customTokens
       .filter((token) => {
@@ -200,6 +218,11 @@ export function useCustomTokenSearch({
         if (searchAddressLower) {
           if (token.contractAddress.toLowerCase() !== searchAddressLower)
             return false
+        } else if (trimmedQuery) {
+          const sym = (token.symbol || "").toLowerCase()
+          const name = (token.name || "").toLowerCase()
+          if (!sym.includes(trimmedQuery) && !name.includes(trimmedQuery))
+            return false
         }
         // Apply chain filter if active
         if (filterByChainId !== null) {
@@ -233,7 +256,13 @@ export function useCustomTokenSearch({
           isCustomToken: token.isCustomToken ?? true,
         }
       })
-  }, [customTokens, filterByChainId, filteredTokensMap, searchAddress])
+  }, [
+    customTokens,
+    filterByChainId,
+    filteredTokensMap,
+    searchAddress,
+    searchQuery,
+  ])
 
   // Helper function to check if a token has a balance
   const hasBalance = useCallback((token: Token): boolean => {
@@ -332,6 +361,7 @@ export function useCustomTokenSearch({
 
   return {
     chainFilteredTokens,
+    foundTokensAllChains,
     isLoadingCustomToken,
     customTokenError,
     isCustomToken,

package/src/widget/hooks/useDefaultDestinationToken.tsx

@@ -4,10 +4,7 @@ import { base, arbitrum } from "viem/chains"
 import type { Address } from "ox"
 import { useSupportedTokens } from "../../tokens.js"
 import type { Token } from "../../tokens.js"
-import {
-  useTokenBalances,
-  WIDGET_REFRESH_INTERVAL,
-} from "../../query/balance.hooks.js"
+import { useTokenBalances } from "../../query/balance.hooks.js"
 import { logger } from "../../logger.js"
 
 /**
@@ -36,7 +33,7 @@ export function useDefaultDestinationToken(originToken: Token | null) {
   const { sortedTokens, isLoadingSortedTokens } = useTokenBalances(
     originToken ? (address as Address.Address) : null,
     undefined,
-    { refetchInterval: WIDGET_REFRESH_INTERVAL },
+    { refetchInterval: false },
   )
 
   const isLoading = isLoadingTokens || isLoadingSortedTokens

package/src/widget/hooks/useDefaultOriginToken.tsx

@@ -3,10 +3,7 @@ import { useAccount } from "wagmi"
 import type { Address } from "ox"
 import { useWidgetProps } from "./useWidgetProps.js"
 import { useTargetAmount } from "./useTargetAmount.js"
-import {
-  useTokenBalances,
-  WIDGET_REFRESH_INTERVAL,
-} from "../../query/balance.hooks.js"
+import { useTokenBalances } from "../../query/balance.hooks.js"
 import type { Token } from "../../tokens.js"
 import { getChainInfo } from "../../chains.js"
 import { isNativeToken } from "../../utils/address.js"
@@ -90,7 +87,7 @@ export function useDefaultOriginToken() {
   const { sortedTokens, isLoadingSortedTokens } = useTokenBalances(
     address as Address.Address,
     undefined,
-    { refetchInterval: WIDGET_REFRESH_INTERVAL },
+    { refetchInterval: false },
   )
 
   const isLoading = isLoadingSortedTokens

package/src/widget/hooks/useFiatOnRampCurrencies.ts

@@ -1,7 +1,7 @@
 import { useQuery } from "@tanstack/react-query"
 import type { TrailsOnramp } from "../../onrampClient.js"
 import { useOnrampClient } from "../../onrampClient.js"
-import type { MeldFiatCurrency } from "../../onramp-client/trails-onramp.gen.js"
+import type { MeldFiatCurrency } from "@0xtrails/api/onramp"
 import { meldQueries } from "../../query/meld.queries.js"
 
 export type OnrampFiatCurrency = MeldFiatCurrency

package/src/widget/hooks/useIntentTransactionHistory.ts

@@ -39,11 +39,13 @@ function mapIntentHistoryToTransaction(
   const depositTransactionHash = receipt.depositTransaction?.txnHash
   const originTransactionHash = receipt.originTransaction?.txnHash
   const destinationTransactionHash = receipt.destinationTransaction?.txnHash
+  const refundTransactionHash = receipt.refundTransaction?.txnHash
 
   // Get transaction statuses from the transaction objects
   const depositStatus = receipt.depositTransaction?.status
   const originStatus = receipt.originTransaction?.status
   const destinationStatus = receipt.destinationTransaction?.status
+  const refundStatus = receipt.refundTransaction?.status
 
   // Use summary if available, otherwise construct from transaction data
   const intentId = intentHistory.intentId
@@ -112,6 +114,9 @@ function mapIntentHistoryToTransaction(
     depositTransactionStatus: depositStatus,
     originTransactionStatus: originStatus,
     destinationTransactionStatus: destinationStatus,
+    refundTransactionHash: refundTransactionHash,
+    refundTransactionStatus: refundStatus,
+    refundTransactionChainId: receipt.refundTransaction?.chainId,
     originToken:
       originTokenMetadata && originTokenAddress && originTokenAddress !== ""
         ? ({

package/src/widget/hooks/useMeldTransactionStatus.ts

@@ -5,7 +5,7 @@ import { logger } from "../../logger.js"
 import type {
   SearchMeldTransactionsRequest,
   SearchMeldTransactionsResponse,
-} from "../../onramp-client/trails-onramp.gen.js"
+} from "@0xtrails/api/onramp"
 import { getAccountTransactionHistory } from "../../transactions.js"
 import { addressEqual } from "../../utils/address.js"
 import { toSeconds, elapsed, SECOND_MS } from "../../utils/time.js"

package/src/widget/hooks/useQuote.ts

@@ -41,6 +41,7 @@ import type {
 import type { OnrampTrackingData } from "../types/analytics.js"
 import { isZeroOrInvalidAmount } from "../../utils/validation.js"
 import { addressEqual } from "../../utils/address.js"
+import { HOUR_MS } from "../../utils/time.js"
 
 /**
  * Configuration options for the `useQuote` hook.
@@ -197,7 +198,7 @@ export type Quote = {
   originAmountUsdFormatted: string
   destinationAmountUsdFormatted: string
   // Locale display fields
-  intentProtocolVersion: string
+  intentProtocol: string
   originAmountFormattedLocale?: string
   originAmountUsdLocaleDisplay?: string
   destinationAmountFormattedLocale?: string
@@ -586,9 +587,8 @@ export function useQuote({
       !!senderAddress &&
       !!fromChainId &&
       !hasCachedContractResult(senderAddress, fromChainId),
-    // Only cache for 24h if it's a contract, otherwise keep checking
     staleTime: (query) => (query.state.data === true ? Infinity : 0),
-    gcTime: Infinity,
+    gcTime: HOUR_MS,
   })
 
   // Query for sender on destination chain - skip if same chain as origin (reuse origin result)
@@ -605,7 +605,7 @@ export function useQuote({
       !isSameChain &&
       !hasCachedContractResult(senderAddress, toChainId),
     staleTime: (query) => (query.state.data === true ? Infinity : 0),
-    gcTime: Infinity,
+    gcTime: HOUR_MS,
   })
 
   // Query for recipient on destination chain - skip if same address as sender (reuse sender result)
@@ -622,7 +622,7 @@ export function useQuote({
       !isSameAddress &&
       !hasCachedContractResult(recipientAddress, toChainId),
     staleTime: (query) => (query.state.data === true ? Infinity : 0),
-    gcTime: Infinity,
+    gcTime: HOUR_MS,
   })
 
   // Derive the final values, reusing results where addresses/chains match
@@ -728,48 +728,54 @@ export function useQuote({
           const originChain = getChainInfo(fromChainId)
           const nativeTokenSymbol = originChain?.nativeCurrency?.symbol ?? ""
 
-          const [balanceResult, nativePriceResult] = await Promise.all([
-            queryClient
-              .ensureQueryData(
-                balanceQueries.withPrices(
-                  walletClient.account!.address,
-                  indexerGatewayClient,
-                  trailsClient,
-                ),
-              )
-              .catch((balanceError: unknown) => {
-                if (isNetworkError(balanceError)) {
-                  logger.console.warn(
-                    "[trails-sdk] [useQuote] Network error fetching balances, proceeding with quote using zero balance:",
-                    {
-                      error: balanceError,
-                      account: walletClient.account!.address,
-                    },
-                  )
-                  return { balances: [] }
-                }
-                throw balanceError
-              }),
-
-            nativeTokenSymbol
-              ? getTokenPrice(trailsClient, {
-                  tokenSymbol: nativeTokenSymbol,
-                  tokenAddress: zeroAddress,
-                  chainId: fromChainId,
-                }).catch((error) => {
-                  logger.console.error(
-                    "[trails-sdk] [useQuote] Error getting origin native token price:",
-                    error,
-                  )
-                  return null
-                })
-              : Promise.resolve(null),
-          ])
+          const balanceResult = await queryClient
+            .ensureQueryData(
+              balanceQueries.withPrices(
+                walletClient.account!.address,
+                indexerGatewayClient,
+                trailsClient,
+              ),
+            )
+            .catch((balanceError: unknown) => {
+              if (isNetworkError(balanceError)) {
+                logger.console.warn(
+                  "[trails-sdk] [useQuote] Network error fetching balances, proceeding with quote using zero balance:",
+                  {
+                    error: balanceError,
+                    account: walletClient.account!.address,
+                  },
+                )
+                return { balances: [] }
+              }
+              throw balanceError
+            })
 
           const balances = balanceResult.balances
-          const originNativeTokenPriceUsd = nativePriceResult?.priceUsd ?? 0
+          const nativeTokenFromBalances = balances.find(
+            (b: any) =>
+              b.chainId === fromChainId &&
+              (addressEqual(b.contractAddress, zeroAddress) || b.isNativeToken),
+          )
+          let originNativeTokenPriceUsd = nativeTokenFromBalances?.priceUsd ?? 0
+
+          // Reuse the price already fetched by balanceQueries.withPrices.
+          // Fallback only when native token is missing from the balances payload.
+          if (!originNativeTokenPriceUsd && nativeTokenSymbol) {
+            const nativePriceResult = await getTokenPrice(trailsClient, {
+              tokenSymbol: nativeTokenSymbol,
+              tokenAddress: zeroAddress,
+              chainId: fromChainId,
+            }).catch((error) => {
+              logger.console.error(
+                "[trails-sdk] [useQuote] Error getting origin native token price:",
+                error,
+              )
+              return null
+            })
+            originNativeTokenPriceUsd = nativePriceResult?.priceUsd ?? 0
+          }
 
-          if (nativePriceResult) {
+          if (originNativeTokenPriceUsd) {
             logger.console.log(
               "[trails-sdk] [useQuote] Origin native token price:",
               {
@@ -1065,7 +1071,7 @@ export function useQuote({
             destinationApproveAddress:
               prepareSendQuote.destinationApproveAddress ?? "",
             destinationCalldata: prepareSendQuote.destinationCalldata ?? "",
-            intentProtocolVersion: prepareSendQuote.intentProtocolVersion,
+            intentProtocol: prepareSendQuote.intentProtocol,
             // Fee breakdown fields
             trailsFeeBreakdown: prepareSendQuote.trailsFeeBreakdown ?? null,
             originGasUsd: prepareSendQuote.originGasUsd ?? null,

package/src/widget/hooks/useSelectedFundMethod.tsx

@@ -2,11 +2,19 @@ import { createContext, useContext, useState, type ReactNode } from "react"
 import { logger } from "../../logger.js"
 import type { FundMethod } from "../../transactionIntent/types.js"
 
+export interface SelectedMeshExchange {
+  integrationId: string
+  exchangeKey: string
+  exchangeName: string
+}
+
 interface SelectedFundMethodContextType {
   selectedFundMethod: FundMethod
   paymentMethod: { id: string; name: string }
+  selectedMeshExchange: SelectedMeshExchange | null
   setSelectedFundMethod: (method: FundMethod) => void
   setPaymentMethod: (paymentMethod: { id: string; name: string }) => void
+  setSelectedMeshExchange: (exchange: SelectedMeshExchange | null) => void
 }
 
 const SelectedFundMethodContext = createContext<
@@ -26,12 +34,16 @@ export const SelectedFundMethodProvider = ({
     id: string
     name: string
   }>({ id: "", name: "" })
+  const [selectedMeshExchange, setSelectedMeshExchange] =
+    useState<SelectedMeshExchange | null>(null)
 
   const value: SelectedFundMethodContextType = {
     selectedFundMethod,
     paymentMethod,
+    selectedMeshExchange,
     setSelectedFundMethod,
     setPaymentMethod,
+    setSelectedMeshExchange,
   }
 
   return (
@@ -71,7 +83,8 @@ export function useSkipBalanceFetch(): {
   // Check if current fund method should skip balance fetching
   const shouldSkipBalanceFetch =
     context.selectedFundMethod === "onramp-meld" ||
-    context.selectedFundMethod === "direct-transfer"
+    context.selectedFundMethod === "direct-transfer" ||
+    context.selectedFundMethod === "onramp-mesh"
 
   return {
     selectedFundMethod: context.selectedFundMethod,