Feat: react query 5 - 5, migration hooks

cypress/e2e/0-v2-markets/2-polygon-v2-market/0-assets/dai.polygon-v2.cy.ts

@@ -57,7 +57,7 @@ const testData = {
   },
 };
 
-describe('DAI INTEGRATION SPEC, POLYGON V2 MARKET', () => {
+describe.skip('DAI INTEGRATION SPEC, POLYGON V2 MARKET', () => {
   const skipTestState = skipState(false);
   configEnvWithTenderlyPolygonFork({ tokens: tokenSet(tokensToRequest) });
   borrow(testData.testCases.borrow, skipTestState, true);

cypress/e2e/0-v2-markets/2-polygon-v2-market/0-assets/matic.polygon-v2.cy.ts

@@ -14,6 +14,11 @@ import {
   borrowsUnavailable,
   dashboardAssetValuesVerification,
 } from '../../../../support/steps/verification.steps';
+import { RequestedTokens, tokenSet } from '../../../4-gho-ethereum/helpers/token.helper';
+
+const tokensToRequest: RequestedTokens = {
+  aMATICPolygonV2: 800,
+};
 
 const testData = {
   testCases: {
@@ -90,7 +95,7 @@ const testData = {
 
 describe('MATIC INTEGRATION SPEC, POLYGON V2 MARKET', () => {
   const skipTestState = skipState(false);
-  configEnvWithTenderlyPolygonFork({});
+  configEnvWithTenderlyPolygonFork({ tokens: tokenSet(tokensToRequest) });
 
   supply(testData.testCases.deposit, skipTestState, true);
   describe('Check Collateral switching', () => {

cypress/e2e/1-v3-markets/0-ethereum-v3-market/0-assets/dai.ethereum-v3.cy.ts

@@ -63,7 +63,7 @@ const testData = {
     },
     withdrawAndSwitch: {
       fromAsset: assets.ethereumV3Market.DAI,
-      toAsset: assets.ethereumV3Market.USDC,
+      toAsset: assets.ethereumV3Market.USDT,
       isCollateralFromAsset: true,
       amount: 5,
       hasApproval: false,

cypress/e2e/1-v3-markets/3-polygon-v3-market/0-assets/matic.polygon-v3.cy.ts

@@ -106,7 +106,7 @@ const testData = {
   },
 };
 //due frozen Matic
-describe.skip('MATIC INTEGRATION SPEC, POLYGON V3 MARKET', () => {
+describe('MATIC INTEGRATION SPEC, POLYGON V3 MARKET', () => {
   const skipTestState = skipState(false);
   configEnvWithTenderlyPolygonFork({ market: 'fork_proto_polygon_v3', v3: true });
 

cypress/e2e/1-v3-markets/3-polygon-v3-market/0-assets/usdc.polygon-v3.cy.ts

@@ -102,7 +102,7 @@ const testData = {
 };
 
 //due asset frozen
-describe.skip('USDC INTEGRATION SPEC, POLYGON V3 MARKET', () => {
+describe('USDC INTEGRATION SPEC, POLYGON V3 MARKET', () => {
   const skipTestState = skipState(false);
   configEnvWithTenderlyPolygonFork({
     market: 'fork_proto_polygon_v3',

cypress/fixtures/assets.json

@@ -962,6 +962,12 @@
       "collateral": true,
       "wrapped": false
     },
+    "USDT": {
+      "fullName": "USDT",
+      "shortName": "USDT",
+      "collateral": false,
+      "wrapped": false
+    },
     "WBTC": {
       "fullName": "WBTC Coin",
       "shortName": "WBTC",

pages/_app.page.tsx

@@ -54,11 +54,6 @@ const EmodeModal = dynamic(() =>
 const FaucetModal = dynamic(() =>
   import('src/components/transactions/Faucet/FaucetModal').then((module) => module.FaucetModal)
 );
-const MigrateV3Modal = dynamic(() =>
-  import('src/components/transactions/MigrateV3/MigrateV3Modal').then(
-    (module) => module.MigrateV3Modal
-  )
-);
 const RateSwitchModal = dynamic(() =>
   import('src/components/transactions/RateSwitch/RateSwitchModal').then(
     (module) => module.RateSwitchModal
@@ -161,7 +156,6 @@ export default function MyApp(props: MyAppProps) {
                             <EmodeModal />
                             <SwapModal />
                             <FaucetModal />
-                            <MigrateV3Modal />
                             <TransactionEventHandler />
                             <SwitchModal />
                             <StakingMigrateModal />

pages/v3-migration.page.tsx

@@ -1,10 +1,13 @@
 import { Trans } from '@lingui/macro';
 import { Box, Divider, useMediaQuery, useTheme } from '@mui/material';
 import dynamic from 'next/dynamic';
-import { useCallback, useEffect, useState } from 'react';
+import { useEffect, useMemo } from 'react';
 import { ConnectWalletPaper } from 'src/components/ConnectWalletPaper';
 import { ContentContainer } from 'src/components/ContentContainer';
-import { useCurrentTimestamp } from 'src/hooks/useCurrentTimestamp';
+import { useUserMigrationReserves } from 'src/hooks/migration/useUserMigrationReserves';
+import { useUserSummaryAfterMigration } from 'src/hooks/migration/useUserSummaryAfterMigration';
+import { useUserPoolReservesHumanized } from 'src/hooks/pool/useUserPoolReserves';
+import { useUserSummaryAndIncentives } from 'src/hooks/pool/useUserSummaryAndIncentives';
 import { usePermissions } from 'src/hooks/usePermissions';
 import { MainLayout } from 'src/layouts/MainLayout';
 import { useWeb3Context } from 'src/libs/hooks/useWeb3Context';
@@ -15,14 +18,8 @@ import { MigrationListItem } from 'src/modules/migration/MigrationListItem';
 import { MigrationListItemLoader } from 'src/modules/migration/MigrationListItemLoader';
 import { MigrationLists } from 'src/modules/migration/MigrationLists';
 import { MigrationTopPanel } from 'src/modules/migration/MigrationTopPanel';
-import { selectCurrentChainIdV3PoolReserve } from 'src/store/poolSelectors';
+import { selectCurrentChainIdV3MarketData } from 'src/store/poolSelectors';
 import { useRootStore } from 'src/store/root';
-import {
-  selectUserReservesForMigration,
-  selectV2UserSummaryAfterMigration,
-  selectV3UserSummary,
-  selectV3UserSummaryAfterMigration,
-} from 'src/store/v3MigrationSelectors';
 
 const MigrateV3Modal = dynamic(() =>
   import('src/components/transactions/MigrateV3/MigrateV3Modal').then(
@@ -32,53 +29,9 @@ const MigrateV3Modal = dynamic(() =>
 
 export default function V3Migration() {
   const { currentAccount, loading: web3Loading } = useWeb3Context();
-  const { isPermissionsLoading } = usePermissions();
-  const theme = useTheme();
-  const downToSM = useMediaQuery(theme.breakpoints.down('sm'));
-
-  const [loading, setLoading] = useState(true);
-
-  const refreshPoolData = useRootStore((store) => store.refreshPoolData);
-  const refreshPoolV3Data = useRootStore((store) => store.refreshPoolV3Data);
-  const refreshIncentiveData = useRootStore((store) => store.refreshIncentiveData);
-
-  useEffect(() => {
-    Promise.all([refreshPoolData(), refreshPoolV3Data(), refreshIncentiveData()]).finally(() =>
-      setLoading(false)
-    );
-  }, [refreshPoolData, refreshPoolV3Data, refreshIncentiveData]);
-
-  const currentTimeStamp = useCurrentTimestamp(10);
-
-  const {
-    supplyReserves,
-    borrowReserves,
-    healthFactor: v2HealthFactorBeforeMigration,
-    isolatedReserveV3,
-  } = useRootStore(
-    useCallback(
-      (state) => selectUserReservesForMigration(state, currentTimeStamp),
-      [currentTimeStamp]
-    )
-  );
-
-  // health factor calculation
-  const { v3UserSummaryBeforeMigration, v2UserSummaryAfterMigration, poolReserveV3 } = useRootStore(
-    (state) => ({
-      v2UserSummaryAfterMigration: selectV2UserSummaryAfterMigration(state, currentTimeStamp),
-      v3UserSummaryBeforeMigration: selectV3UserSummary(state, currentTimeStamp),
-      poolReserveV3: selectCurrentChainIdV3PoolReserve(state),
-    })
-  );
-
-  const v3UserSummaryAfterMigration = useRootStore(
-    useCallback(
-      (state) => selectV3UserSummaryAfterMigration(state, currentTimeStamp),
-      [currentTimeStamp]
-    )
-  );
-
-  // actions
+  const currentChainId = useRootStore((store) => store.currentChainId);
+  const currentNetworkConfig = useRootStore((store) => store.currentNetworkConfig);
+  const currentMarketData = useRootStore((store) => store.currentMarketData);
   const {
     selectAllSupply,
     selectAllBorrow,
@@ -91,6 +44,43 @@ export default function V3Migration() {
     getMigrationExceptionSupplyBalances,
   } = useRootStore();
 
+  const { isPermissionsLoading } = usePermissions();
+  const theme = useTheme();
+  const downToSM = useMediaQuery(theme.breakpoints.down('sm'));
+
+  const toMarketData = selectCurrentChainIdV3MarketData(currentChainId, currentNetworkConfig);
+  const fromMarketData = currentMarketData;
+
+  const { data: userMigrationReserves, isLoading: userMigrationReservesLoading } =
+    useUserMigrationReserves(currentMarketData, toMarketData);
+
+  const supplyReserves = useMemo(
+    () => userMigrationReserves?.supplyReserves || [],
+    [userMigrationReserves]
+  );
+  const borrowReserves = userMigrationReserves?.borrowReserves || [];
+  const isolatedReserveV3 = userMigrationReserves?.isolatedReserveV3;
+
+  const { data: fromUserSummaryAndIncentives, isLoading: fromUserSummaryAndIncentivesLoading } =
+    useUserSummaryAndIncentives(fromMarketData);
+  const fromHealthFactor = fromUserSummaryAndIncentives?.healthFactor || '0';
+
+  const { data: toUserReservesData, isLoading: toUserReservesDataLoading } =
+    useUserPoolReservesHumanized(toMarketData);
+  const { data: toUserSummaryForMigration, isLoading: toUserSummaryForMigrationLoading } =
+    useUserSummaryAndIncentives(toMarketData);
+  const toUserEModeCategoryId = toUserReservesData?.userEmodeCategoryId || 0;
+
+  const { data: userSummaryAfterMigration, isLoading: userSummaryAfterMigrationLoading } =
+    useUserSummaryAfterMigration(fromMarketData, toMarketData);
+
+  const loading =
+    userMigrationReservesLoading ||
+    fromUserSummaryAndIncentivesLoading ||
+    toUserReservesDataLoading ||
+    toUserSummaryForMigrationLoading ||
+    userSummaryAfterMigrationLoading;
+
   useEffect(() => {
     if (getMigrationExceptionSupplyBalances && supplyReserves.length > 0) {
       getMigrationExceptionSupplyBalances(supplyReserves);
@@ -110,16 +100,17 @@ export default function V3Migration() {
   };
 
   const handleToggleAllSupply = () => {
-    selectAllSupply(currentTimeStamp);
+    selectAllSupply(supplyReserves);
   };
 
   const handleToggleAllBorrow = () => {
-    selectAllBorrow(currentTimeStamp);
+    selectAllBorrow(borrowReserves);
   };
 
   const userControlledCollateral =
     Object.keys(selectedSupplyAssets).length > 1 &&
-    v3UserSummaryBeforeMigration.totalCollateralMarketReferenceCurrency == '0';
+    toUserSummaryForMigration &&
+    toUserSummaryForMigration.totalCollateralMarketReferenceCurrency == '0';
 
   return (
     <>
@@ -132,8 +123,10 @@ export default function V3Migration() {
             isBorrowPositionsAvailable={borrowReserves.length > 0}
             onSelectAllSupplies={handleToggleAllSupply}
             onSelectAllBorrows={handleToggleAllBorrow}
-            emodeCategoryId={poolReserveV3?.userEmodeCategoryId}
+            emodeCategoryId={toUserEModeCategoryId}
             isolatedReserveV3={isolatedReserveV3}
+            supplyReserves={supplyReserves}
+            borrowReserves={borrowReserves}
             suppliesPositions={
               <>
                 {loading ? (
@@ -156,8 +149,9 @@ export default function V3Migration() {
                       }
                       userControlledCollateral={userControlledCollateral}
                       canBeEnforced={
-                        v3UserSummaryBeforeMigration.totalCollateralMarketReferenceCurrency ==
-                          '0' && reserve.canBeEnforced
+                        toUserSummaryForMigration &&
+                        toUserSummaryForMigration.totalCollateralMarketReferenceCurrency == '0' &&
+                        reserve.canBeEnforced
                       }
                       userReserve={reserve}
                       amount={reserve.underlyingBalance}
@@ -209,17 +203,20 @@ export default function V3Migration() {
 
           {!downToSM && <Divider sx={{ my: 10 }} />}
 
-          <MigrationBottomPanel
-            hfV2Current={v2HealthFactorBeforeMigration}
-            hfV2AfterChange={v2UserSummaryAfterMigration.healthFactor}
-            hfV3Current={v3UserSummaryBeforeMigration.healthFactor}
-            v3SummaryAfterMigration={v3UserSummaryAfterMigration}
-            disableButton={
-              !Object.keys(selectedSupplyAssets).length && !Object.keys(selectedBorrowAssets).length
-            }
-            enteringIsolationMode={isolatedReserveV3?.enteringIsolationMode || false}
-            loading={loading}
-          />
+          {userSummaryAfterMigration && (
+            <MigrationBottomPanel
+              hfV2Current={fromHealthFactor}
+              hfV2AfterChange={userSummaryAfterMigration.fromUserSummaryAfterMigration.healthFactor}
+              hfV3Current={toUserSummaryForMigration?.healthFactor || '0'}
+              v3SummaryAfterMigration={userSummaryAfterMigration.toUserSummaryAfterMigration}
+              disableButton={
+                !Object.keys(selectedSupplyAssets).length &&
+                !Object.keys(selectedBorrowAssets).length
+              }
+              enteringIsolationMode={isolatedReserveV3?.enteringIsolationMode || false}
+              loading={loading}
+            />
+          )}
         </ContentContainer>
       ) : (
         <ConnectWalletPaper

src/components/transactions/MigrateV3/MigrateV3Actions.tsx

@@ -1,32 +1,50 @@
 import { ProtocolAction } from '@aave/contract-helpers';
 import { Trans } from '@lingui/macro';
 import { useTransactionHandler } from 'src/helpers/useTransactionHandler';
+import { UserMigrationReserves } from 'src/hooks/migration/useUserMigrationReserves';
+import { UserSummaryForMigration } from 'src/hooks/migration/useUserSummaryForMigration';
 import { useRootStore } from 'src/store/root';
 
 import { TxActionsWrapper } from '../TxActionsWrapper';
 
 export type MigrateV3ActionsProps = {
   isWrongNetwork: boolean;
   blocked: boolean;
+  userMigrationReserves: UserMigrationReserves;
+  toUserSummaryForMigration: UserSummaryForMigration;
 };
 
-export const MigrateV3Actions = ({ isWrongNetwork, blocked }: MigrateV3ActionsProps) => {
+export const MigrateV3Actions = ({
+  isWrongNetwork,
+  blocked,
+  userMigrationReserves,
+  toUserSummaryForMigration,
+}: MigrateV3ActionsProps) => {
   const migrateWithPermits = useRootStore((store) => store.migrateWithPermits);
   const migrateWithoutPermits = useRootStore((store) => store.migrateWithoutPermits);
   const getApprovePermitsForSelectedAssets = useRootStore(
     (store) => store.getApprovePermitsForSelectedAssets
   );
   const { approval, action, loadingTxns, requiresApproval, mainTxState, approvalTxState } =
     useTransactionHandler({
-      handleGetTxns: async () => await migrateWithoutPermits(),
+      handleGetTxns: async () =>
+        await migrateWithoutPermits(toUserSummaryForMigration, userMigrationReserves),
       handleGetPermitTxns: async (signatures, deadline) =>
-        await migrateWithPermits(signatures, deadline),
+        await migrateWithPermits(
+          signatures,
+          deadline,
+          toUserSummaryForMigration,
+          userMigrationReserves
+        ),
       tryPermit: true,
       permitAction: ProtocolAction.migrateV3,
     });
 
   const handleApproval = async () => {
-    const approvePermitsForSelectedAssets = await getApprovePermitsForSelectedAssets();
+    const approvePermitsForSelectedAssets = await getApprovePermitsForSelectedAssets(
+      toUserSummaryForMigration,
+      userMigrationReserves
+    );
     approval(approvePermitsForSelectedAssets);
   };
 

src/components/transactions/MigrateV3/MigrateV3Modal.tsx

@@ -1,15 +1,33 @@
 import React from 'react';
 import { BasicModal } from 'src/components/primitives/BasicModal';
+import { useUserMigrationReserves } from 'src/hooks/migration/useUserMigrationReserves';
+import { useUserSummaryForMigration } from 'src/hooks/migration/useUserSummaryForMigration';
 import { ModalType, useModalContext } from 'src/hooks/useModal';
+import { selectCurrentChainIdV3MarketData } from 'src/store/poolSelectors';
+import { useRootStore } from 'src/store/root';
 
 import { MigrateV3ModalContent } from './MigrateV3ModalContent';
 
 export const MigrateV3Modal = () => {
   const { type, close } = useModalContext();
 
+  const currentChainId = useRootStore((store) => store.currentChainId);
+  const currentNetworkConfig = useRootStore((store) => store.currentNetworkConfig);
+  const currentMarketData = useRootStore((store) => store.currentMarketData);
+  const toMarketData = selectCurrentChainIdV3MarketData(currentChainId, currentNetworkConfig);
+  const fromMarketData = currentMarketData;
+
+  const { data: userMigrationReserves } = useUserMigrationReserves(fromMarketData, toMarketData);
+  const { data: toUserSummaryForMigration } = useUserSummaryForMigration(toMarketData);
+
   return (
     <BasicModal open={type === ModalType.V3Migration} setOpen={close}>
-      <MigrateV3ModalContent />
+      {userMigrationReserves && toUserSummaryForMigration && (
+        <MigrateV3ModalContent
+          userMigrationReserves={userMigrationReserves}
+          toUserSummaryForMigration={toUserSummaryForMigration}
+        />
+      )}
     </BasicModal>
   );
 };