Merge remote-tracking branch 'origin/main' into feat/add-filters

Author: AGMASO

pages/_app.page.tsx

@@ -16,7 +16,7 @@ import { AddressBlocked } from 'src/components/AddressBlocked';
 import { Meta } from 'src/components/Meta';
 import { TransactionEventHandler } from 'src/components/TransactionEventHandler';
 import { GasStationProvider } from 'src/components/transactions/GasStation/GasStationProvider';
-import { CowOrderToast } from 'src/components/transactions/Switch/CowOrderToast';
+import { CowOrderToast } from 'src/components/transactions/Switch/cowprotocol/CowOrderToast';
 import { AppDataProvider } from 'src/hooks/app-data-provider/useAppDataProvider';
 import { CowOrderToastProvider } from 'src/hooks/useCowOrderToast';
 import { ModalContextProvider } from 'src/hooks/useModal';
@@ -35,6 +35,12 @@ const SwitchModal = dynamic(() =>
   import('src/components/transactions/Switch/SwitchModal').then((module) => module.SwitchModal)
 );
 
+const CollateralSwapModal = dynamic(() =>
+  import('src/components/transactions/Switch/CollateralSwap/CollateralSwapModal').then(
+    (module) => module.CollateralSwapModal
+  )
+);
+
 const BridgeModal = dynamic(() =>
   import('src/components/transactions/Bridge/BridgeModal').then((module) => module.BridgeModal)
 );
@@ -69,9 +75,6 @@ const RepayModal = dynamic(() =>
 const SupplyModal = dynamic(() =>
   import('src/components/transactions/Supply/SupplyModal').then((module) => module.SupplyModal)
 );
-const SwapModal = dynamic(() =>
-  import('src/components/transactions/Swap/SwapModal').then((module) => module.SwapModal)
-);
 const WithdrawModal = dynamic(() =>
   import('src/components/transactions/Withdraw/WithdrawModal').then(
     (module) => module.WithdrawModal
@@ -166,10 +169,10 @@ export default function MyApp(props: MyAppProps) {
                                   <DebtSwitchModal />
                                   <ClaimRewardsModal />
                                   <EmodeModal />
-                                  <SwapModal />
                                   <FaucetModal />
                                   <TransactionEventHandler />
                                   <SwitchModal />
+                                  <CollateralSwapModal />
                                   <StakingMigrateModal />
                                   <BridgeModal />
                                   <ReadOnlyModal />