Merge branch 'feat/internationalization-setup-for-swap-cow-fi' into feat/update-lingui

Author: gabitoesmiapodo

.github/workflows/vercel.yml

@@ -46,8 +46,10 @@ jobs:
           REACT_APP_LAUNCH_DARKLY_KEY=${{ secrets.REACT_APP_LAUNCH_DARKLY_KEY }}
           REACT_APP_INFURA_KEY=${{ secrets.REACT_APP_INFURA_KEY }}
           REACT_APP_NETWORK_URL_1=${{ secrets.REACT_APP_NETWORK_URL_1 }}
+          REACT_APP_NETWORK_URL_56=${{ secrets.REACT_APP_NETWORK_URL_56 }}
           REACT_APP_NETWORK_URL_100=${{ secrets.REACT_APP_NETWORK_URL_100 }}
           REACT_APP_NETWORK_URL_137=${{ secrets.REACT_APP_NETWORK_URL_137 }}
+          REACT_APP_NETWORK_URL_232=${{ secrets.REACT_APP_NETWORK_URL_232 }}
           REACT_APP_NETWORK_URL_8453=${{ secrets.REACT_APP_NETWORK_URL_8453 }}
           REACT_APP_NETWORK_URL_42161=${{ secrets.REACT_APP_NETWORK_URL_42161 }}
           REACT_APP_NETWORK_URL_43114=${{ secrets.REACT_APP_NETWORK_URL_43114 }}

.release-please-manifest.json

