Merge branch 'main' into fix/filtering-by-apy

Author: AGMASO

src/components/Warnings/CooldownWarning.tsx

@@ -7,10 +7,8 @@ import { Link } from '../primitives/Link';
 import { Warning } from '../primitives/Warning';
 import { SecondsToString } from '../SecondsToString';
 
-const TWENTY_DAYS = 20 * 24 * 60 * 60;
-
-export const CooldownWarning = ({ cooldownSeconds }: { cooldownSeconds?: number }) => {
-  const cooldownTime = cooldownSeconds || TWENTY_DAYS;
+export const CooldownWarning = ({ cooldownSeconds }: { cooldownSeconds: number }) => {
+  const cooldownTime = cooldownSeconds;
 
   const trackEvent = useRootStore((store) => store.trackEvent);
   return (

src/components/transactions/Stake/StakeModalContent.tsx

@@ -112,7 +112,9 @@ export const StakeModalContent = ({ stakeAssetName, icon }: StakeProps) => {
         />
       )}
 
-      {nameFormatted !== 'GHO' && <CooldownWarning />}
+      {nameFormatted !== 'GHO' && stakeData?.stakeCooldownSeconds && (
+        <CooldownWarning cooldownSeconds={stakeData.stakeCooldownSeconds} />
+      )}
 
       <AssetInput
         value={amount}

src/components/transactions/StakeRewardClaimRestake/StakeRewardClaimRestakeModalContent.tsx

@@ -109,7 +109,9 @@ export const StakeRewardClaimRestakeModalContent = ({
           chainId={stakingChain}
         />
       )}
-      <CooldownWarning />
+      {stakeData?.stakeCooldownSeconds && (
+        <CooldownWarning cooldownSeconds={stakeData.stakeCooldownSeconds} />
+      )}
       <AssetInput
         value={amount}
         onChange={handleChange}

src/components/transactions/Switch/cowprotocol/cowprotocol.constants.ts

@@ -5,7 +5,18 @@ export const COW_UNSUPPORTED_ASSETS: Partial<
   Record<ModalType, Partial<Record<SupportedChainId, string[] | 'ALL'>>>
 > = {
   [ModalType.CollateralSwap]: {
-    [SupportedChainId.POLYGON]: 'ALL', // Waiting for better solvers support
+    [SupportedChainId.POLYGON]: [
+      '0x8eb270e296023e9d92081fdf967ddd7878724424'.toLowerCase(), // aPOLGHST not supported
+      '0x38d693ce1df5aadf7bc62595a37d667ad57922e5'.toLowerCase(), // aPolEURS not supported
+      '0xea1132120ddcdda2f119e99fa7a27a0d036f7ac9'.toLowerCase(), // aPolSTMATIC not supported
+      '0x6533afac2e7bccb20dca161449a13a32d391fb00'.toLowerCase(), // aPolJEUR not supported
+      '0x513c7e3a9c69ca3e22550ef58ac1c0088e918fff'.toLowerCase(), // aPolCRV not supported
+      '0xebe517846d0f36eced99c735cbf6131e1feb775d'.toLowerCase(), // aPolMIMATIC not supported
+      '0xc45a479877e1e9dfe9fcd4056c699575a1045daa'.toLowerCase(), // aPolSUSHI not supported
+      '0x8437d7c167dfb82ed4cb79cd44b7a32a1dd95c77'.toLowerCase(), // aPolAGEUR not supported
+      '0x724dc807b04555b71ed48a6896b6f41593b8c637'.toLowerCase(), // aPolDPI not supported
+      '0x8ffdf2de812095b1d19cb146e4c004587c0a0692'.toLowerCase(), // aPolBAL not supported
+    ],
     [SupportedChainId.AVALANCHE]: [
       '0x8eb270e296023e9d92081fdf967ddd7878724424'.toLowerCase(), // AVaMAI not supported
       '0x078f358208685046a11c85e8ad32895ded33a249'.toLowerCase(), // aVaWBTC not supported

src/ui-config/networksConfig.ts

@@ -274,7 +274,10 @@ export const prodNetworkConfig: Record<string, BaseNetworkConfig> = {
   },
   [ChainId.optimism]: {
     name: 'OP',
-    publicJsonRPCUrl: ['https://optimism-mainnet.public.blastapi.io', 'https://1rpc.io/op'],
+    publicJsonRPCUrl: [
+      'https://public-op-mainnet.fastnode.io',
+      'https://optimism-rpc.publicnode.com',
+    ],
     baseUniswapAdapter: '0x0',
     baseAssetSymbol: 'ETH',
     wrappedBaseAssetSymbol: 'WETH',