Merge branch 'main' into develop

Author: anxolin

.release-please-manifest.json

@@ -1,6 +1,6 @@
 {
   "apps/cowswap-frontend": "1.93.2",
-  "apps/explorer": "2.38.0",
+  "apps/explorer": "2.39.0",
   "libs/permit-utils": "0.5.0",
   "libs/widget-lib": "0.18.0",
   "libs/widget-react": "0.11.0",
@@ -18,7 +18,7 @@
   "libs/types": "1.5.0",
   "libs/ui": "1.16.0",
   "libs/wallet": "1.7.0",
-  "apps/cow-fi": "1.19.2",
+  "apps/cow-fi": "1.19.3",
   "libs/wallet-provider": "1.0.0",
   "libs/ui-utils": "1.1.0",
   "libs/abis": "1.2.0",

apps/cow-fi/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## [1.19.3](https://github.com/cowprotocol/cowswap/compare/cow-fi-v1.19.2...cow-fi-v1.19.3) (2024-12-16)
+
+
+### Bug Fixes
+
+* **cowfi:** fix pages crashes ([#5206](https://github.com/cowprotocol/cowswap/issues/5206)) ([525d079](https://github.com/cowprotocol/cowswap/commit/525d0794c10e0950dc0036f2f9c2e8e728117969))
+
 ## [1.19.2](https://github.com/cowprotocol/cowswap/compare/cow-fi-v1.19.1...cow-fi-v1.19.2) (2024-12-12)
 
 

apps/cow-fi/app/(learn)/learn/articles/[[...pageIndex]]/page.tsx

@@ -2,6 +2,7 @@
 
 import { Article, getArticles, getCategories } from '../../../../../services/cms'
 import { ArticlesPageComponents } from '@/components/ArticlesPageComponents'
+import { redirect } from 'next/navigation'
 
 const ITEMS_PER_PAGE = 24
 
@@ -28,7 +29,14 @@ export async function generateStaticParams() {
 
 export default async function Page({ params }: Props) {
   const pageParam = (await params)?.pageIndex
-  const page = pageParam && pageParam.length > 0 ? parseInt(pageParam[0], 10) : 1
+  const paramsAreSet = Boolean(pageParam && pageParam.length > 0)
+  const pageIndexIsValid = Boolean(pageParam && /^\d+$/.test(pageParam))
+
+  if (paramsAreSet && !pageIndexIsValid) {
+    return redirect('/learn/articles')
+  }
+
+  const page = pageParam && pageIndexIsValid ? parseInt(pageParam, 10) : 1
 
   const articlesResponse = (await getArticles({ page, pageSize: ITEMS_PER_PAGE })) as ArticlesResponse
 

apps/cow-fi/app/(main)/tokens/[tokenId]/page.tsx

@@ -9,6 +9,7 @@ import { TokenPageComponent } from '@/components/TokenPageComponent'
 import type { Metadata } from 'next'
 import type { TokenDetails } from '../../../../types'
 import { getPageMetadata } from '@/util/getPageMetadata'
+import { redirect } from 'next/navigation'
 
 type Props = {
   params: Promise<{ tokenId: string }>
@@ -35,6 +36,8 @@ export async function generateMetadata({ params }: Props): Promise<Metadata> {
 
   const token = await getTokenDetails(tokenId)
 
+  if (!token) return {}
+
   return getPageMetadata(getTokenMetaData(token))
 }
 
@@ -51,5 +54,7 @@ export default async function Page({ params }: Props) {
 
   const token = await getTokenDetails(tokenId)
 
+  if (!token) return redirect('/tokens')
+
   return <TokenPageComponent token={token} />
 }

apps/cow-fi/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cowprotocol/cow-fi",
-  "version": "1.19.2",
+  "version": "1.19.3",
   "description": "CoW DAO website",
   "main": "index.js",
   "author": "",

apps/cow-fi/services/tokens/index.ts

@@ -48,10 +48,10 @@ export async function getTokensInfo(): Promise<TokenInfo[]> {
  *
  * @returns token details for the given token id
  */
-export async function getTokenDetails(coingeckoId: string): Promise<TokenDetails> {
+export async function getTokenDetails(coingeckoId: string): Promise<TokenDetails | undefined> {
   const id = coingeckoId.toLowerCase()
   const tokensRaw = await _getAllTokensData()
-  return tokensRaw.find(({ id: _id }) => _id === id) as TokenDetails
+  return tokensRaw.find(({ id: _id }) => _id === id) as TokenDetails | undefined
 }
 
 function _getDescriptionFilePaths(): string[] {

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

@@ -839,7 +839,8 @@ function FinishedStep(props: OrderProgressBarV2Props) {
             {solvers.length > 1 && (
               <p>
                 <b>
-                  {solvers.length} out of {totalSolvers} solvers
+                  {solvers.length}
+                  {totalSolvers ? ` out of ${totalSolvers}` : ''} solvers
                 </b>{' '}
                 submitted a solution
               </p>

apps/explorer/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## [2.39.0](https://github.com/cowprotocol/cowswap/compare/explorer-v2.38.0...explorer-v2.39.0) (2024-12-17)
+
+
+### Features
+
+* warn about unsigned orders, and hide not relevant orders ([#5214](https://github.com/cowprotocol/cowswap/issues/5214)) ([0d19616](https://github.com/cowprotocol/cowswap/commit/0d196168076fda10e8e5d823d0288ce0ed1bd612))
+
 ## [2.38.0](https://github.com/cowprotocol/cowswap/compare/explorer-v2.37.0...explorer-v2.38.0) (2024-12-04)
 
 

apps/explorer/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cowprotocol/explorer",
-  "version": "2.38.0",
+  "version": "2.39.0",
   "description": "CoW Swap Explorer",
   "main": "src/main.tsx",
   "author": "",

apps/explorer/src/components/orders/DetailsTable/index.tsx

@@ -3,7 +3,7 @@ import React from 'react'
 import { ExplorerDataType, getExplorerLink } from '@cowprotocol/common-utils'
 import { SupportedChainId } from '@cowprotocol/cow-sdk'
 import { Command } from '@cowprotocol/types'
-import { Media } from '@cowprotocol/ui'
+import { Icon, Media, UI } from '@cowprotocol/ui'
 import { TruncatedText } from '@cowprotocol/ui/pure/TruncatedText'
 
 import { faFill, faGroupArrowsRotate, faHistory, faProjectDiagram } from '@fortawesome/free-solid-svg-icons'
@@ -31,6 +31,7 @@ import { Order } from 'api/operator'
 import { getUiOrderType } from 'utils/getUiOrderType'
 
 import { OrderHooksDetails } from '../OrderHooksDetails'
+import { UnsignedOrderWarning } from '../UnsignedOrderWarning'
 
 const tooltip = {
   orderID: 'A unique identifier ID for this order.',
@@ -87,6 +88,8 @@ const tooltip = {
 }
 
 export const Wrapper = styled.div`
+  --cow-color-alert: ${({ theme }): string => theme.alert2};
+
   display: flex;
   flex-direction: row;
 
@@ -126,6 +129,10 @@ export const LinkButton = styled(LinkWithPrefixNetwork)`
   }
 `
 
+const WarningRow = styled.tr`
+  background-color: ${({ theme }): string => theme.background};
+`
+
 export type Props = {
   chainId: SupportedChainId
   order: Order
@@ -167,12 +174,20 @@ export function DetailsTable(props: Props): React.ReactNode | null {
   }
 
   const onCopy = (label: string): void => clickOnOrderDetails('Copy', label)
+  const isSigning = status === 'signing'
 
   return (
     <SimpleTable
       columnViewMobile
       body={
         <>
+          {isSigning && (
+            <WarningRow>
+              <td colSpan={2}>
+                <UnsignedOrderWarning />
+              </td>
+            </WarningRow>
+          )}
           <tr>
             <td>
               <span>
@@ -195,6 +210,12 @@ export function DetailsTable(props: Props): React.ReactNode | null {
             </td>
             <td>
               <Wrapper>
+                {isSigning && (
+                  <>
+                    <Icon image="ALERT" color={UI.COLOR_ALERT} />
+                    &nbsp;
+                  </>
+                )}
                 <RowWithCopyButton
                   textToCopy={owner}
                   onCopy={(): void => onCopy('ownerAddress')}