@@ -1,5 +1,5 @@
 {
-  "apps/cowswap-frontend": "1.117.0",
+  "apps/cowswap-frontend": "1.117.1",
   "apps/explorer": "2.51.0",
   "libs/permit-utils": "0.8.0",
   "libs/widget-lib": "0.20.0",
@@ -14,7 +14,7 @@
   "libs/ens": "1.4.0",
   "libs/events": "1.7.0",
   "libs/snackbars": "1.1.3",
-  "libs/tokens": "1.24.1",
+  "libs/tokens": "1.24.2",
   "libs/types": "1.9.0",
   "libs/ui": "1.26.1",
   "libs/wallet": "1.14.0",

apps/cowswap-frontend/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## [1.117.1](https://github.com/cowprotocol/cowswap/compare/cowswap-v1.117.0...cowswap-v1.117.1) (2025-08-14)
+
+
+### Bug Fixes
+
+* **token-search:** increase results limit from 10 to 100 ([#6158](https://github.com/cowprotocol/cowswap/issues/6158)) ([b81c459](https://github.com/cowprotocol/cowswap/commit/b81c4598475a0b5097d7ff05046f41c8a3270ed8))
+
 ## [1.117.0](https://github.com/cowprotocol/cowswap/compare/cowswap-v1.116.0...cowswap-v1.117.0) (2025-08-12)
 
 

apps/cowswap-frontend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cowprotocol/cowswap",
-  "version": "1.117.0",
+  "version": "1.117.1",
   "description": "CoW Swap",
   "main": "index.js",
   "author": "",

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

@@ -17,8 +17,7 @@ import {
   V_COW_CONTRACT_ADDRESS,
   WRAPPED_NATIVE_CURRENCIES,
 } from '@cowprotocol/common-const'
-import { getContract } from '@cowprotocol/common-utils'
-import { isEns, isProd, isStaging } from '@cowprotocol/common-utils'
+import { getContract, isEns, isProd, isStaging } from '@cowprotocol/common-utils'
 import { COW_PROTOCOL_SETTLEMENT_CONTRACT_ADDRESS, CowEnv, SupportedChainId } from '@cowprotocol/cow-sdk'
 import { useWalletInfo } from '@cowprotocol/wallet'
 import { useWalletProvider } from '@cowprotocol/wallet-provider'
@@ -107,7 +106,9 @@ export function useWethContract(withSignerIfPossible?: boolean): UseContractResu
 export function useEthFlowContract(): {
   result: UseContractResult<CoWSwapEthFlow>
 } {
-  const contractAddress = getEthFlowContractAddresses(ethFlowEnv)
+  const { chainId } = useWalletInfo()
+
+  const contractAddress = getEthFlowContractAddresses(ethFlowEnv, chainId)
 
   return {
     result: useContract<CoWSwapEthFlow>(contractAddress, CoWSwapEthFlowAbi, true),

apps/cowswap-frontend/src/common/pure/NetworksList/index.tsx

@@ -1,3 +1,5 @@
+import { ReactNode } from 'react'
+
 import { getChainInfo } from '@cowprotocol/common-const'
 import { getExplorerBaseUrl } from '@cowprotocol/common-utils'
 import { SupportedChainId } from '@cowprotocol/cow-sdk'
@@ -7,25 +9,23 @@ import { Trans } from '@lingui/macro'
 
 import * as styledEl from './styled'
 
-const NEW_NETWORK_IDS = [137, 43114] // Avalanche, Polygon
+const NEW_NETWORK_IDS = [SupportedChainId.BNB, SupportedChainId.LENS] // BNB, Lens
 
 export interface NetworksListProps {
   currentChainId: SupportedChainId | null
   isDarkMode: boolean
   availableChains: SupportedChainId[]
+
   onSelectChain(targetChainId: SupportedChainId): void
 }
 
 // TODO: Break down this large function into smaller functions
-// TODO: Add proper return type annotation
-// eslint-disable-next-line max-lines-per-function, @typescript-eslint/explicit-function-return-type
-export function NetworksList(props: NetworksListProps) {
+export function NetworksList(props: NetworksListProps): ReactNode {
   const { currentChainId, isDarkMode, availableChains, onSelectChain } = props
 
   return (
     <>
       {/* TODO: Break down this large function into smaller functions */}
-      {/* eslint-disable-next-line max-lines-per-function */}
       {availableChains.map((targetChainId: SupportedChainId) => {
         const info = getChainInfo(targetChainId)
         const { label, logo, bridge, explorer, explorerTitle, helpCenterUrl } = info

apps/cowswap-frontend/src/legacy/components/Header/NetworkSelector/index.tsx

@@ -1,12 +1,12 @@
-import { useRef } from 'react'
+import { ReactNode, useRef } from 'react'
 
 import { getChainInfo } from '@cowprotocol/common-const'
 import { useAvailableChains } from '@cowprotocol/common-hooks'
 import { useOnClickOutside } from '@cowprotocol/common-hooks'
 import { useMediaQuery } from '@cowprotocol/common-hooks'
 import { UI } from '@cowprotocol/ui'
 import { Media } from '@cowprotocol/ui'
-import { useIsRabbyWallet, useIsSmartContractWallet, useWalletInfo } from '@cowprotocol/wallet'
+import { useIsRabbyWallet, useIsSmartContractWallet, useWalletInfo, useIsSafeViaWc } from '@cowprotocol/wallet'
 import { useWalletProvider } from '@cowprotocol/wallet-provider'
 
 import { Trans } from '@lingui/macro'
@@ -154,17 +154,15 @@ const NetworkAlertLabel = styled.div`
   }
 `
 
-// TODO: Break down this large function into smaller functions
-// TODO: Add proper return type annotation
-// eslint-disable-next-line max-lines-per-function, @typescript-eslint/explicit-function-return-type
-export function NetworkSelector() {
+export function NetworkSelector(): ReactNode {
   const provider = useWalletProvider()
   const { chainId } = useWalletInfo()
   const node = useRef<HTMLDivElement>(null)
   const nodeMobile = useRef<HTMLDivElement>(null)
   const isOpen = useModalIsOpen(ApplicationModal.NETWORK_SELECTOR)
   const toggleModal = useToggleModal(ApplicationModal.NETWORK_SELECTOR)
 
+  const isSafeViaWc = useIsSafeViaWc()
   const isSmartContractWallet = useIsSmartContractWallet()
   const isRabbyWallet = useIsRabbyWallet()
   const isChainIdUnsupported = useIsProviderNetworkUnsupported()
@@ -183,7 +181,7 @@ export function NetworkSelector() {
 
   const availableChains = useAvailableChains()
 
-  if (!provider || (isSmartContractWallet && !isRabbyWallet)) {
+  if (!provider || (isSmartContractWallet && !isRabbyWallet && !isSafeViaWc)) {
     return null
   }
 

apps/cowswap-frontend/src/legacy/hooks/useWrapCallback.ts

@@ -1,5 +1,5 @@
 import { useCowAnalytics } from '@cowprotocol/analytics'
-import { getChainCurrencySymbols, RADIX_HEX } from '@cowprotocol/common-const'
+import { RADIX_HEX } from '@cowprotocol/common-const'
 import {
   calculateGasMargin,
   formatTokenAmount,
@@ -8,6 +8,7 @@ import {
   isRejectRequestProviderError,
 } from '@cowprotocol/common-utils'
 import { SupportedChainId } from '@cowprotocol/cow-sdk'
+import { getChainCurrencySymbols } from '@cowprotocol/tokens'
 import { Command } from '@cowprotocol/types'
 import { BigNumber } from '@ethersproject/bignumber'
 import { Contract } from '@ethersproject/contracts'
@@ -50,14 +51,12 @@ export interface WrapUnwrapContext {
 
 type WrapAction = 'Send' | 'Sign' | 'Reject' | 'Error'
 
-// TODO: Add proper return type annotation
-// eslint-disable-next-line @typescript-eslint/explicit-function-return-type
 function sendWrapEvent(
   analytics: WrapUnwrapContext['analytics'],
   action: WrapAction,
   operationMessage: string,
   amount: CurrencyAmount<Currency>,
-) {
+): void {
   analytics.sendEvent({
     category: CowSwapAnalyticsCategory.WRAP_NATIVE_TOKEN,
     action,
@@ -108,9 +107,7 @@ export async function wrapUnwrapCallback(
     useModals && closeModals()
 
     return txResponse
-  // TODO: Replace any with proper type definitions
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  } catch (error: any) {
+  } catch (error: unknown) {
     useModals && closeModals()
 
     const isRejected = isRejectRequestProviderError(error)
@@ -197,9 +194,7 @@ async function unwrapContractCall(
   }
 }
 
-// TODO: Replace any with proper type definitions
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-function _handleGasEstimateError(error: any): BigNumber {
+function _handleGasEstimateError(error: unknown): BigNumber {
   console.log(
     '[useWrapCallback] Error estimating gas for wrap/unwrap. Using default gas limit ' +
       WRAP_UNWRAP_GAS_LIMIT_DEFAULT.toString(),

apps/cowswap-frontend/src/modules/account/containers/AccountDetails/SurplusCard.tsx

@@ -24,6 +24,8 @@ const ARBITRUM_ONE_START_DATE = 'May 2024'
 const BASE_START_DATE = 'December 2024'
 const POLYGON_START_DATE = 'June 2025'
 const AVALANCHE_START_DATE = 'June 2025'
+const LENS_START_DATE = 'August 2025'
+const BNB_START_DATE = 'September 2025' // TODO: Update when BNB is supported
 
 const START_DATE: Record<SupportedChainId, string> = {
   [SupportedChainId.MAINNET]: DEFAULT_START_DATE,
@@ -33,6 +35,8 @@ const START_DATE: Record<SupportedChainId, string> = {
   [SupportedChainId.SEPOLIA]: DEFAULT_START_DATE,
   [SupportedChainId.POLYGON]: POLYGON_START_DATE,
   [SupportedChainId.AVALANCHE]: AVALANCHE_START_DATE,
+  [SupportedChainId.LENS]: LENS_START_DATE,
+  [SupportedChainId.BNB]: BNB_START_DATE,
 }
 
 // TODO: Break down this large function into smaller functions

apps/cowswap-frontend/src/modules/account/containers/AccountDetails/index.tsx

@@ -156,24 +156,20 @@ export function AccountDetails({
         <AccountGroupingRow>
           <AccountControl>
             <WalletSecondaryActions>
-              {!isInjectedMobileBrowser && (
-                <>
-                  {account && !isChainIdUnsupported && (
-                    <AddressLink
-                      hasENS={!!ENSName}
-                      isENS={!!ENSName}
-                      href={getEtherscanLink(chainId, 'address', ENSName ? ENSName : account)}
-                    >
-                      {explorerLabel} ↗
-                    </AddressLink>
-                  )}
-
-                  {standaloneMode !== false && connectionType !== ConnectionType.GNOSIS_SAFE && (
-                    <WalletAction onClick={handleDisconnectClick}>
-                      <Trans>Disconnect</Trans>
-                    </WalletAction>
-                  )}
-                </>
+              {!isInjectedMobileBrowser && account && !isChainIdUnsupported && (
+                <AddressLink
+                  hasENS={!!ENSName}
+                  isENS={!!ENSName}
+                  href={getEtherscanLink(chainId, 'address', ENSName ? ENSName : account)}
+                >
+                  {explorerLabel} ↗
+                </AddressLink>
+              )}
+
+              {standaloneMode !== false && connectionType !== ConnectionType.GNOSIS_SAFE && (
+                <WalletAction onClick={handleDisconnectClick}>
+                  <Trans>Disconnect</Trans>
+                </WalletAction>
               )}
             </WalletSecondaryActions>
           </AccountControl>