Merge pull request #6545 from cowprotocol/release/24-11-2025

Release 24-11-2025

Author: shoom3301

apps/cowswap-frontend/.env

@@ -133,9 +133,13 @@ INTEGRATION_TESTS_INFURA_KEY=
 # Path regex (to detect environment)
 # REACT_APP_PATH_REGEX_ENS="/ipfs"
 
-
 # CMS base URL
 # REACT_APP_CMS_BASE_URL=http://localhost:1337/api
 
 # Notifications Telegram bot ID
 # REACT_APP_TG_BOT_ID=3713371337
+
+#######################################
+# Crowdin translations
+#######################################
+# CROWDIN_PERSONAL_TOKEN

apps/cowswap-frontend/.gitignore

@@ -1,13 +1,12 @@
 # See https://help.github.com/ignore-files/ for more about ignoring files.
 
-# generated contract types
+# generated language types
 /src/lib/locales/**/*.js
 /src/lib/locales/**/en-US.po
 /src/lib/locales/**/pseudo.po
 /src/locales/**/*.js
 /src/locales/**/*.ts
 /src/locales/**/*.json
-/src/locales/**/en-US.po
 /src/locales/**/pseudo.po
 
 # dependencies

apps/cowswap-frontend/LinguiJestProvider.tsx

@@ -0,0 +1,17 @@
+import { FC, ReactNode } from 'react'
+
+import { DEFAULT_LOCALE } from '@cowprotocol/common-const'
+
+import { i18n } from '@lingui/core'
+import { I18nProvider } from '@lingui/react'
+
+interface ProviderProps {
+  children: ReactNode
+}
+
+i18n.load(DEFAULT_LOCALE, {})
+i18n.activate(DEFAULT_LOCALE)
+
+export const LinguiWrapper: FC<ProviderProps> = ({ children }) => {
+  return <I18nProvider i18n={i18n}>{children}</I18nProvider>
+}

apps/cowswap-frontend/src/api/cowProtocol/errors/OperatorError.ts

@@ -1,3 +1,5 @@
+import { t } from '@lingui/core/macro'
+
 type ApiActionType = 'get' | 'create' | 'delete'
 
 export interface ApiErrorObject {
@@ -108,7 +110,7 @@ function _mapActionToErrorDetail(action?: ApiActionType) {
       console.error(
         '[OperatorError::_mapActionToErrorDetails] Uncaught error mapping error action type to server error. Please try again later.',
       )
-      return 'Something failed. Please try again later.'
+      return `Something failed. Please try again later.`
   }
 }
 
