Add savings USDC deposit and withdraw tests

packages/app/.env.playwright

@@ -5,7 +5,7 @@ VITE_FEATURE_CONFIGURABLE_SLIPPAGE=1
 
 # development
 VITE_DEV_DAI_NATIVE_ROUTES=1
-VITE_DEV_USDC_NATIVE_ROUTES=0
+VITE_DEV_USDC_NATIVE_ROUTES=1
 
 VITE_WALLET_CONNECT_ID='bd1843f2419f5d4c758366c55f9a556c'
 VITE_BLOCK_ANALITICA_API_URL=https://spark-api.blockanalitica.com/api

packages/app/src/features/dialogs/savings/common/e2e/SavingsDialog.PageObject.ts

@@ -74,13 +74,7 @@ export class SavingsDialogPageObject extends DialogPageObject {
     await expect(outcome).toContainText(transactionOverview.outcome)
   }
 
-  async expectToUseNativeSDaiAction({
-    asset,
-    amount,
-  }: {
-    asset: string
-    amount: number
-  }): Promise<void> {
+  async expectToUseNativeSDaiAction({ asset }: { asset: string }): Promise<void> {
     const actionsContainer = new ActionsPageObject(this.locatePanelByHeader('Actions'))
     if (this.type === 'deposit') {
       await actionsContainer.expectActions([
@@ -92,6 +86,21 @@ export class SavingsDialogPageObject extends DialogPageObject {
     }
   }
 
+  async expectToUsePSMActionsAction({ asset }: { asset: string }): Promise<void> {
+    const actionsContainer = new ActionsPageObject(this.locatePanelByHeader('Actions'))
+    if (this.type === 'deposit') {
+      await actionsContainer.expectActions([
+        { type: 'approve', asset },
+        { type: 'nativeSDaiDeposit', asset },
+      ])
+    } else {
+      await actionsContainer.expectActions([
+        { type: 'approve', asset: 'sDAI' },
+        { type: 'nativeSDaiWithdraw', asset },
+      ])
+    }
+  }
+
   async expectToUseLifiSwap(lifiSwapParams: LifiSwapParams): Promise<void> {
     const exchangeRow = this.locatePanelByHeader('Actions').getByTestId(
       testIds.actions.flavours.exchangeActionRow.wrapper,

packages/app/src/features/dialogs/savings/deposit/SavingsDepositDialog.test-e2e.ts

@@ -1,6 +1,5 @@
 import { ActionsPageObject } from '@/features/actions/ActionsContainer.PageObject'
 import { SavingsPageObject } from '@/pages/Savings.PageObject'
-import { DEFAULT_BLOCK_NUMBER } from '@/test/e2e/constants'
 import { LIFI_TEST_USER_PRIVATE_KEY, overrideLiFiRouteWithHAR } from '@/test/e2e/lifi'
 import { setup } from '@/test/e2e/setup'
 import { setupFork } from '@/test/e2e/setupFork'
@@ -12,37 +11,6 @@ test.describe('Savings deposit dialog', () => {
   // The tests here are not independent.
   // My guess is that reverting to snapshots in tenderly does not work properly - but for now couldn't debug that.
   // For now tests use different forks.
-  test.describe('DAI', () => {
-    const fork = setupFork({ blockNumber: DEFAULT_BLOCK_NUMBER, chainId: mainnet.id })
-
-    test('wraps DAI', async ({ page }) => {
-      await setup(page, fork, {
-        initialPage: 'savings',
-        account: {
-          type: 'connected',
-          assetBalances: {
-            ETH: 1,
-            DAI: 100,
-          },
-          privateKey: LIFI_TEST_USER_PRIVATE_KEY,
-        },
-      })
-
-      const savingsPage = new SavingsPageObject(page)
-
-      await savingsPage.clickStartSavingButtonAction()
-
-      const depositDialog = new SavingsDialogPageObject({ page, type: 'deposit' })
-      await depositDialog.fillAmountAction(100)
-
-      const actionsContainer = new ActionsPageObject(depositDialog.locatePanelByHeader('Actions'))
-      await actionsContainer.acceptAllActionsAction(2)
-      await depositDialog.clickBackToSavingsButton()
-
-      await savingsPage.expectCurrentWorth('100')
-    })
-  })
-
   test.describe('xDAI', () => {
     // Block number has to be as close as possible to the block number when query was executed
     const blockNumber = 34227645n
@@ -79,42 +47,6 @@ test.describe('Savings deposit dialog', () => {
     })
   })
 
-  test.describe('USDC', () => {
-    const blockNumber = 19990683n
-    const fork = setupFork({ blockNumber, chainId: mainnet.id })
-
-    test('wraps USDC', async ({ page }) => {
-      await setup(page, fork, {
-        initialPage: 'savings',
-        account: {
-          type: 'connected',
-          assetBalances: {
-            ETH: 1,
-            USDC: 100,
-          },
-          privateKey: LIFI_TEST_USER_PRIVATE_KEY,
-        },
-      })
-      await overrideLiFiRouteWithHAR({
-        page,
-        key: '100-usdc-to-sdai',
-      })
-
-      const savingsPage = new SavingsPageObject(page)
-
-      await savingsPage.clickDepositButtonAction('USDC')
-
-      const depositDialog = new SavingsDialogPageObject({ page, type: 'deposit' })
-      await depositDialog.fillAmountAction(100)
-
-      const actionsContainer = new ActionsPageObject(depositDialog.locatePanelByHeader('Actions'))
-      await actionsContainer.acceptAllActionsAction(2)
-      await depositDialog.clickBackToSavingsButton()
-
-      await savingsPage.expectCurrentWorth('99.85')
-    })
-  })
-
   test.describe('USDC on Gnosis', () => {
     // Block number has to be as close as possible to the block number when query was executed
     const blockNumber = 34227645n
@@ -153,7 +85,7 @@ test.describe('Savings deposit dialog', () => {
   })
 
   test.describe('Slippage', () => {
-    const blockNumber = 19519583n
+    const blockNumber = 20089938n
     const fork = setupFork({ blockNumber, chainId: mainnet.id })
 
     test('default', async ({ page }) => {
@@ -163,7 +95,7 @@ test.describe('Savings deposit dialog', () => {
           type: 'connected',
           assetBalances: {
             ETH: 1,
-            USDC: 100,
+            USDT: 100,
           },
           privateKey: LIFI_TEST_USER_PRIVATE_KEY,
         },
@@ -172,12 +104,12 @@ test.describe('Savings deposit dialog', () => {
 
       await overrideLiFiRouteWithHAR({
         page,
-        key: '100-usdc-to-sdai-slippage-0.001',
+        key: '100-usdt-to-sdai-slippage-0.001',
       })
 
       const savingsPage = new SavingsPageObject(page)
 
-      await savingsPage.clickDepositButtonAction('USDC')
+      await savingsPage.clickDepositButtonAction('USDT')
 
       const depositDialog = new SavingsDialogPageObject({ page, type: 'deposit' })
       const actionsContainer = new ActionsPageObject(depositDialog.locatePanelByHeader('Actions'))
@@ -195,7 +127,7 @@ test.describe('Savings deposit dialog', () => {
           type: 'connected',
           assetBalances: {
             ETH: 1,
-            USDC: 100,
+            USDT: 100,
           },
           privateKey: LIFI_TEST_USER_PRIVATE_KEY,
         },
@@ -204,12 +136,12 @@ test.describe('Savings deposit dialog', () => {
 
       await overrideLiFiRouteWithHAR({
         page,
-        key: '100-usdc-to-sdai-slippage-0.005',
+        key: '100-usdt-to-sdai-slippage-0.005',
       })
 
       const savingsPage = new SavingsPageObject(page)
 
-      await savingsPage.clickDepositButtonAction('USDC')
+      await savingsPage.clickDepositButtonAction('USDT')
 
       const depositDialog = new SavingsDialogPageObject({ page, type: 'deposit' })
       const actionsContainer = new ActionsPageObject(depositDialog.locatePanelByHeader('Actions'))
@@ -227,7 +159,7 @@ test.describe('Savings deposit dialog', () => {
           type: 'connected',
           assetBalances: {
             ETH: 1,
-            USDC: 100,
+            USDT: 100,
           },
           privateKey: LIFI_TEST_USER_PRIVATE_KEY,
         },
@@ -236,12 +168,12 @@ test.describe('Savings deposit dialog', () => {
 
       await overrideLiFiRouteWithHAR({
         page,
-        key: '100-usdc-to-sdai-slippage-0.007',
+        key: '100-usdt-to-sdai-slippage-0.007',
       })
 
       const savingsPage = new SavingsPageObject(page)
 
-      await savingsPage.clickDepositButtonAction('USDC')
+      await savingsPage.clickDepositButtonAction('USDT')
 
       const depositDialog = new SavingsDialogPageObject({ page, type: 'deposit' })
       const actionsContainer = new ActionsPageObject(depositDialog.locatePanelByHeader('Actions'))
@@ -260,7 +192,7 @@ test.describe('Savings deposit dialog', () => {
             type: 'connected',
             assetBalances: {
               ETH: 1,
-              USDC: 100,
+              USDT: 100,
             },
             privateKey: LIFI_TEST_USER_PRIVATE_KEY,
           },
@@ -270,12 +202,12 @@ test.describe('Savings deposit dialog', () => {
 
         await overrideLiFiRouteWithHAR({
           page,
-          key: '100-usdc-to-sdai-slippage-0.001',
+          key: '100-usdt-to-sdai-slippage-0.001',
         })
 
         const savingsPage = new SavingsPageObject(page)
 
-        await savingsPage.clickDepositButtonAction('USDC')
+        await savingsPage.clickDepositButtonAction('USDT')
 
         const depositDialog = new SavingsDialogPageObject({ page, type: 'deposit' })
         const actionsContainer = new ActionsPageObject(depositDialog.locatePanelByHeader('Actions'))
@@ -299,7 +231,7 @@ test.describe('Savings deposit dialog', () => {
             type: 'connected',
             assetBalances: {
               ETH: 1,
-              USDC: 100,
+              USDT: 100,
             },
             privateKey: LIFI_TEST_USER_PRIVATE_KEY,
           },
@@ -309,12 +241,12 @@ test.describe('Savings deposit dialog', () => {
 
         await overrideLiFiRouteWithHAR({
           page,
-          key: '100-usdc-to-sdai-slippage-0.001',
+          key: '100-usdt-to-sdai-slippage-0.001',
         })
 
         const savingsPage = new SavingsPageObject(page)
 
-        await savingsPage.clickDepositButtonAction('USDC')
+        await savingsPage.clickDepositButtonAction('USDT')
 
         const depositDialog = new SavingsDialogPageObject({ page, type: 'deposit' })
         const actionsContainer = new ActionsPageObject(depositDialog.locatePanelByHeader('Actions'))
@@ -338,7 +270,7 @@ test.describe('Savings deposit dialog', () => {
             type: 'connected',
             assetBalances: {
               ETH: 1,
-              USDC: 100,
+              USDT: 100,
             },
             privateKey: LIFI_TEST_USER_PRIVATE_KEY,
           },
@@ -347,12 +279,12 @@ test.describe('Savings deposit dialog', () => {
 
         await overrideLiFiRouteWithHAR({
           page,
-          key: '100-usdc-to-sdai-slippage-0.001',
+          key: '100-usdt-to-sdai-slippage-0.001',
         })
 
         const savingsPage = new SavingsPageObject(page)
 
-        await savingsPage.clickDepositButtonAction('USDC')
+        await savingsPage.clickDepositButtonAction('USDT')
 
         const depositDialog = new SavingsDialogPageObject({ page, type: 'deposit' })
         const actionsContainer = new ActionsPageObject(depositDialog.locatePanelByHeader('Actions'))
@@ -482,7 +414,7 @@ test.describe('Savings deposit dialog', () => {
         await actionsContainer.expectNextActionEnabled()
         await actionsContainer.expectActions([
           { type: 'approve', asset: 'USDC' },
-          { type: 'exchange', inputAsset: 'USDC', outputAsset: 'sDAI' },
+          { type: 'nativeSDaiDeposit', asset: 'USDC' },
         ])
 
         await depositDialog.selectAssetAction('USDT')

packages/app/src/features/dialogs/savings/deposit/e2e/DepositDAI.test-e2e.ts

@@ -32,7 +32,7 @@ test.describe('Deposit DAI on Mainnet', () => {
   })
 
   test('uses native sDai deposit', async () => {
-    await depositDialog.expectToUseNativeSDaiAction({ asset: 'DAI', amount: 10_000 })
+    await depositDialog.expectToUseNativeSDaiAction({ asset: 'DAI' })
   })
 
   test('displays transaction overview', async () => {

packages/app/src/features/dialogs/savings/deposit/e2e/DepositUSDC.test-e2e.ts

@@ -0,0 +1,76 @@
+import { ActionsPageObject } from '@/features/actions/ActionsContainer.PageObject'
+import { SavingsPageObject } from '@/pages/Savings.PageObject'
+import { PSM_ACTIONS_DEPLOYED, PSM_ACTIONS_DEPLOYED_DATE } from '@/test/e2e/constants'
+import { setup } from '@/test/e2e/setup'
+import { setupFork } from '@/test/e2e/setupFork'
+import { test } from '@playwright/test'
+import { mainnet } from 'viem/chains'
+import { SavingsDialogPageObject } from '../../common/e2e/SavingsDialog.PageObject'
+
+test.describe('Deposit USDC on Mainnet', () => {
+  const fork = setupFork({
+    blockNumber: PSM_ACTIONS_DEPLOYED,
+    simulationDateOverride: PSM_ACTIONS_DEPLOYED_DATE,
+    chainId: mainnet.id,
+  })
+  let savingsPage: SavingsPageObject
+  let depositDialog: SavingsDialogPageObject
+
+  test.beforeEach(async ({ page }) => {
+    await setup(page, fork, {
+      initialPage: 'savings',
+      account: {
+        type: 'connected',
+        assetBalances: {
+          ETH: 1,
+          USDC: 10_000,
+        },
+      },
+    })
+
+    savingsPage = new SavingsPageObject(page)
+    await savingsPage.clickDepositButtonAction('USDC')
+
+    depositDialog = new SavingsDialogPageObject({ page, type: 'deposit' })
+    await depositDialog.fillAmountAction(10_000)
+  })
+
+  test('uses PSM actions native deposit', async () => {
+    await depositDialog.expectToUsePSMActionsAction({ asset: 'USDC' })
+  })
+
+  test('displays transaction overview', async () => {
+    await depositDialog.expectNativeRouteTransactionOverview({
+      apy: {
+        value: '8.00%',
+        description: '~800.00 DAI per year',
+      },
+      routeItems: [
+        {
+          tokenAmount: '10,000.00 USDC',
+          tokenUsdValue: '$10,000.00',
+        },
+        {
+          tokenAmount: '10,000.00 DAI',
+          tokenUsdValue: '$10,000.00',
+        },
+        {
+          tokenAmount: '9,196.30 sDAI',
+          tokenUsdValue: '$10,000.00',
+        },
+      ],
+      outcome: '9,196.30 sDAI worth $10,000.00',
+    })
+  })
+
+  test('executes deposit', async () => {
+    const actionsContainer = new ActionsPageObject(depositDialog.locatePanelByHeader('Actions'))
+    await actionsContainer.acceptAllActionsAction(2)
+
+    await depositDialog.expectSuccessPage()
+    await depositDialog.clickBackToSavingsButton()
+
+    await savingsPage.expectSavingsBalance({ sDaiBalance: '9,196.30 sDAI', estimatedDaiValue: '10,000' })
+    await savingsPage.expectCashInWalletAssetBalance('USDC', '-')
+  })
+})