Merge branch 'develop' into fix/handle-usupported-chain-id-bff

Author: limitofzero

apps/cowswap-frontend/src/locales/es-ES.po

@@ -6274,6 +6274,12 @@ msgid "Swap and bridge costs are at least {formattedFeePercentage}% of the swap
 msgstr "Los costos de intercambio y puente son por lo menos {formattedFeePercentage}% del monto de intercambio"
 
 # Receive amount labels
+msgid "Receive (incl. fees)"
+msgstr "Recibir (incl. comisiones)"
+
+msgid "From (incl. fees)"
+msgstr "De (incl. comisiones)"
+
 # Notifications / jobs aria labels
 msgid "Trade alert settings"
 msgstr "Configuración de alertas de trading"

apps/cowswap-frontend/src/locales/ru-RU.po

@@ -6274,6 +6274,12 @@ msgid "Swap and bridge costs are at least {formattedFeePercentage}% of the swap
 msgstr "Затраты на замену и мост составляют не менее {formattedFeePercentage}% от суммы замены"
 
 # Receive amount labels
+msgid "Receive (incl. fees)"
+msgstr "К получению (с комиссиями)"
+
+msgid "From (incl. fees)"
+msgstr "Отправить (с комиссиями)"
+
 # Notifications / jobs aria labels
 msgid "Trade alert settings"
 msgstr "Настройки уведомлений о сделках"

apps/cowswap-frontend/src/modules/application/containers/App/RoutesApp.tsx

@@ -59,10 +59,8 @@ function LazyRoute({ route, element, key }: LazyRouteProps): ReactNode {
 }
 
 const lazyRoutes: LazyRouteProps[] = [
-  { route: RoutesEnum.LIMIT_ORDER, element: <LimitOrderPage /> },
   { route: RoutesEnum.YIELD, element: <YieldPage /> },
   { route: RoutesEnum.LONG_LIMIT_ORDER, element: <RedirectToPath path={'/limit'} /> },
-  { route: RoutesEnum.ADVANCED_ORDERS, element: <AdvancedOrdersPage /> },
   { route: RoutesEnum.LONG_ADVANCED_ORDERS, element: <RedirectToPath path={'/advanced'} /> },
   { route: RoutesEnum.ABOUT, element: <ExternalRedirect url={COWDAO_COWSWAP_ABOUT_LINK} /> },
   { route: RoutesEnum.FAQ, element: <ExternalRedirect url={COWDAO_KNOWLEDGE_BASE_LINK} /> },
@@ -99,6 +97,8 @@ export function RoutesApp(): ReactNode {
 
       {/*Swap*/}
       <Route path={RoutesEnum.SWAP} element={<SwapPage />} />
+      <Route path={RoutesEnum.LIMIT_ORDER} element={<LimitOrderPage />} />
+      <Route path={RoutesEnum.ADVANCED_ORDERS} element={<AdvancedOrdersPage />} />
       <Route path={RoutesEnum.HOOKS} element={<HooksPage />} />
       <Route path={RoutesEnum.SEND} element={<RedirectPathToSwapOnly />} />
 

apps/cowswap-frontend/src/pages/AdvancedOrders/index.tsx

@@ -1,10 +1,11 @@
 import { useAtomValue } from 'jotai'
-import { ReactNode } from 'react'
+import { ReactNode, Suspense } from 'react'
 
 import { PAGE_TITLES } from '@cowprotocol/common-const'
 
 import { useLingui } from '@lingui/react/macro'
 
+import { Loading } from 'legacy/components/FlashingLoading'
 import { OrderStatus } from 'legacy/state/orders/actions'
 
 import {
@@ -80,12 +81,14 @@ export default function AdvancedOrdersPage(): ReactNode {
 
         {!hideOrdersTable && (
           <styledEl.SecondaryWrapper>
-            <OrdersTableWidget
-              isTwapTable
-              displayOrdersOnlyForSafeApp
-              orderType={TabOrderTypes.ADVANCED}
-              orders={allEmulatedOrders}
-            />
+            <Suspense fallback={<Loading />}>
+              <OrdersTableWidget
+                isTwapTable
+                displayOrdersOnlyForSafeApp
+                orderType={TabOrderTypes.ADVANCED}
+                orders={allEmulatedOrders}
+              />
+            </Suspense>
           </styledEl.SecondaryWrapper>
         )}
       </styledEl.PageWrapper>

apps/cowswap-frontend/src/pages/LimitOrders/RegularLimitOrders.tsx

@@ -1,9 +1,10 @@
 import { useAtomValue } from 'jotai'
-import { ReactNode, useMemo } from 'react'
+import { ReactNode, Suspense, useMemo } from 'react'
 
 import { UiOrderType } from '@cowprotocol/types'
 import { useWalletInfo } from '@cowprotocol/wallet'
 
+import { Loading } from 'legacy/components/FlashingLoading'
 import { OrderStatus } from 'legacy/state/orders/actions'
 import { useOrders } from 'legacy/state/orders/hooks'
 
@@ -39,7 +40,9 @@ export function RegularLimitOrders(): ReactNode {
       {!hideOrdersTable && (
         <styledEl.SecondaryWrapper>
           {pendingLimitOrders.length > 0 && <LimitOrdersPermitUpdater orders={pendingLimitOrders} />}
-          <OrdersTableWidget orderType={TabOrderTypes.LIMIT} orders={allLimitOrders} />
+          <Suspense fallback={<Loading />}>
+            <OrdersTableWidget orderType={TabOrderTypes.LIMIT} orders={allLimitOrders} />
+          </Suspense>
         </styledEl.SecondaryWrapper>
       )}
     </styledEl.PageWrapper>

libs/common-const/src/locales.ts

@@ -8,3 +8,10 @@ export const SUPPORTED_LOCALES = [
 export type SupportedLocale = (typeof SUPPORTED_LOCALES)[number] | 'pseudo'
 
 export const DEFAULT_LOCALE: SupportedLocale = 'en-US'
+
+// Override display names shown in language selectors to ensure consistent wording
+export const LOCALE_DISPLAY_NAMES: Partial<Record<SupportedLocale, string>> = {
+  'en-US': 'English (US)',
+  'es-ES': 'Español (España)',
+  'ru-RU': 'Русский (Россия)',
+}

libs/ui/src/pure/MenuBar/index.tsx

@@ -16,6 +16,7 @@ import IMG_ICON_MENU_DOTS from '@cowprotocol/assets/images/menu-grid-dots.svg'
 import IMG_ICON_MENU_HAMBURGER from '@cowprotocol/assets/images/menu-hamburger.svg'
 import IMG_ICON_SETTINGS_GLOBAL from '@cowprotocol/assets/images/settings-global.svg'
 import IMG_ICON_X from '@cowprotocol/assets/images/x.svg'
+import { LOCALE_DISPLAY_NAMES } from '@cowprotocol/common-const'
 import { useMediaQuery, useOnClickOutside } from '@cowprotocol/common-hooks'
 import { addBodyClass, removeBodyClass } from '@cowprotocol/common-utils'
 
@@ -102,6 +103,11 @@ const DAO_NAV_ITEMS: MenuItem[] = [
 ]
 
 const getLanguageName = (locale: string): string => {
+  const override = LOCALE_DISPLAY_NAMES[locale as keyof typeof LOCALE_DISPLAY_NAMES]
+  if (override) {
+    return override
+  }
+
   const display = new Intl.DisplayNames([locale], { type: 'language' })
   const languageName = display.of(locale)