fix: fixed conflict merging main

Author: AGMASO

package.json

@@ -37,9 +37,8 @@
     "@amplitude/analytics-browser": "^2.13.0",
     "@bgd-labs/aave-address-book": "^4.36.3",
     "@cowprotocol/cow-sdk": "7.1.1",
-    "@cowprotocol/sdk-app-data": "4.1.6",
-    "@cowprotocol/sdk-flash-loans": "1.5.2",
-    "@cowprotocol/sdk-viem-adapter": "0.2.0",
+    "@cowprotocol/sdk-flash-loans": "1.5.3",
+    "@cowprotocol/sdk-ethers-v5-adapter": "0.2.0",
     "@emotion/cache": "11.10.3",
     "@emotion/react": "11.10.4",
     "@emotion/server": "latest",

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

@@ -77,14 +77,10 @@ export const COW_UNSUPPORTED_ASSETS: Partial<
     [SupportedChainId.BASE]: 'ALL', // Base is not supported
   },
   [SwapType.CollateralSwap]: {
-    [SupportedChainId.ARBITRUM_ONE]: 'ALL',
-    [SupportedChainId.AVALANCHE]: 'ALL',
-    [SupportedChainId.BNB]: 'ALL',
-    [SupportedChainId.GNOSIS_CHAIN]: 'ALL',
     [SupportedChainId.MAINNET]: 'ALL',
+    [SupportedChainId.BNB]: 'ALL',
     [SupportedChainId.POLYGON]: 'ALL',
     [SupportedChainId.SEPOLIA]: 'ALL',
-    // Base is supported
   },
   [SwapType.RepayWithCollateral]: {
     [SupportedChainId.ARBITRUM_ONE]: 'ALL',

src/components/transactions/Swap/errors/SwapErrors.tsx

@@ -1,4 +1,5 @@
 import React, { Dispatch, useEffect } from 'react';
+import { useZeroLTVBlockingWithdraw } from 'src/hooks/useZeroLTVBlockingWithdraw';
 
 import { useModalContext } from '../../../../hooks/useModal';
 import { TrackAnalyticsHandlers } from '../analytics/useTrackAnalytics';
@@ -35,6 +36,7 @@ export const SwapErrors = ({
   trackingHandlers: TrackAnalyticsHandlers;
 }) => {
   const { txError } = useModalContext();
+  const assetsBlockingWithdraw = useZeroLTVBlockingWithdraw();
 
   useEffect(() => {
     if (txError) {
@@ -78,7 +80,7 @@ export const SwapErrors = ({
     );
   }
 
-  if (hasZeroLTVBlocking(state, [])) {
+  if (hasZeroLTVBlocking(state, assetsBlockingWithdraw)) {
     return (
       <ZeroLTVBlockingGuard
         state={state}

src/components/transactions/Swap/errors/shared/ZeroLTVBlockingError.tsx

@@ -7,8 +7,8 @@ export const ZeroLTVBlockingError = ({ sx }: { sx?: SxProps }) => {
     <Warning severity="error" sx={{ mt: 4, ...sx }} icon={false}>
       <Typography variant="caption">
         <Trans>
-          You have assets with zero LTV that are blocking this operation. Please disable them as
-          collateral first.
+          You have assets with zero LTV that are blocking this operation. Please withdraw them or
+          disable them as collateral first.
         </Trans>
       </Typography>
     </Warning>

src/components/transactions/Swap/errors/shared/ZeroLTVBlockingGuard.tsx

@@ -6,11 +6,17 @@ import { ActionsBlockedReason, SwapError, SwapState, SwapType } from '../../type
 import { ZeroLTVBlockingError } from './ZeroLTVBlockingError';
 
 export const hasZeroLTVBlocking = (state: SwapState, blockingAssets: string[]) => {
-  return (
-    blockingAssets.length > 0 &&
-    !blockingAssets.includes(state.sourceToken.symbol) &&
-    state.swapType !== SwapType.RepayWithCollateral
-  );
+  // Never block RepayWithCollateral
+  if (state.swapType === SwapType.RepayWithCollateral) {
+    return false;
+  }
+  // For CollateralSwap, block if the user has any zero-LTV collateral enabled
+  if (state.swapType === SwapType.CollateralSwap) {
+    return blockingAssets.length > 0;
+  }
+  // For other swap types, block if there are zero-LTV assets enabled
+  // and the source token is not one of those (existing behavior)
+  return blockingAssets.length > 0 && !blockingAssets.includes(state.sourceToken.symbol);
 };
 
 export const ZeroLTVBlockingGuard = ({
@@ -38,7 +44,7 @@ export const ZeroLTVBlockingGuard = ({
         const blockingError: SwapError = {
           rawError: new Error('ZeroLTVBlockingError'),
           message:
-            'You have assets with zero LTV that are blocking this operation. Please disable them as collateral first.',
+            'You have assets with zero LTV that are blocking this operation. Please withdraw them or disable them as collateral first.',
           actionBlocked: true,
         };
         setState({
@@ -61,7 +67,7 @@ export const ZeroLTVBlockingGuard = ({
         });
       }
     }
-  }, [assetsBlockingWithdraw, state.sourceToken.symbol]);
+  }, [assetsBlockingWithdraw, state.sourceToken.symbol, state.swapType]);
 
   if (hasZeroLTVBlocking(state, assetsBlockingWithdraw)) {
     return <ZeroLTVBlockingError sx={{ mb: !isSwapFlowSelected ? 0 : 4, ...sx }} />;

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

@@ -1,8 +1,10 @@
 import { CowEnv, setGlobalAdapter, TradingSdk } from '@cowprotocol/cow-sdk';
+import { EthersV5Adapter } from '@cowprotocol/sdk-ethers-v5-adapter';
 import { AaveCollateralSwapSdk } from '@cowprotocol/sdk-flash-loans';
-import { ViemAdapter } from '@cowprotocol/sdk-viem-adapter';
+import { ethers } from 'ethers';
 import { wagmiConfig } from 'src/ui-config/wagmiConfig';
-import { getPublicClient, getWalletClient } from 'wagmi/actions';
+import { getProvider } from 'src/utils/marketsAndNetworksConfig';
+import { getWalletClient } from 'wagmi/actions';
 
 import { ADAPTER_FACTORY, HOOK_ADAPTER_PER_TYPE } from '../../constants/cow.constants';
 import { APP_CODE_PER_SWAP_TYPE } from '../../constants/shared.constants';
@@ -40,16 +42,33 @@ export const getCowFlashLoanSdk = async (chainId: number) => {
   return new AaveCollateralSwapSdk({
     hookAdapterPerType: HOOK_ADAPTER_PER_TYPE,
     aaveAdapterFactory: ADAPTER_FACTORY,
+    hooksGasLimit: {
+      pre: BigInt(300000),
+      post: BigInt(700000),
+    },
   });
 };
 
 export const getCowAdapter = async (chainId: number) => {
   const walletClient = await getWalletClient(wagmiConfig, { chainId });
-  const publicClient = getPublicClient(wagmiConfig, { chainId });
-
-  if (!publicClient || !walletClient) {
+  if (!walletClient) {
     throw new Error('Wallet not connected');
   }
 
-  return new ViemAdapter({ provider: publicClient, walletClient });
+  const eip1193Provider =
+    walletClient.transport?.value || (typeof window !== 'undefined' ? window.ethereum : undefined);
+
+  if (!eip1193Provider) {
+    throw new Error('No EIP-1193 provider available for signer');
+  }
+
+  const web3Provider = new ethers.providers.Web3Provider(eip1193Provider, 'any');
+  const signer = web3Provider.getSigner();
+
+  const provider = getProvider(chainId); // Use RPC proxy
+
+  return new EthersV5Adapter({
+    provider,
+    signer,
+  });
 };

src/locales/el/messages.js

@@ -1251,6 +1251,10 @@ msgstr "Costs & Fees"
 msgid "deposited"
 msgstr "deposited"
 
+#: src/components/transactions/Swap/errors/shared/ZeroLTVBlockingError.tsx
+msgid "You have assets with zero LTV that are blocking this operation. Please withdraw them or disable them as collateral first."
+msgstr "You have assets with zero LTV that are blocking this operation. Please withdraw them or disable them as collateral first."
+
 #: src/components/incentives/MeritIncentivesTooltipContent.tsx
 #: src/components/incentives/MeritIncentivesTooltipContent.tsx
 #: src/components/incentives/MerklIncentivesTooltipContent.tsx
@@ -3280,10 +3284,6 @@ msgstr "Cooldown to unstake"
 msgid "User does not have outstanding variable rate debt on this reserve"
 msgstr "User does not have outstanding variable rate debt on this reserve"
 
-#: src/components/transactions/Swap/errors/shared/ZeroLTVBlockingError.tsx
-msgid "You have assets with zero LTV that are blocking this operation. Please disable them as collateral first."
-msgstr "You have assets with zero LTV that are blocking this operation. Please disable them as collateral first."
-
 #: src/modules/faucet/FaucetAssetsList.tsx
 msgid "Test Assets"
 msgstr "Test Assets"