@@ -144,23 +146,33 @@ export default class OperatorError extends Error {
       case 404:
         return this.getErrorMessage(errorObject, action)
 
-      case 403:
-        return `The order cannot be ${action === 'create' ? 'accepted' : 'cancelled'}. Your account is deny-listed.`
+      case 403: {
+        const acceptedText = t`accepted`
+        const cancelledText = t`cancelled`
+        const statusText = action === 'create' ? acceptedText : cancelledText
+        return t`The order cannot be ${statusText}. Your account is deny-listed.`
+      }
 
-      case 429:
-        return `The order cannot be ${
-          action === 'create' ? 'accepted. Too many order placements' : 'cancelled. Too many order cancellations'
-        }. Please, retry in a minute`
+      case 429: {
+        const placementsText = t`accepted. Too many order placements`
+        const cancellationsText = t`cancelled. Too many order cancellations`
+        const msg = action === 'create' ? placementsText : cancellationsText
+        return t`The order cannot be ${msg}. Please, retry in a minute`
+      }
 
       case 500:
-      default:
+      default: {
         console.error(
           `[OperatorError::getErrorFromStatusCode] Error ${
             action === 'create' ? 'creating' : 'cancelling'
           } the order, status code:`,
           statusCode || 'unknown',
         )
-        return `Error ${action === 'create' ? 'creating' : 'cancelling'} the order`
+        const creatingText = t`creating`
+        const cancellingText = t`cancelling`
+        const verb = action === 'create' ? creatingText : cancellingText
+        return t`Error ${verb} the order`
+      }
     }
   }
   constructor(apiError: ApiErrorObject) {

apps/cowswap-frontend/src/common/constants/banners.ts

@@ -2,6 +2,7 @@
 export const BANNER_IDS = {
   DELEGATE: 'delegate-banner-v1',
   LIMIT_ORDERS_INFO: 'limitOrders_showInfoBanner',
+  LIMIT_ORDERS_PROTOCOL_FEE: 'limitOrders_cip74ProtocolFeeBanner',
   COW_AMM: 'cow_amm_banner_2024_va',
   ANNOUNCEMENT: 'announcementBannerClosed',
   HIRING_SPEECH_BUBBLE: 'cowHiringSpeechBubble:v0',

apps/cowswap-frontend/src/common/constants/routes.ts

@@ -2,6 +2,9 @@ import EXPERIMENT_ICON from '@cowprotocol/assets/cow-swap/experiment.svg'
 import { isInjectedWidget } from '@cowprotocol/common-utils'
 import { BadgeTypes } from '@cowprotocol/ui'
 
+import { MessageDescriptor } from '@lingui/core'
+import { msg } from '@lingui/core/macro'
+
 export const TRADE_WIDGET_PREFIX = isInjectedWidget() ? '/widget' : ''
 
 export const Routes = {
@@ -54,25 +57,45 @@ export interface IMenuItem {
   badgeType?: (typeof BadgeTypes)[keyof typeof BadgeTypes]
 }
 
-export const MENU_ITEMS: IMenuItem[] = [
-  { route: Routes.SWAP, label: 'Swap', description: 'Trade tokens' },
-  { route: Routes.LIMIT_ORDER, label: 'Limit', fullLabel: 'Limit order', description: 'Set your own price' },
-  { route: Routes.ADVANCED_ORDERS, label: 'TWAP', description: 'Place orders with a time-weighted average price' },
+export interface I18nIMenuItem extends Omit<IMenuItem, 'label' | 'fullLabel' | 'description' | 'badge'> {
+  label: MessageDescriptor
+  fullLabel?: MessageDescriptor
+  description: MessageDescriptor
+  badge?: MessageDescriptor
+}
+
+export const MENU_ITEMS: I18nIMenuItem[] = [
+  {
+    route: Routes.SWAP,
+    label: msg`Swap`,
+    description: msg`Trade tokens`,
+  },
+  {
+    route: Routes.LIMIT_ORDER,
+    label: msg`Limit`,
+    fullLabel: msg`Limit order`,
+    description: msg`Set your own price`,
+  },
+  {
+    route: Routes.ADVANCED_ORDERS,
+    label: msg`TWAP`,
+    description: msg`Place orders with a time-weighted average price`,
+  },
 ]
 
-export const HOOKS_STORE_MENU_ITEM: IMenuItem = {
+export const HOOKS_STORE_MENU_ITEM: I18nIMenuItem = {
   route: Routes.HOOKS,
-  label: 'Hooks',
-  description: 'Powerful tool to generate pre/post interaction for CoW Protocol',
+  label: msg`Hooks`,
+  description: msg`Powerful tool to generate pre/post interaction for CoW Protocol`,
   badgeImage: EXPERIMENT_ICON,
   badgeType: BadgeTypes.INFORMATION,
 }
 
-export const YIELD_MENU_ITEM: IMenuItem = {
+export const YIELD_MENU_ITEM: I18nIMenuItem = {
   route: Routes.YIELD,
-  label: 'Yield',
-  fullLabel: 'Yield',
-  description: 'Provide liquidity',
-  badge: 'New',
+  label: msg`Yield`,
+  fullLabel: msg`Yield`,
+  description: msg`Provide liquidity`,
+  badge: msg`New`,
   badgeType: BadgeTypes.ALERT,
 }

apps/cowswap-frontend/src/common/containers/CoWAmmBanner/index.tsx

@@ -8,6 +8,8 @@ import { ClosableBanner } from '@cowprotocol/ui'
 import { useIsSmartContractWallet, useWalletInfo } from '@cowprotocol/wallet'
 import { CurrencyAmount } from '@uniswap/sdk-core'
 
+import { t } from '@lingui/core/macro'
+
 import { useIsDarkMode } from 'legacy/state/user/hooks'
 
 import { useTradeNavigate } from 'modules/trade'
@@ -80,8 +82,8 @@ export function CoWAmmBanner({ isTokenSelectorView }: BannerProps) {
     <CoWAmmBannerContent
       id={bannerId}
       isDarkMode={isDarkMode}
-      title="CoW AMM"
-      ctaText={isSmartContractWallet ? 'Booooost APR!' : 'Booooost APR gas-free!'}
+      title={t`CoW AMM`}
+      ctaText={isSmartContractWallet ? t`Booooost APR!` : t`Booooost APR gas-free!`}
       isTokenSelectorView={!!isTokenSelectorView}
       vampireAttackContext={vampireAttackContext}
       tokensByAddress={tokensByAddress}

apps/cowswap-frontend/src/common/containers/ConfirmationModal/index.tsx

@@ -1,6 +1,8 @@
 import { useAtomValue } from 'jotai'
 
-import { confirmationModalContextAtom } from 'common/hooks/useConfirmationRequest'
+import { t } from '@lingui/core/macro'
+
+import { confirmationModalContextAtom, DEFAULT_CONFIRMATION_MODAL_CONTEXT } from 'common/hooks/useConfirmationRequest'
 import { ConfirmationModal as Pure, ConfirmationModalProps } from 'common/pure/ConfirmationModal'
 
 // TODO: Add proper return type annotation
@@ -13,12 +15,12 @@ export function ConfirmationModal({ isOpen, onDismiss }: Pick<ConfirmationModalP
     <Pure
       isOpen={isOpen}
       onDismiss={onDismiss}
-      title={title}
-      callToAction={callToAction}
+      title={title === DEFAULT_CONFIRMATION_MODAL_CONTEXT.title ? t`Confirm Action` : title}
+      callToAction={callToAction === DEFAULT_CONFIRMATION_MODAL_CONTEXT.callToAction ? t`Confirm` : callToAction}
       description={description}
       onEnable={onEnable}
       warning={warning}
-      confirmWord={confirmWord}
+      confirmWord={confirmWord === DEFAULT_CONFIRMATION_MODAL_CONTEXT.confirmWord ? t`confirm` : confirmWord}
       action={action}
       skipInput={skipInput}
     />

apps/cowswap-frontend/src/common/containers/InvalidLocalTimeWarning/index.tsx

@@ -1,5 +1,7 @@
 import { ReactNode } from 'react'
 
+import { Trans } from '@lingui/react/macro'
+
 import { useLocalTimeOffset } from './localTimeOffsetState'
 
 import { GlobalWarning } from '../../pure/GlobalWarning'
@@ -18,7 +20,10 @@ export function InvalidLocalTimeWarning(): ReactNode | null {
 
   return (
     <GlobalWarning>
-      Local device time is not accurate, CoW Swap most likely will not work correctly. Please adjust your device's time.
+      <Trans>
+        Local device time is not accurate, CoW Swap most likely will not work correctly. Please adjust your device's
+        time.
+      </Trans>
     </GlobalWarning>
   )
 }

apps/cowswap-frontend/src/common/containers/MultipleOrdersCancellationModal/index.tsx

@@ -6,6 +6,9 @@ import { Command } from '@cowprotocol/types'
 import { ButtonPrimary } from '@cowprotocol/ui'
 import { useWalletInfo } from '@cowprotocol/wallet'
 
+import { t } from '@lingui/core/macro'
+import { Trans } from '@lingui/react/macro'
+
 import { LegacyConfirmationModalContent } from 'legacy/components/TransactionConfirmationModal/LegacyConfirmationModalContent'
 import { useRequestOrderCancellation } from 'legacy/state/orders/hooks'
 
@@ -68,7 +71,7 @@ export function MultipleOrdersCancellationModal(props: Props): ReactNode {
 
   if (cancellationError) {
     const errorMessage = isRejectRequestProviderError(cancellationError)
-      ? 'User rejected signing the cancellation'
+      ? t`User rejected signing the cancellation`
       : getIsOrderBookTypedError(cancellationError)
         ? cancellationError.body.description || cancellationError.body.errorType
         : (getProviderErrorMessage(cancellationError) ?? String(cancellationError))
@@ -86,9 +89,9 @@ export function MultipleOrdersCancellationModal(props: Props): ReactNode {
         <ConfirmationPendingContent
           modalMode
           onDismiss={onDismiss}
-          title={<>Cancelling {ordersCount} orders</>}
-          description="Canceling your order"
-          operationLabel="cancellation"
+          title={t`Cancelling ${ordersCount} orders`}
+          description={t`Canceling your order`}
+          operationLabel={t`cancellation`}
         />
       </Modal>
     )
@@ -97,20 +100,24 @@ export function MultipleOrdersCancellationModal(props: Props): ReactNode {
   return (
     <Modal isOpen={isOpen} onDismiss={onDismiss}>
       <LegacyConfirmationModalContent
-        title={`Cancel multiple orders: ${ordersCount}`}
+        title={t`Cancel multiple orders: ${ordersCount}`}
         onDismiss={onDismiss}
         // TODO: Extract nested component outside render function
         // eslint-disable-next-line react/no-unstable-nested-components
         topContent={() => (
           <div>
-            <p>Are you sure you want to cancel {ordersCount} orders?</p>
+            <p>
+              <Trans>Are you sure you want to cancel {ordersCount} orders?</Trans>
+            </p>
           </div>
         )}
         // TODO: Extract nested component outside render function
         // eslint-disable-next-line react/no-unstable-nested-components
         bottomContent={() => (
           <div>
-            <ButtonPrimary onClick={signAndSendCancellation}>Request cancellations</ButtonPrimary>
+            <ButtonPrimary onClick={signAndSendCancellation}>
+              <Trans>Request cancellations</Trans>
+            </ButtonPrimary>
           </div>
         )}
       />