0xtrails 0.13.0 → 0.13.2

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/useGetIntent.ts

@@ -1,4 +1,5 @@
 import { useQuery } from "@tanstack/react-query"
+import type { Intent } from "@0xtrails/api"
 import { useTrailsClient } from "../../trailsClient.js"
 import { getIntent } from "../../intents.js"
 import { useTrails } from "../providers/TrailsProvider.js"
@@ -9,11 +10,11 @@ export interface UseGetIntentParams {
 }
 
 export interface UseGetIntentReturn {
-  intent: import("@0xtrails/api").Intent | null
+  intent: Intent | null
   isLoading: boolean
   isError: boolean
   error: Error | null
-  refetch: () => void
+  refetch: () => Promise<void>
 }
 
 /**
@@ -46,8 +47,8 @@ export function useGetIntent({
     isLoading,
     isError,
     error: error as Error | null,
-    refetch: () => {
-      refetch()
+    refetch: async () => {
+      await refetch()
     },
   }
 }

package/src/widget/hooks/useIntentReceiptBalances.ts

@@ -20,7 +20,7 @@ interface UseIntentReceiptBalancesResult {
   hasRecoverableFunds: boolean
   isLoading: boolean
   error: Error | null
-  refetch: () => void
+  refetch: () => Promise<void>
 }
 
 type HistoryBalanceGroup = {
@@ -134,8 +134,8 @@ export function useIntentReceiptBalances({
     hasRecoverableFunds: (data?.hasBalance ?? false) && chainGroups.length > 0,
     isLoading,
     error: (error as Error) || null,
-    refetch: () => {
-      void refetch()
+    refetch: async () => {
+      await refetch()
     },
   }
 }

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
@@ -89,49 +91,6 @@ function mapIntentHistoryToTransaction(
   const originTokenMetadata = receipt.summary?.originTokenMetadata
   const destinationTokenMetadata = receipt.summary?.destinationTokenMetadata
 
-  // Determine effective status based on transaction status fields
-  // Priority: destinationTransactionStatus > originTransactionStatus > depositTransactionStatus > main status
-  let effectiveStatus = normalizeApiStatus(status)
-
-  // If destinationTransactionStatus exists and is not ABORTED or UNKNOWN, use it
-  if (
-    destinationStatus &&
-    destinationStatus !== "ABORTED" &&
-    destinationStatus !== "UNKNOWN"
-  ) {
-    effectiveStatus = normalizeApiStatus(destinationStatus)
-  }
-  // If destinationTransactionStatus doesn't exist but originTransactionStatus exists and is not ABORTED or UNKNOWN, use it
-  else if (
-    !destinationStatus &&
-    originStatus &&
-    originStatus !== "ABORTED" &&
-    originStatus !== "UNKNOWN"
-  ) {
-    effectiveStatus = normalizeApiStatus(originStatus)
-  }
-  // If depositTransactionStatus is ABORTED but origin/destination have non-ABORTED statuses, don't use aborted
-  // Only use aborted if deposit is ABORTED and origin/destination are also ABORTED or don't exist
-  else if (depositStatus === "ABORTED") {
-    // Check if origin or destination have non-ABORTED statuses
-    const hasNonAbortedOrigin = originStatus && originStatus !== "ABORTED"
-    const hasNonAbortedDestination =
-      destinationStatus && destinationStatus !== "ABORTED"
-
-    if (!hasNonAbortedOrigin && !hasNonAbortedDestination) {
-      // Only mark as aborted if no non-aborted statuses exist
-      effectiveStatus = "ABORTED"
-    }
-  }
-  // If originTransactionStatus is ABORTED and no destination status, use aborted
-  else if (originStatus === "ABORTED" && !destinationStatus) {
-    effectiveStatus = "ABORTED"
-  }
-  // If destinationTransactionStatus is ABORTED, use aborted
-  else if (destinationStatus === "ABORTED") {
-    effectiveStatus = "ABORTED"
-  }
-
   return {
     originIntentAddress: originIntentAddress,
     destinationIntentAddress: destinationIntentAddress,
@@ -139,7 +98,8 @@ function mapIntentHistoryToTransaction(
     intentId: intentId,
     metaTxnId: intentId,
     txnHash: originTransactionHash || destinationTransactionHash || undefined,
-    executionStatus: effectiveStatus,
+    intentStatus: normalizeApiStatus(status),
+    executionStatus: normalizeApiStatus(status),
     originChainId: originChainId,
     destinationChainId: destinationChainId,
     originTokenAddress: originTokenAddress,
@@ -154,6 +114,9 @@ function mapIntentHistoryToTransaction(
     depositTransactionStatus: depositStatus,
     originTransactionStatus: originStatus,
     destinationTransactionStatus: destinationStatus,
+    refundTransactionHash: refundTransactionHash,
+    refundTransactionStatus: refundStatus,
+    refundTransactionChainId: receipt.refundTransaction?.chainId,
     originToken:
       originTokenMetadata && originTokenAddress && originTokenAddress !== ""
         ? ({
@@ -618,13 +581,14 @@ export type UseIntentTransactionHistoryParams = {
   pageSize?: number
   enabled?: boolean
   refetchInterval?: number | false
+  intentStatuses?: string[]
 }
 
 export type UseIntentTransactionHistoryReturn = {
   transactions: IntentTransaction[]
   loading: boolean
   error: string | null
-  refetch: () => void
+  refetch: () => Promise<void>
   loadMore: () => void
   hasMore: boolean
   page: number
@@ -644,6 +608,7 @@ export function useIntentTransactionHistory({
   pageSize = 10,
   enabled = true,
   refetchInterval,
+  intentStatuses,
 }: UseIntentTransactionHistoryParams): UseIntentTransactionHistoryReturn {
   const trailsConfig = useTrails()
 
@@ -659,7 +624,13 @@ export function useIntentTransactionHistory({
   const currentPageObject = pageHistory[page]
 
   const { data, isLoading, error, refetch, isFetching } = useQuery({
-    queryKey: ["intentTransactionHistory", accountAddress, pageSize, page],
+    queryKey: [
+      "intentTransactionHistory",
+      accountAddress,
+      pageSize,
+      page,
+      intentStatuses?.join(",") ?? "all",
+    ],
     queryFn: async () => {
       if (!accountAddress || !trailsConfig.trailsApiKey) {
         throw new Error("Account address and API key required")
@@ -676,6 +647,10 @@ export function useIntentTransactionHistory({
         page: currentPageObject || { pageSize },
       }
 
+      if (intentStatuses && intentStatuses.length > 0) {
+        requestParams.byStatuses = intentStatuses
+      }
+
       logger.console.log(
         "[trails-sdk] getIntentHistory request:",
         requestParams,
@@ -801,7 +776,9 @@ export function useIntentTransactionHistory({
     transactions,
     loading: isLoading || isFetching,
     error: error instanceof Error ? error.message : null,
-    refetch,
+    refetch: async () => {
+      await refetch()
+    },
     loadMore: loadMoreHandler,
     hasMore,
     page,

package/src/widget/hooks/useMeldTransactionHistory.ts

@@ -72,7 +72,7 @@ export interface UseMeldTransactionHistoryReturn {
   transactions: MeldTransactionData[]
   loading: boolean
   error: string | null
-  refetch: () => void
+  refetch: () => Promise<void>
   hasMore: boolean
 }
 
@@ -176,7 +176,9 @@ export function useMeldTransactionHistory({
     transactions,
     loading: isLoading || isFetching,
     error: error instanceof Error ? error.message : null,
-    refetch,
+    refetch: async () => {
+      await refetch()
+    },
     hasMore: data?.hasMore ?? false,
   }
 }

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"
@@ -96,7 +96,7 @@ export interface UseMeldTransactionStatusResult {
   settledAmount: string | null
 
   // Actions
-  refetch: () => void
+  refetch: () => Promise<void>
   reset: () => void
   resetWindowClosed: () => void
   setWindowRef: (windowRef: Window | null) => void
@@ -138,7 +138,7 @@ export function useMeldTransactionStatus(
   const useSearchAPI = !!externalSessionId
 
   // React Query for transaction status
-  const query = useQuery({
+  const { data, refetch, isLoading, error } = useQuery({
     queryKey: ["meld-transaction-status", activeId, useSearchAPI],
     queryFn: async (): Promise<MeldTransaction> => {
       if (!activeId) {
@@ -510,7 +510,7 @@ export function useMeldTransactionStatus(
   }, [windowRef, windowClosed, onWindowClosed])
 
   // Compute derived states
-  const transaction = query.data || null
+  const transaction = data || null
   const status = transaction?.status
 
   const isComplete =
@@ -538,13 +538,13 @@ export function useMeldTransactionStatus(
   let state: TransactionState = "idle"
   if (windowClosed && !isComplete) {
     state = "window-closed"
-  } else if (query.error) {
+  } else if (error) {
     state = "error"
   } else if (isSuccess) {
     state = "success"
   } else if (isFailed) {
     state = "failed"
-  } else if (activeId && popupOpened && query.isLoading) {
+  } else if (activeId && popupOpened && isLoading) {
     state = "polling"
   } else if (activeId && popupOpened) {
     state = "polling"
@@ -557,9 +557,9 @@ export function useMeldTransactionStatus(
       message: getStatusMessage(state, status, timeElapsed),
       timeElapsed,
       transaction,
-      error: query.error as Error | null,
+      error: error as Error | null,
     }),
-    [state, status, timeElapsed, transaction, query.error],
+    [state, status, timeElapsed, transaction, error],
   )
 
   // Trigger status change callback
@@ -596,8 +596,8 @@ export function useMeldTransactionStatus(
   return {
     // Core status
     transaction,
-    isLoading: query.isLoading,
-    error: query.error as Error | null,
+    isLoading,
+    error: error as Error | null,
 
     // Computed states
     isComplete,
@@ -620,7 +620,9 @@ export function useMeldTransactionStatus(
     settledAmount,
 
     // Actions
-    refetch: query.refetch,
+    refetch: async () => {
+      await refetch()
+    },
     reset,
     resetWindowClosed,
     setWindowRef,

package/src/widget/hooks/useOnRampQuote.ts

@@ -35,7 +35,7 @@ export interface UseOnRampQuoteResult {
   /**
    * Manually trigger fetching with the current params
    */
