Merge pull request #6090 from cowprotocol/hotfix/2025-07-31

Hotfix 2025-07-31

Author: shoom3301

apps/cowswap-frontend/src/common/hooks/useSwapResultsContext.ts

@@ -28,7 +28,7 @@ export function useSwapResultsContext(
   const receivedAmount = useMemo(() => {
     if (!intermediateToken || !swappedAmountWithFee) return undefined
 
-    return CurrencyAmount.fromRawAmount(intermediateToken, swappedAmountWithFee.toString())
+    return CurrencyAmount.fromRawAmount(intermediateToken, swappedAmountWithFee.toFixed(0))
   }, [swappedAmountWithFee, intermediateToken])
 
   const receivedAmountUsd = useUsdAmount(receivedAmount).value

apps/cowswap-frontend/src/modules/tokensList/containers/SelectTokenWidget/index.tsx

@@ -95,6 +95,7 @@ export function SelectTokenWidget({ displayLpTokenLists, standalone }: SelectTok
   const importTokenCallback = useAddUserToken()
 
   const { tokens: allTokens, isLoading: areTokensLoading, favoriteTokens, areTokensFromBridge } = useTokensToSelect()
+
   const userAddedTokens = useUserAddedTokens()
   const allTokenLists = useAllListsList()
   const balancesState = useTokensBalancesCombined()

apps/cowswap-frontend/src/modules/trade/hooks/setupTradeState/useSetupTradeState.ts

@@ -206,7 +206,7 @@ export function useSetupTradeState(): void {
 
     if (!providerChainId || providerChainId === currentChainId) return
 
-    const targetChainId = rememberedUrlStateRef.current?.chainId || currentChainId
+    const targetChainId = urlChainId ?? rememberedUrlStateRef.current?.chainId ?? currentChainId
     switchNetworkInWallet(targetChainId)
 
     console.debug('[TRADE STATE]', 'Set chainId to provider', { provider, urlChainId })

apps/cowswap-frontend/src/modules/trade/hooks/setupTradeState/useSetupTradeStateFromUrl.ts

@@ -6,6 +6,12 @@ import { useLocation, useParams } from 'react-router'
 import { tradeStateFromUrlAtom } from '../../state/tradeStateFromUrlAtom'
 import { TradeRawState } from '../../types/TradeRawState'
 
+const getChainId = (chainId: string | undefined | null): number | null => {
+  if (!chainId) return null
+  if (/^\d+$/.test(chainId)) return Number(chainId)
+  return null
+}
+
 /**
  * Updater to fetch trade state from URL params and query, and store it on jotai state
  * /1/swap/WETH/DAI?recipient=0x -> { chainId: 1, inputCurrencyId: 'WETH', outputCurrencyId: 'DAI', recipient: '0x' }
@@ -18,30 +24,40 @@ export function useSetupTradeStateFromUrl(): null {
   const stringifiedParams = JSON.stringify(params)
   const setState = useSetAtom(tradeStateFromUrlAtom)
 
-  /**
-   * useEffect() runs after the render completes and useMemo() runs during rendering.
-   * In order to update tradeStateFromUrlAtom faster we use useMemo() here.
-   * We need this, because useSetupTradeState() depends on the atom value and needs it to be udpated ASAP.
-   */
-  useMemo(() => {
+  const { chainId, recipient, recipientAddress, targetChainId, inputCurrencyId, outputCurrencyId } = useMemo(() => {
     const searchParams = new URLSearchParams(location.search)
     const targetChainId = searchParams.get('targetChainId')
     const recipient = searchParams.get('recipient')
     const recipientAddress = searchParams.get('recipientAddress')
     const { chainId, inputCurrencyId, outputCurrencyId } = JSON.parse(stringifiedParams)
-    const chainIdAsNumber = chainId && /^\d+$/.test(chainId) ? parseInt(chainId) : null
 
+    return {
+      chainId: getChainId(chainId),
+      inputCurrencyId: inputCurrencyId ?? null,
+      outputCurrencyId: outputCurrencyId ?? null,
+      recipient,
+      recipientAddress,
+      targetChainId: getChainId(targetChainId),
+    }
+  }, [location.search, stringifiedParams])
+
+  /**
+   * useEffect() runs after the render completes and useMemo() runs during rendering.
+   * In order to update tradeStateFromUrlAtom faster we use useMemo() here.
+   * We need this, because useSetupTradeState() depends on the atom value and needs it to be udpated ASAP.
+   */
+  useMemo(() => {
     const state: TradeRawState = {
-      chainId: chainIdAsNumber,
-      targetChainId: targetChainId ? +targetChainId : null,
-      inputCurrencyId: inputCurrencyId || searchParams.get('inputCurrency') || null,
-      outputCurrencyId: outputCurrencyId || searchParams.get('outputCurrency') || null,
+      chainId,
+      targetChainId,
+      inputCurrencyId,
+      outputCurrencyId,
       ...(recipient ? { recipient } : undefined),
       ...(recipientAddress ? { recipientAddress } : undefined),
     }
 
     setState(state)
-  }, [location.search, stringifiedParams, setState])
+  }, [chainId, recipient, recipientAddress, setState, targetChainId, inputCurrencyId, outputCurrencyId])
 
   return null
 }

apps/cowswap-frontend/src/modules/tradeFormValidation/pure/TradeFormButtons/tradeButtonsMap.tsx

@@ -42,6 +42,10 @@ const quoteErrorTexts: Record<QuoteApiErrorCodes, string> = {
   [QuoteApiErrorCodes.SameBuyAndSellToken]: 'Tokens must be different',
 }
 
+const quoteErrorTextsForBridges: Partial<Record<QuoteApiErrorCodes, string>> = {
+  [QuoteApiErrorCodes.SameBuyAndSellToken]: 'Not yet supported',
+}
+
 const bridgeQuoteErrorTexts: Record<BridgeQuoteErrors, string> = {
   [BridgeQuoteErrors.API_ERROR]: DEFAULT_QUOTE_ERROR,
   [BridgeQuoteErrors.INVALID_BRIDGE]: DEFAULT_QUOTE_ERROR,
@@ -53,6 +57,11 @@ const bridgeQuoteErrorTexts: Record<BridgeQuoteErrors, string> = {
   [BridgeQuoteErrors.ONLY_SELL_ORDER_SUPPORTED]: 'Only "sell" orders are supported',
 }
 
+const errorTooltipContentForBridges: Partial<Record<QuoteApiErrorCodes, string>> = {
+  [QuoteApiErrorCodes.SameBuyAndSellToken]:
+    'Bridging without swapping is not yet supported. Let us know if you want this feature!',
+}
+
 // TODO: Add proper return type annotation
 // eslint-disable-next-line @typescript-eslint/explicit-function-return-type
 const unsupportedTokenButton = (context: TradeFormButtonContext) => {
@@ -105,15 +114,24 @@ export const tradeButtonsMap: Record<TradeFormValidation, ButtonErrorConfig | Bu
     const { quote } = context
 
     if (quote.error instanceof QuoteApiError) {
-      if (quote.error.type === QuoteApiErrorCodes.UnsupportedToken) {
+      const errorType = quote.error.type
+
+      if (errorType === QuoteApiErrorCodes.UnsupportedToken) {
         return unsupportedTokenButton(context)
       }
 
-      const errorText = quoteErrorTexts[quote.error.type] || DEFAULT_QUOTE_ERROR
+      const isBridge = quote.isBridgeQuote
+      const errorText =
+        (isBridge && quoteErrorTextsForBridges[errorType]) || quoteErrorTexts[errorType] || DEFAULT_QUOTE_ERROR
+
+      const errorTooltipText = isBridge && errorTooltipContentForBridges[errorType]
 
       return (
         <TradeFormBlankButton disabled={true}>
-          <Trans>{errorText}</Trans>
+          <>
+            <Trans>{errorText}</Trans>
+            {errorTooltipText && <HelpTooltip text={errorTooltipText} />}
+          </>
         </TradeFormBlankButton>
       )
     }

apps/cowswap-frontend/src/modules/tradeQuote/hooks/useTradeQuoteManager.ts

@@ -1,8 +1,13 @@
 import { useSetAtom } from 'jotai'
 import { useMemo } from 'react'
 
-import { BridgeQuoteResults, PriceQuality, QuoteBridgeRequest, SupportedChainId } from '@cowprotocol/cow-sdk'
-import { QuoteAndPost } from '@cowprotocol/cow-sdk'
+import {
+  BridgeQuoteResults,
+  PriceQuality,
+  QuoteAndPost,
+  QuoteBridgeRequest,
+  SupportedChainId,
+} from '@cowprotocol/cow-sdk'
 
 import { QuoteApiError, QuoteApiErrorCodes } from 'api/cowProtocol/errors/QuoteError'
 
@@ -14,13 +19,16 @@ import { TradeQuoteFetchParams } from '../types'
 
 export interface TradeQuoteManager {
   setLoading(hasParamsChanged: boolean): void
+
   reset(): void
+
   onError(
     error: TradeQuoteState['error'],
     chainId: SupportedChainId,
     quoteParams: QuoteBridgeRequest,
     fetchParams: TradeQuoteFetchParams,
   ): void
+
   onResponse(data: QuoteAndPost, bridgeQuote: BridgeQuoteResults | null, fetchParams: TradeQuoteFetchParams): void
 }
 
@@ -48,7 +56,13 @@ export function useTradeQuoteManager(sellTokenAddress: SellTokenAddress | undefi
               quoteParams: QuoteBridgeRequest,
               fetchParams: TradeQuoteFetchParams,
             ) {
-              update(sellTokenAddress, { error, fetchParams, isLoading: false, hasParamsChanged: false })
+              update(sellTokenAddress, {
+                error,
+                fetchParams,
+                isLoading: false,
+                hasParamsChanged: false,
+                isBridgeQuote: quoteParams.sellTokenChainId !== quoteParams.buyTokenChainId,
+              })
 
               if (error instanceof QuoteApiError && error.type === QuoteApiErrorCodes.UnsupportedToken) {
                 processUnsupportedTokenError(error, chainId, quoteParams)

apps/cowswap-frontend/src/modules/tradeQuote/state/tradeQuoteAtom.ts

@@ -1,6 +1,6 @@
 import { atom } from 'jotai'
 
-import { PriceQuality, QuoteAndPost, BridgeQuoteResults, BridgeProviderQuoteError } from '@cowprotocol/cow-sdk'
+import { BridgeProviderQuoteError, BridgeQuoteResults, PriceQuality, QuoteAndPost } from '@cowprotocol/cow-sdk'
 
 import { QuoteApiError } from 'api/cowProtocol/errors/QuoteError'
 
@@ -10,6 +10,7 @@ type SellTokenAddress = string
 
 export interface TradeQuoteState {
   quote: QuoteAndPost | null
+  isBridgeQuote: boolean | null
   bridgeQuote: BridgeQuoteResults | null
   fetchParams: TradeQuoteFetchParams | null
   error: QuoteApiError | BridgeProviderQuoteError | null
@@ -21,6 +22,7 @@ export interface TradeQuoteState {
 export const DEFAULT_TRADE_QUOTE_STATE: TradeQuoteState = {
   quote: null,
   bridgeQuote: null,
+  isBridgeQuote: null,
   fetchParams: null,
   error: null,
   hasParamsChanged: false,

libs/common-utils/src/doesTokenMatchSymbolOrAddress.ts

@@ -1,8 +1,6 @@
 import { TokenInfo } from '@cowprotocol/types'
 import { Token } from '@uniswap/sdk-core'
 
-// TODO: Add proper return type annotation
-// eslint-disable-next-line @typescript-eslint/explicit-function-return-type
-export const doesTokenMatchSymbolOrAddress = (token: Token | TokenInfo, symbolOrAddress?: string) =>
+export const doesTokenMatchSymbolOrAddress = (token: Token | TokenInfo, symbolOrAddress?: string): boolean =>
   token.address.toLowerCase() === symbolOrAddress?.toLowerCase() ||
   token.symbol?.toLowerCase() === symbolOrAddress?.toLowerCase()