misc fixes

Author: mgrabina

src/components/transactions/Swap/constants/cow.constants.ts

@@ -1,4 +1,4 @@
-import { OrderClass, SupportedChainId } from '@cowprotocol/cow-sdk';
+import { CowEnv, OrderClass, SupportedChainId } from '@cowprotocol/cow-sdk';
 
 import { getAssetGroup } from '../helpers/shared/assetCorrelation.helpers';
 import { OrderType, SwapType } from '../types';
@@ -65,6 +65,12 @@ export const isChainIdSupportedByCoWProtocol = (chainId: number): chainId is Sup
 export const COW_EVM_RECIPIENT = '0xC542C2F197c4939154017c802B0583C596438380';
 // export const COW_LENS_RECIPIENT = '0xce4eB8a1f6Bd0e0B9282102DC056B11E9D83b7CA';
 export const COW_PROTOCOL_ETH_FLOW_ADDRESS = '0xbA3cB449bD2B4ADddBc894D8697F5170800EAdeC';
+export const COW_PROTOCOL_ETH_FLOW_ADDRESS_STAGING = '0x04501b9b1D52e67f6862d157E00D13419D2D6E95';
+
+export const COW_PROTOCOL_ETH_FLOW_ADDRESS_BY_ENV = (env: CowEnv) => {
+  return env === 'staging' ? COW_PROTOCOL_ETH_FLOW_ADDRESS_STAGING : COW_PROTOCOL_ETH_FLOW_ADDRESS;
+};
+
 export const COW_CREATE_ORDER_ABI =
   'function createOrder((address,address,uint256,uint256,bytes32,uint256,uint32,bool,int64)) returns (bytes32)';
 

src/components/transactions/Swap/helpers/cow/orders.helpers.ts

@@ -23,7 +23,7 @@ import { SignedParams } from '../../actions/approval/useSwapTokenApproval';
 import {
   COW_APP_DATA,
   COW_CREATE_ORDER_ABI,
-  COW_PROTOCOL_ETH_FLOW_ADDRESS,
+  COW_PROTOCOL_ETH_FLOW_ADDRESS_BY_ENV,
   isChainIdSupportedByCoWProtocol,
 } from '../../constants/cow.constants';
 import { OrderType, SwapType } from '../../types';
@@ -112,6 +112,7 @@ export const getPreSignTransaction = async ({
       sellTokenDecimals: tokenSrcDecimals,
       buyTokenDecimals: tokenDestDecimals,
       owner: user as `0x${string}`,
+      env: COW_ENV,
     },
     {
       appData: COW_APP_DATA(
@@ -209,6 +210,7 @@ export const sendOrder = async ({
         sellTokenDecimals: tokenSrcDecimals,
         buyTokenDecimals: tokenDestDecimals,
         owner: user as `0x${string}`,
+        env: COW_ENV,
       },
       {
         appData,
@@ -377,7 +379,7 @@ export const populateEthFlowTx = async (
   ]);
 
   return {
-    to: COW_PROTOCOL_ETH_FLOW_ADDRESS,
+    to: COW_PROTOCOL_ETH_FLOW_ADDRESS_BY_ENV(COW_ENV),
     value,
     data,
   };

src/components/transactions/Swap/hooks/useSlippageSelector.ts

@@ -35,7 +35,7 @@ export const useSlippageSelector = ({
       }
     } else if (state.orderType === OrderType.MARKET) {
       // Restore to suggested slippage if available, otherwise last known market slippage, else default 0.10%
-      const target = lastMarketSlippageRef.current || state.autoSlippage;
+      const target = lastMarketSlippageRef.current || state.autoSlippage || '0.10';
       if (state.slippage !== target) {
         setState({ slippage: target });
       }

src/components/transactions/Swap/hooks/useSwapQuote.ts

@@ -195,6 +195,7 @@ export const useSwapQuote = ({
       setState({
         provider,
         swapRate: undefined, // Clear the old swap rate to force new quote
+        autoSlippage: '', // Clear suggested slippage until a new quote arrives
         quoteRefreshPaused: false, // Ensure quotes can be fetched
       });
     }

src/components/transactions/Swap/inputs/MarketOrderInputs.tsx

@@ -89,6 +89,7 @@ export const MarketOrderInputs = ({
               warnings: [],
               quoteRefreshPaused: true,
               quoteLastUpdatedAt: undefined,
+              autoSlippage: '',
             })
           }
           usdValue={state.inputAmountUSD.toString() || '0'}

src/components/transactions/Swap/inputs/SwapInputs.tsx

@@ -206,6 +206,7 @@ export const SwapInputs = ({
       swapRate: undefined,
       actionsLoading: false,
       slippage: '0.1',
+      autoSlippage: '',
       actionsBlocked: false,
       error: undefined,
       warnings: [],
@@ -266,6 +267,7 @@ export const SwapInputs = ({
           quoteRefreshPaused: false,
           quoteTimerPausedAt: undefined,
           quoteTimerPausedAccumMs: undefined,
+          autoSlippage: '',
           error: undefined,
           warnings: [],
           actionsBlocked: false,
@@ -284,6 +286,7 @@ export const SwapInputs = ({
         quoteRefreshPaused: false,
         quoteTimerPausedAt: undefined,
         quoteTimerPausedAccumMs: undefined,
+        autoSlippage: '',
         error: undefined,
         warnings: [],
         actionsBlocked: false,
@@ -316,6 +319,7 @@ export const SwapInputs = ({
           quoteRefreshPaused: false,
           quoteTimerPausedAt: undefined,
           quoteTimerPausedAccumMs: undefined,
+          autoSlippage: '',
           error: undefined,
           warnings: [],
           actionsBlocked: false,
@@ -334,6 +338,7 @@ export const SwapInputs = ({
         quoteRefreshPaused: false,
         quoteTimerPausedAt: undefined,
         quoteTimerPausedAccumMs: undefined,
+        autoSlippage: '',
         error: undefined,
         warnings: [],
         actionsBlocked: false,

src/components/transactions/Swap/inputs/primitives/SwapAssetInput.tsx

@@ -358,7 +358,11 @@ export const SwitchAssetInput = ({
             open={openModal}
             setOpen={setOpenModal}
             contentMaxWidth={420}
-            contentHeight={pickerHeight}
+            minContentHeight={600}
+            contentHeight={Math.max(
+              pickerHeight ?? 0,
+              mergedPopular.length && filteredAssets.length > 3 ? 600 : 0
+            )}
           >
             <Box sx={{ display: 'flex', flexDirection: 'column', height: '100%' }}>
               <Typography variant="main16" sx={{ fontSize: 18, fontWeight: 600, mb: 3 }}>

src/components/transactions/Swap/types/state.types.ts

@@ -250,7 +250,7 @@ export const swapDefaultState: SwapState = {
   quoteTimerPausedAccumMs: 0,
   quoteRefreshPaused: false,
   slippage: '0.10',
-  autoSlippage: '0.10',
+  autoSlippage: '',
   gasLimit: '0',
   useFlashloan: undefined,
   slippageValidation: undefined,