Merge pull request #5029 from cowprotocol/release/2024-10-24

chore(release):2024 10 24

Author: alfetopito

apps/cow-fi/components/ArticlesList.tsx

@@ -7,7 +7,7 @@ interface ArticlesListProps {
   articles: Article[]
 }
 
-const ARTICLES_PATH = '/learn/articles/'
+const ARTICLES_PATH = '/learn/'
 
 export const ArticlesList: React.FC<ArticlesListProps> = ({ articles }) => (
   <LinkColumn>

apps/cowswap-frontend/.env

@@ -135,4 +135,4 @@ REACT_APP_MOCK=true
 # REACT_APP_DOMAIN_REGEX_ENS="(:?^cowswap\.eth|ipfs)"
 
 # Path regex (to detect environment)
-# REACT_APP_PATH_REGEX_ENS="/ipfs"
+# REACT_APP_PATH_REGEX_ENS="/ipfs"

apps/cowswap-frontend/package.json

@@ -30,4 +30,4 @@
   "dependencies": {},
   "devDependencies": {},
   "nx": {}
-}
+}

apps/cowswap-frontend/public/audio/halloween.mp3

@@ -10,7 +10,6 @@ import {
 } from '@cowprotocol/common-utils'
 import {
   Address,
-  SupportedChainId as ChainId,
   CompetitionOrderStatus,
   CowEnv,
   EnrichedOrder,
@@ -21,6 +20,7 @@ import {
   OrderQuoteSideKindSell,
   PartialApiContext,
   SigningScheme,
+  SupportedChainId as ChainId,
   TotalSurplus,
   Trade,
 } from '@cowprotocol/cow-sdk'
@@ -31,10 +31,13 @@ import { LegacyFeeQuoteParams as FeeQuoteParams } from 'legacy/state/price/types
 
 import { getAppData } from 'modules/appData'
 
+import { getQuoteValidFor } from 'utils/orderUtils/getQuoteValidFor'
+
 import { ApiErrorCodes } from './errors/OperatorError'
 import QuoteApiError, { mapOperatorErrorToQuoteError, QuoteApiErrorDetails } from './errors/QuoteError'
 import { getIsOrderBookTypedError } from './getIsOrderBookTypedError'
 
+
 function getProfileUrl(): Partial<Record<ChainId, string>> {
   if (isLocal || isDev || isPr || isBarn) {
     return {
@@ -70,7 +73,7 @@ function _fetchProfile(
   chainId: ChainId,
   url: string,
   method: 'GET' | 'POST' | 'DELETE',
-  data?: any
+  data?: any,
 ): Promise<Response> {
   const baseUrl = _getProfileApiBaseUrl(chainId)
 
@@ -96,19 +99,8 @@ const ETH_FLOW_AUX_QUOTE_PARAMS = {
 }
 
 function _mapNewToLegacyParams(params: FeeQuoteParams): OrderQuoteRequest {
-  const {
-    amount,
-    kind,
-    userAddress,
-    receiver,
-    validTo,
-    validFor,
-    sellToken,
-    buyToken,
-    chainId,
-    priceQuality,
-    isEthFlow,
-  } = params
+  const { amount, kind, userAddress, receiver, validFor, sellToken, buyToken, chainId, priceQuality, isEthFlow } =
+    params
   const fallbackAddress = userAddress || ZERO_ADDRESS
   const { appData, appDataHash } = _getAppDataQuoteParams(params)
 
@@ -122,7 +114,7 @@ function _mapNewToLegacyParams(params: FeeQuoteParams): OrderQuoteRequest {
     appDataHash,
     partiallyFillable: false,
     priceQuality,
-    ...(validFor ? { validFor } : { validTo }),
+    ...getQuoteValidFor(validFor),
   }
 
   if (isEthFlow) {
@@ -172,7 +164,7 @@ export async function getQuote(params: FeeQuoteParams): Promise<OrderQuoteRespon
       mapOperatorErrorToQuoteError({
         errorType: ApiErrorCodes.SameBuyAndSellToken,
         description: QuoteApiErrorDetails.SameBuyAndSellToken,
-      })
+      }),
     )
   }
 
@@ -208,7 +200,7 @@ export async function getOrders(
     offset?: number
     limit?: number
   },
-  context: PartialApiContext
+  context: PartialApiContext,
 ): Promise<EnrichedOrder[]> {
   return orderBookApi.getOrders(params, context)
 }
@@ -227,7 +219,7 @@ export async function getSurplusData(chainId: ChainId, address: string): Promise
 
 export async function getOrderCompetitionStatus(
   chainId: ChainId,
-  orderId: string
+  orderId: string,
 ): Promise<CompetitionOrderStatus | undefined> {
   try {
     return await orderBookApi.getOrderCompetitionStatus(orderId, { chainId })

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

@@ -7,6 +7,7 @@ export const Routes = {
   SWAP: `/:chainId?${TRADE_WIDGET_PREFIX}/swap/:inputCurrencyId?/:outputCurrencyId?`,
   HOOKS: `/:chainId?${TRADE_WIDGET_PREFIX}/swap/hooks/:inputCurrencyId?/:outputCurrencyId?`,
   LIMIT_ORDER: `/:chainId?${TRADE_WIDGET_PREFIX}/limit/:inputCurrencyId?/:outputCurrencyId?`,
+  YIELD: `/:chainId?${TRADE_WIDGET_PREFIX}/yield/:inputCurrencyId?/:outputCurrencyId?`,
   ADVANCED_ORDERS: `/:chainId?${TRADE_WIDGET_PREFIX}/advanced/:inputCurrencyId?/:outputCurrencyId?`,
   LONG_LIMIT_ORDER: `/:chainId?${TRADE_WIDGET_PREFIX}/limit-orders/:inputCurrencyId?/:outputCurrencyId?`,
   LONG_ADVANCED_ORDERS: `/:chainId?${TRADE_WIDGET_PREFIX}/advanced-orders/:inputCurrencyId?/:outputCurrencyId?`,
@@ -55,3 +56,10 @@ export const HOOKS_STORE_MENU_ITEM = {
   description: 'Powerful tool to generate pre/post interaction for CoW Protocol',
   badge: 'New',
 }
+
+export const YIELD_MENU_ITEM = {
+  route: Routes.YIELD,
+  label: 'Yield',
+  fullLabel: 'Yield',
+  description: 'Provide liquidity',
+}

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

@@ -16,8 +16,7 @@ export function InvalidLocalTimeWarning() {
 
   return (
     <GlobalWarning>
-      Local device time does is not accurate, CoW Swap most likely will not work correctly. Please adjust your device's
-      time.
+      Local device time is not accurate, CoW Swap most likely will not work correctly. Please adjust your device's time.
     </GlobalWarning>
   )
 }

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

@@ -9,6 +9,7 @@ const widgetTypeMap: Record<TradeType, string> = {
   [TradeType.LIMIT_ORDER]: 'LIMIT',
   // TODO: set different type for other advanced orders
   [TradeType.ADVANCED_ORDERS]: 'TWAP',
+  [TradeType.YIELD]: 'YIELD',
 }
 
 /**\

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

@@ -3,12 +3,23 @@ import { useMemo } from 'react'
 import { useFeatureFlags } from '@cowprotocol/common-hooks'
 import { isLocal } from '@cowprotocol/common-utils'
 
-import { HOOKS_STORE_MENU_ITEM, MENU_ITEMS } from '../constants/routes'
+import { HOOKS_STORE_MENU_ITEM, MENU_ITEMS, YIELD_MENU_ITEM } from '../constants/routes'
 
 export function useMenuItems() {
   const { isHooksStoreEnabled } = useFeatureFlags()
+  const { isYieldEnabled } = useFeatureFlags()
 
   return useMemo(() => {
-    return isHooksStoreEnabled || isLocal ? MENU_ITEMS.concat(HOOKS_STORE_MENU_ITEM) : MENU_ITEMS
-  }, [isHooksStoreEnabled])
+    const items = [...MENU_ITEMS]
+
+    if (isHooksStoreEnabled || isLocal) {
+      items.push(HOOKS_STORE_MENU_ITEM)
+    }
+
+    if (isYieldEnabled || isLocal) {
+      items.push(YIELD_MENU_ITEM)
+    }
+
+    return items
+  }, [isHooksStoreEnabled, isYieldEnabled])
 }