-  refetch: () => void
+  refetch: () => Promise<void>
   /**
    * Tracking data for analytics
    */
@@ -332,8 +332,8 @@ export function useOnRampQuote(
     selectedQuote,
     isLoading,
     error: error as Error | null,
-    refetch: () => {
-      void refetch()
+    refetch: async () => {
+      await refetch()
     },
     onrampTrackingData,
   }

package/src/widget/hooks/useOnRampTransactionStatus.ts

@@ -57,7 +57,7 @@ export interface UseOnRampTransactionStatusResult {
   /**
    * Refetch the transaction status manually
    */
-  refetch: () => void
+  refetch: () => Promise<void>
 }
 
 /**
@@ -90,7 +90,7 @@ export function useOnRampTransactionStatus(
 
   const defaultOnrampClient = useOnrampClient()
 
-  const query = useQuery({
+  const { data, refetch, isLoading, error } = useQuery({
     queryKey: ["onramp-transaction-status", transactionId, "onrampClient"],
     queryFn: async (): Promise<MeldTransaction> => {
       if (!transactionId) {
@@ -169,7 +169,7 @@ export function useOnRampTransactionStatus(
     retryDelay: SECOND_MS,
   })
 
-  const transaction = query.data || null
+  const transaction = data || null
   const status = transaction?.status
 
   const isComplete =
@@ -178,17 +178,19 @@ export function useOnRampTransactionStatus(
   const isFailed = status === "FAILED" || status === "CANCELLED"
 
   // Don't expose 404 errors as actual errors since they're expected
-  const actualError = query.error as Error | null
+  const actualError = error as Error | null
   const shouldShowError =
     actualError && actualError.message !== "Transaction not registered yet"
 
   return {
     transaction,
-    isLoading: query.isLoading,
+    isLoading,
     error: shouldShowError ? actualError : null,
     isComplete,
     isSuccess,
     isFailed,
-    refetch: query.refetch,
+    refetch: async () => {
+      await refetch()
+    },
   }
 }