requested fixes

Author: mgrabina

src/components/transactions/Switch/BaseSwitchModalContent.tsx

@@ -521,25 +521,15 @@ export const BaseSwitchModalContent = ({
 
     if (modalType !== ModalType.CollateralSwap) {
       setIsSwapFlowSelected(true);
-    } else if (switchRates?.provider === 'cowprotocol' && !ratesLoading) {
-      if (shouldUseFlashloanValue) {
-        setShouldUseFlashloan(true);
-      } else {
-        setShouldUseFlashloan(false);
-        setIsSwapFlowSelected(true);
+    } else if (!ratesLoading && !!switchRates?.provider) {
+      if (shouldUseFlashloanValue === shouldUseFlashloan) {
+        return;
       }
-    } else if (
-      switchRates?.provider === 'paraswap' &&
-      !ratesLoading &&
-      shouldUseFlashloan === true
-    ) {
-      setIsSwapFlowSelected(true);
-    } else if (switchRates?.provider === 'paraswap' && !ratesLoading) {
-      // Only paraswap in given chain
+
       setShouldUseFlashloan(shouldUseFlashloanValue);
       setIsSwapFlowSelected(true);
     }
-  }, [modalType, switchRates, ratesLoading]);
+  }, [modalType, switchRates, ratesLoading, shouldUseFlashloan]);
 
   // Define default slippage for CoW
   useEffect(() => {

src/components/transactions/Switch/CollateralSwapModal.tsx

@@ -13,6 +13,10 @@ import { BaseSwitchModal } from './BaseSwitchModal';
 import { SwitchDetailsParams as SwitchDetailsParams } from './BaseSwitchModalContent';
 import { SwitchModalTxDetails } from './SwitchModalTxDetails';
 
+export const UNSUPPORTED_A_TOKENS_PER_CHAIN: Record<number, string[]> = {
+  [SupportedChainId.GNOSIS_CHAIN]: ['0xedbc7449a9b594ca4e053d9737ec5dc4cbccbfb2'.toLowerCase()], // EURe USD Price not supported
+};
+
 export const CollateralSwapModal = () => {
   const { args } = useModalContext() as ModalContextType<{
     underlyingAsset: string;
@@ -92,6 +96,12 @@ export const CollateralSwapModal = () => {
       return undefined;
     })
     .filter((token) => token !== undefined)
+    .filter(
+      (token) =>
+        !UNSUPPORTED_A_TOKENS_PER_CHAIN[currentNetworkConfig.wagmiChain.id]?.includes(
+          token.aToken.toLowerCase()
+        )
+    )
     .sort((a, b) => {
       const aBalance = parseFloat(a?.balance ?? '0');
       const bBalance = parseFloat(b?.balance ?? '0');
@@ -132,6 +142,12 @@ export const CollateralSwapModal = () => {
       };
     })
     .filter((token) => token !== undefined)
+    .filter(
+      (token) =>
+        !UNSUPPORTED_A_TOKENS_PER_CHAIN[currentNetworkConfig.wagmiChain.id]?.includes(
+          token.aToken.toLowerCase()
+        )
+    )
     .sort((a, b) => {
       const aBalance = parseFloat(a?.balance ?? '0');
       const bBalance = parseFloat(b?.balance ?? '0');

src/components/transactions/Switch/SwitchActions.tsx

@@ -396,18 +396,6 @@ export const SwitchActions = ({
   }, [inputSymbol, chainId, approvedAmount, inputAmount, setShowUSDTResetWarning, switchRates]);
 
   const invalidate = () => {
-    queryClient.invalidateQueries({
-      queryKey: queryKeysFactory.poolTokens(user, findByChainId(chainId) ?? currentMarketData),
-    });
-
-    queryClient.invalidateQueries({
-      queryKey: queryKeysFactory.transactionHistory(
-        user,
-        findByChainId(chainId) ?? currentMarketData
-      ),
-    });
-
-    // Refresh dashboard data after collateral swap
     queryClient.invalidateQueries({
       queryKey: queryKeysFactory.poolReservesDataHumanized(
         findByChainId(chainId) ?? currentMarketData
@@ -422,11 +410,15 @@ export const SwitchActions = ({
     });
 
     queryClient.invalidateQueries({
-      queryKey: queryKeysFactory.userPoolReservesIncentiveDataHumanized(
+      queryKey: queryKeysFactory.transactionHistory(
         user,
         findByChainId(chainId) ?? currentMarketData
       ),
     });
+
+    queryClient.invalidateQueries({
+      queryKey: queryKeysFactory.poolTokens(user, currentMarketData),
+    });
   };
 
   const action = async () => {
@@ -784,6 +776,8 @@ export const SwitchActions = ({
       );
     }
 
+    invalidate();
+
     try {
       const baseTrackingData: Record<string, string | number | undefined> = {
         chainId,
@@ -810,8 +804,6 @@ export const SwitchActions = ({
     } catch (error) {
       console.error('Error tracking swap event:', error);
     }
-
-    invalidate();
   };
 
   const approval = async () => {

src/hooks/useCowOrderToast.tsx

@@ -88,13 +88,30 @@ export const CowOrderToastProvider: React.FC<PropsWithChildren> = ({ children })
           const newMap = new Map(prev);
           newMap.delete(orderId);
 
+          queryClient.invalidateQueries({
+            queryKey: queryKeysFactory.poolReservesDataHumanized(
+              findByChainId(order.chainId) ?? currentMarketData
+            ),
+          });
+
+          queryClient.invalidateQueries({
+            queryKey: queryKeysFactory.userPoolReservesDataHumanized(
+              account,
+              findByChainId(order.chainId) ?? currentMarketData
+            ),
+          });
+
           queryClient.invalidateQueries({
             queryKey: queryKeysFactory.transactionHistory(
               account,
               findByChainId(order.chainId) ?? currentMarketData
             ),
           });
 
+          queryClient.invalidateQueries({
+            queryKey: queryKeysFactory.poolTokens(account, currentMarketData),
+          });
+
           if (newMap.size === 0) {
             setHasActiveOrders(false);
           }

src/modules/dashboard/lists/SuppliedPositionsList/SuppliedPositionsListItem.tsx

@@ -1,6 +1,7 @@
 import { ProtocolAction } from '@aave/contract-helpers';
 import { Trans } from '@lingui/macro';
 import { Button } from '@mui/material';
+import { UNSUPPORTED_A_TOKENS_PER_CHAIN } from 'src/components/transactions/Switch/CollateralSwapModal';
 import { useAppDataContext } from 'src/hooks/app-data-provider/useAppDataProvider';
 import { useAssetCaps } from 'src/hooks/useAssetCaps';
 import { useModalContext } from 'src/hooks/useModal';
@@ -26,6 +27,7 @@ export const SuppliedPositionsListItem = ({
   underlyingAsset,
 }: DashboardReserve) => {
   const { user } = useAppDataContext();
+  const currentNetworkConfig = useRootStore((store) => store.currentNetworkConfig);
   const { isIsolated, aIncentivesData, aTokenAddress, isFrozen, isActive, isPaused } = reserve;
   const { openSupply, openWithdraw, openCollateralChange, openCollateralSwap } = useModalContext();
   const { debtCeiling } = useAssetCaps();
@@ -105,7 +107,12 @@ export const SuppliedPositionsListItem = ({
       <ListButtonsColumn>
         {showSwitchButton ? (
           <Button
-            disabled={disableSwap}
+            disabled={
+              disableSwap ||
+              UNSUPPORTED_A_TOKENS_PER_CHAIN[currentNetworkConfig.wagmiChain.id]?.includes(
+                aTokenAddress.toLowerCase()
+              )
+            }
             variant="contained"
             onClick={() => {
               // track