Refactor e2e tests setup

packages/app/package.json

@@ -81,6 +81,8 @@
     "zustand": "^4.4.1"
   },
   "devDependencies": {
+    "@marsfoundation/common-nodejs": "workspace:^",
+    "@marsfoundation/common-testnets": "workspace:^",
     "@chromatic-com/storybook": "^1.5.0",
     "@playwright/test": "^1.47.2",
     "@sentry/react": "^7.114.0",

packages/app/src/config/chain/index.ts

@@ -18,7 +18,6 @@ import { zeroAddress } from 'viem'
 import { base, gnosis, mainnet } from 'viem/chains'
 import { NATIVE_ASSET_MOCK_ADDRESS, infoSkyApiUrl } from '../consts'
 import { AppConfig } from '../feature-flags'
-import { PLAYWRIGHT_USDS_CONTRACTS_NOT_AVAILABLE_KEY } from '../wagmi/config.e2e'
 import { SUPPORTED_CHAINS, farmAddresses, farmStablecoinsEntryGroup, susdsAddresses } from './constants'
 import { ChainConfigEntry, ChainMeta, SupportedChainId } from './types'
 
@@ -32,16 +31,13 @@ const commonTokenSymbolToReplacedName = {
   [TokenSymbol('weETH')]: { name: 'Ether.fi Staked ETH', symbol: TokenSymbol('weETH') },
 }
 
-const PLAYWRIGHT_MAINNET_USDS_CONTRACTS_NOT_AVAILABLE =
-  import.meta.env.VITE_PLAYWRIGHT === '1' && (window as any)[PLAYWRIGHT_USDS_CONTRACTS_NOT_AVAILABLE_KEY] === true
-
 const chainConfig: Record<SupportedChainId, ChainConfigEntry> = {
   [mainnet.id]: {
     originChainId: mainnet.id,
     daiSymbol: TokenSymbol('DAI'),
     sdaiSymbol: TokenSymbol('sDAI'),
-    usdsSymbol: PLAYWRIGHT_MAINNET_USDS_CONTRACTS_NOT_AVAILABLE ? undefined : TokenSymbol('USDS'),
-    susdsSymbol: PLAYWRIGHT_MAINNET_USDS_CONTRACTS_NOT_AVAILABLE ? undefined : TokenSymbol('sUSDS'),
+    usdsSymbol: TokenSymbol('USDS'),
+    susdsSymbol: TokenSymbol('sUSDS'),
     psmStables: [TokenSymbol('DAI'), TokenSymbol('USDC'), TokenSymbol('USDS')],
     meta: {
       name: 'Ethereum Mainnet',
@@ -89,25 +85,21 @@ const chainConfig: Record<SupportedChainId, ChainConfigEntry> = {
         oracleType: 'vault',
         address: CheckedAddress('0x83f20f44975d03b1b09e64809b757c47f942beea'),
       },
-      ...(PLAYWRIGHT_MAINNET_USDS_CONTRACTS_NOT_AVAILABLE
-        ? []
-        : ([
-            {
-              symbol: TokenSymbol('sUSDS'),
-              oracleType: 'vault',
-              address: susdsAddresses[mainnet.id],
-            },
-            {
-              symbol: TokenSymbol('USDS'),
-              oracleType: 'fixed-usd',
-              address: CheckedAddress('0xdC035D45d973E3EC169d2276DDab16f1e407384F'),
-            },
-            {
-              symbol: TokenSymbol('SKY'),
-              oracleType: 'zero-price',
-              address: CheckedAddress('0x56072C95FAA701256059aa122697B133aDEd9279'),
-            },
-          ] as const)),
+      {
+        symbol: TokenSymbol('sUSDS'),
+        oracleType: 'vault',
+        address: susdsAddresses[mainnet.id],
+      },
+      {
+        symbol: TokenSymbol('USDS'),
+        oracleType: 'fixed-usd',
+        address: CheckedAddress('0xdC035D45d973E3EC169d2276DDab16f1e407384F'),
+      },
+      {
+        symbol: TokenSymbol('SKY'),
+        oracleType: 'zero-price',
+        address: CheckedAddress('0x56072C95FAA701256059aa122697B133aDEd9279'),
+      },
     ],
     markets: {
       defaultAssetToBorrow: TokenSymbol('DAI'),
@@ -165,12 +157,8 @@ const chainConfig: Record<SupportedChainId, ChainConfigEntry> = {
     },
     savings: {
       savingsDaiInfoQuery: mainnetSavingsDaiInfoQuery,
-      savingsUsdsInfoQuery: PLAYWRIGHT_MAINNET_USDS_CONTRACTS_NOT_AVAILABLE ? undefined : mainnetSavingsUsdsInfoQuery,
-      inputTokens: [
-        TokenSymbol('DAI'),
-        TokenSymbol('USDC'),
-        ...(PLAYWRIGHT_MAINNET_USDS_CONTRACTS_NOT_AVAILABLE ? [] : [TokenSymbol('USDS')]),
-      ],
+      savingsUsdsInfoQuery: mainnetSavingsUsdsInfoQuery,
+      inputTokens: [TokenSymbol('DAI'), TokenSymbol('USDC'), TokenSymbol('USDS')],
       getEarningsApiUrl: (address) => `${infoSkyApiUrl}/savings-rate/wallets/${address.toLowerCase()}/?days_ago=9999`,
       savingsRateApiUrl: `${infoSkyApiUrl}/savings-rate/`,
     },

packages/app/src/config/feature-flags/appConfig.default.ts

@@ -49,6 +49,10 @@ export function getDefaultAppConfig(): AppConfig {
             address: '0xdC035D45d973E3EC169d2276DDab16f1e407384F',
             decimals: 18,
           },
+          cbBTC: {
+            address: '0xcbB7C0000aB88B473b1f5aFd9ef808440eed33Bf',
+            decimals: 8,
+          },
         },
       },
     },

packages/app/src/config/wagmi/config.e2e.ts

@@ -14,7 +14,6 @@ export const PLAYWRIGHT_CHAIN_ID = '__PLAYWRIGHT_CHAIN_ID' as const
 export const PLAYWRIGHT_WALLET_ADDRESS_KEY = '__PLAYWRIGHT_WALLET_ADDRESS' as const
 export const PLAYWRIGHT_WALLET_PRIVATE_KEY_KEY = '__PLAYWRIGHT_WALLET_PRIVATE_KEY' as const
 export const PLAYWRIGHT_WALLET_FORK_URL_KEY = '__PLAYWRIGHT_WALLET_FORK_URL_KEY' as const
-export const PLAYWRIGHT_USDS_CONTRACTS_NOT_AVAILABLE_KEY = '__PLAYWRIGHT_USDS_CONTRACTS_NOT_AVAILABLE' as const
 
 export const VIEM_TIMEOUT_ON_FORKS = 60_000 // forks tend to be slow. This improves reliability/performance. Default is 10_000
 

packages/app/src/features/actions/ActionsContainer.PageObject.ts

@@ -1,20 +1,17 @@
-import { Locator, Page, expect } from '@playwright/test'
+import { Locator, expect } from '@playwright/test'
 
 import { formatPercentage } from '@/domain/common/format'
 import { BasePageObject } from '@/test/e2e/BasePageObject'
-import { ForkContext } from '@/test/e2e/forking/setupFork'
-import { isPage } from '@/test/e2e/utils'
+import { TestContext } from '@/test/e2e/setup'
 import { testIds } from '@/ui/utils/testIds'
 import { Percentage } from '@marsfoundation/common-universal'
 import { ActionType } from './logic/types'
 
 export class ActionsPageObject extends BasePageObject {
-  constructor(pageOrLocator: Page | Locator) {
-    if (isPage(pageOrLocator)) {
-      super(pageOrLocator)
+  constructor(testContext: TestContext<any>, locator?: Locator) {
+    super(testContext, locator)
+    if (!locator) {
       this.region = this.locatePanelByHeader('Actions')
-    } else {
-      super(pageOrLocator)
     }
   }
 
@@ -27,27 +24,23 @@ export class ActionsPageObject extends BasePageObject {
   }
 
   // #region actions
-  async acceptAllActionsAction(expectedNumberOfActions: number, forkContext?: ForkContext): Promise<void> {
+  async acceptAllActionsAction(expectedNumberOfActions: number): Promise<void> {
     for (let index = 0; index < expectedNumberOfActions; index++) {
       const row = this.region.getByTestId(testIds.actions.row(index))
 
       await row.getByRole('button', { name: actionButtonRegex }).click()
+      await expect(row.getByRole('button', { name: actionButtonRegex })).not.toBeVisible()
       // @note: we are setting block timestamp of the next tx (especially after executing all txs)
-      if (forkContext?.isVnet) {
-        await expect(row.getByRole('button', { name: actionButtonRegex })).not.toBeVisible()
-        await forkContext.progressSimulation(this.page, 5)
-      }
+      await this.testContext.testnetController.progressSimulation(5)
     }
   }
 
-  async acceptActionAtIndex(index: number, forkContext?: ForkContext): Promise<void> {
+  async acceptActionAtIndex(index: number): Promise<void> {
     const row = this.region.getByTestId(testIds.actions.row(index))
     await row.getByRole('button', { name: actionButtonRegex }).click()
+    await expect(row.getByRole('button', { name: actionButtonRegex })).not.toBeVisible()
     // @note: we are setting block timestamp of the next tx (especially after executing all txs)
-    if (forkContext?.isVnet) {
-      await expect(row.getByRole('button', { name: actionButtonRegex })).not.toBeVisible()
-      await forkContext.progressSimulation(this.page, 5)
-    }
+    await this.testContext.testnetController.progressSimulation(5)
   }
 
   async switchPreferPermitsAction(): Promise<void> {

packages/app/src/features/actions/flavours/approve/logic/approveAction.ts

@@ -19,7 +19,9 @@ export function createApproveActionConfig(action: ApproveAction, context: Action
           account,
           chainId,
         }),
-        select: (data) => ({ canBeSkipped: data >= toBigInt(action.token.toBaseUnit(action.value)) }),
+        select: (data) => ({
+          canBeSkipped: data >= toBigInt(action.token.toBaseUnit(action.requiredValue ?? action.value)),
+        }),
       })
     },