Wait for TX

packages/browser-service/src/browser.service.ts

@@ -52,9 +52,7 @@ type BrowserServiceOptions = {
  */
 export class BrowserService {
   private logger = new ConsoleLogger(BrowserService.name);
-  private walletPage: WalletPage<
-    WalletConnectTypes.WC | WalletConnectTypes.EOA | WalletConnectTypes.IFRAME
-  >;
+  private walletPage: WalletPage;
   private browserContextService: BrowserContextService;
   public ethereumNodeService: EthereumNodeService;
 

packages/wallets/src/bitget/bitgetPage.ts

@@ -1,9 +1,9 @@
-import { WalletConnectTypes } from '../wallets.constants';
 import { WalletPage, WalletPageOptions } from '../wallet.page';
 import { test, Page } from '@playwright/test';
 import { ConsoleLogger } from '@nestjs/common';
+import { getNotificationPage } from '../../utils/helper';
 
-export class BitgetPage implements WalletPage<WalletConnectTypes.EOA> {
+export class BitgetPage implements WalletPage {
   logger = new ConsoleLogger(BitgetPage.name);
   page: Page | undefined;
 
@@ -82,8 +82,12 @@ export class BitgetPage implements WalletPage<WalletConnectTypes.EOA> {
     });
   }
 
-  async connectWallet(page: Page) {
+  async connectWallet() {
     await test.step('Connect wallet', async () => {
+      const page = await getNotificationPage(
+        this.options.browserContext,
+        this.options.extensionUrl,
+      );
       await page.waitForTimeout(1000);
       await page.click("button:has-text('Connect')");
       await page.close();
@@ -122,10 +126,6 @@ export class BitgetPage implements WalletPage<WalletConnectTypes.EOA> {
     throw new Error('Method not implemented.');
   }
 
-  async approveTokenTx() {
-    throw new Error('Method not implemented.');
-  }
-
   async assertReceiptAddress() {
     throw new Error('Method not implemented.');
   }

packages/wallets/src/coin98/coin98.page.ts

@@ -1,9 +1,9 @@
-import { WalletConnectTypes } from '../wallets.constants';
 import { WalletPage, WalletPageOptions } from '../wallet.page';
 import { test, Page } from '@playwright/test';
 import { ConsoleLogger } from '@nestjs/common';
+import { getNotificationPage } from '../../utils/helper';
 
-export class Coin98 implements WalletPage<WalletConnectTypes.EOA> {
+export class Coin98 implements WalletPage {
   logger = new ConsoleLogger(Coin98.name);
   page: Page | undefined;
 
@@ -42,7 +42,7 @@
       await this.page.locator('button:has-text("Continue")').click(); // Terms page
       await this.page.locator('button:has-text("Continue")').last().click(); // Language page
       await this.page.locator('button:has-text("Continue")').last().click(); // Security page
       await this.page.waitForSelector('input[type=password]');
       await this.page.waitForTimeout(1000);
       const inputs = this.page.locator('input[type=password]');
       for (const char of this.options.accountConfig.PASSWORD) {
@@ -94,8 +94,12 @@
     });
   }
 
-  async connectWallet(page: Page) {
+  async connectWallet() {
     await test.step('Connect wallet', async () => {
+      const page = await getNotificationPage(
+        this.options.browserContext,
+        this.options.extensionUrl,
+      );
       await this.unlock(page);
       const selectAllBtn = page.getByText('Select all', { exact: true });
       // for polygon network there is no account selection preview
@@ -108,6 +112,7 @@
       await page.click('button:has-text("Connect")');
     });
   }
+
   async closePopover(popUpPage: Page) {
     //popUpPage param required since noisy pop-up can appear in confirmation pages
     try {
@@ -137,8 +142,12 @@
     throw new Error('Method not implemented.');
   }
 
-  async confirmTx(page: Page) {
+  async confirmTx() {
     await test.step('Confirm TX', async () => {
+      const page = await getNotificationPage(
+        this.options.browserContext,
+        this.options.extensionUrl,
+      );
       await page.click('button:has-text("Confirm")');
     });
   }

packages/wallets/src/coinbase/coinbase.page.ts

@@ -1,10 +1,11 @@
-import { NetworkConfig, WalletConnectTypes } from '../wallets.constants';
+import { NetworkConfig } from '../wallets.constants';
 import { WalletPage, WalletPageOptions } from '../wallet.page';
 import expect from 'expect';
 import { test, Page } from '@playwright/test';
 import { ConsoleLogger } from '@nestjs/common';
+import { getNotificationPage } from '../../utils/helper';
 
-export class CoinbasePage implements WalletPage<WalletConnectTypes.EOA> {
+export class CoinbasePage implements WalletPage {
   logger = new ConsoleLogger(CoinbasePage.name);
   page: Page | undefined;
 
@@ -120,22 +121,34 @@ export class CoinbasePage implements WalletPage<WalletConnectTypes.EOA> {
     });
   }
 
-  async connectWallet(page: Page) {
+  async connectWallet() {
     await test.step('Connect wallet', async () => {
+      const page = await getNotificationPage(
+        this.options.browserContext,
+        this.options.extensionUrl,
+      );
       await page.click('button:has-text("Connect")');
     });
   }
 
-  async assertTxAmount(page: Page, expectedAmount: string) {
+  async assertTxAmount(expectedAmount: string) {
     await test.step('Assert TX Amount', async () => {
+      const page = await getNotificationPage(
+        this.options.browserContext,
+        this.options.extensionUrl,
+      );
       expect(await page.textContent('.currency-display-component__text')).toBe(
         expectedAmount,
       );
     });
   }
 
-  async confirmTx(page: Page) {
+  async confirmTx() {
     await test.step('Confirm TX', async () => {
+      const page = await getNotificationPage(
+        this.options.browserContext,
+        this.options.extensionUrl,
+      );
       await this.closeTransactionPopover();
       await page.click('button[data-testid="request-confirm-button"]');
     });

packages/wallets/src/ctrl/ctrl.page.ts

@@ -1,11 +1,11 @@
 import { WalletPage } from '../wallet.page';
 import { test, Page } from '@playwright/test';
-import { WalletConnectTypes } from '../wallets.constants';
 import { LoginPage, OnboardingPage, WalletOperations } from './pages';
 import { WalletPageOptions } from '../wallet.page';
 import { ConsoleLogger } from '@nestjs/common';
+import { getNotificationPage } from '../../utils/helper';
 
-export class CtrlPage implements WalletPage<WalletConnectTypes.EOA> {
+export class CtrlPage implements WalletPage {
   logger = new ConsoleLogger(CtrlPage.name);
   page: Page | undefined;
   onboardingPage: OnboardingPage;
@@ -53,8 +53,12 @@ export class CtrlPage implements WalletPage<WalletConnectTypes.EOA> {
   }
 
   /** Click `Connect` button */
-  async connectWallet(page: Page) {
+  async connectWallet() {
     await test.step('Connect Ctrl wallet', async () => {
+      const page = await getNotificationPage(
+        this.options.browserContext,
+        this.options.extensionUrl,
+      );
       const operationPage = new WalletOperations(page);
       await operationPage.connectBtn.waitFor({
         state: 'visible',
@@ -94,10 +98,6 @@ export class CtrlPage implements WalletPage<WalletConnectTypes.EOA> {
     throw new Error('Method not implemented.');
   }
 
-  approveTokenTx(): Promise<void> {
-    throw new Error('Method not implemented.');
-  }
-
   openLastTxInEthplorer(): Promise<Page> {
     throw new Error('Method not implemented.');
   }

packages/wallets/src/exodus/exodus.page.ts

@@ -1,10 +1,10 @@
-import { WalletConnectTypes } from '../wallets.constants';
 import { WalletPage, WalletPageOptions } from '../wallet.page';
 import { test, Page } from '@playwright/test';
 import { OnboardingPage } from './pages';
 import { ConsoleLogger } from '@nestjs/common';
+import { getNotificationPage } from '../../utils/helper';
 
-export class ExodusPage implements WalletPage<WalletConnectTypes.EOA> {
+export class ExodusPage implements WalletPage {
   logger = new ConsoleLogger(ExodusPage.name);
   page: Page | undefined;
   onboardingPage: OnboardingPage;
@@ -63,8 +63,12 @@ export class ExodusPage implements WalletPage<WalletConnectTypes.EOA> {
   }
 
   /** Click `Connect` button on the transaction `page` */
-  async connectWallet(page: Page) {
+  async connectWallet() {
     await test.step('Connect wallet', async () => {
+      const page = await getNotificationPage(
+        this.options.browserContext,
+        this.options.extensionUrl,
+      );
       const connectWalletBtn = page.getByText('Connect').nth(2);
       // the connect button is disabled by default, and it will be enabled after hover with awaiting
       await connectWalletBtn.hover();
@@ -74,8 +78,12 @@ export class ExodusPage implements WalletPage<WalletConnectTypes.EOA> {
   }
 
   /** Click `Confirm` button on the transaction `page` */
-  async confirmTx(page: Page) {
+  async confirmTx() {
     await test.step('Confirm TX', async () => {
+      const page = await getNotificationPage(
+        this.options.browserContext,
+        this.options.extensionUrl,
+      );
       await page.getByText('Confirm').click();
     });
   }

packages/wallets/src/metamask/metamask-latest/metamask.page.ts

@@ -1,4 +1,4 @@
-import { NetworkConfig, WalletConnectTypes } from '../../wallets.constants';
+import { NetworkConfig } from '../../wallets.constants';
 import { WalletPage, WalletPageOptions } from '../../wallet.page';
 import { expect } from '@playwright/test';
 import { test, Page } from '@playwright/test';
@@ -18,8 +18,12 @@ import {
 } from './pages/elements';
 import { getAddress } from 'viem';
 import { isPopularMainnetNetwork, isPopularTestnetNetwork } from './helper';
+import {
+  getNotificationPage,
+  waitForWalletPageClosed,
+} from '../../../utils/helper';
 
-export class MetamaskPage implements WalletPage<WalletConnectTypes.EOA> {
+export class MetamaskPage implements WalletPage {
   page: Page | undefined;
   header: Header;
   homePage: HomePage;
@@ -109,6 +113,7 @@ export class MetamaskPage implements WalletPage<WalletConnectTypes.EOA> {
 
   async setupNetwork(networkConfig: NetworkConfig) {
     await test.step(`Setup "${networkConfig.chainName}" Network`, async () => {
+      if (this.page.isClosed()) await this.navigate();
       await this.settingsMenu.openNetworksSettings();
       if (
         await this.networkList.isNetworkExist(
@@ -154,26 +159,38 @@ export class MetamaskPage implements WalletPage<WalletConnectTypes.EOA> {
     });
   }
 
-  async connectWallet(page: Page) {
+  async connectWallet() {
     await test.step('Connect Metamask wallet', async () => {
+      const page = await getNotificationPage(
+        this.options.browserContext,
+        this.options.extensionUrl,
+      );
       const operationPage = new WalletOperationPage(page);
       await operationPage.connectBtn.click(); // "Confirm" button to give permission
       await operationPage.page.close();
     });
   }
 
-  async assertTxAmount(page: Page, expectedAmount: string) {
+  async assertTxAmount(expectedAmount: string) {
     await test.step('Assert TX Amount', async () => {
+      const page = await getNotificationPage(
+        this.options.browserContext,
+        this.options.extensionUrl,
+      );
       const txAmount = await new WalletOperationPage(page).getTxAmount();
       if (txAmount) {
         expect(txAmount).toBe(expectedAmount);
       }
     });
   }
 
-  async confirmAddTokenToWallet(confirmPage: Page) {
+  async confirmAddTokenToWallet() {
     await test.step('Confirm add token to wallet', async () => {
-      await new WalletOperationPage(confirmPage).addTokenButton.click();
+      const page = await getNotificationPage(
+        this.options.browserContext,
+        this.options.extensionUrl,
+      );
+      await new WalletOperationPage(page).addTokenButton.click();
     });
   }
 
@@ -212,26 +229,42 @@ export class MetamaskPage implements WalletPage<WalletConnectTypes.EOA> {
     });
   }
 
-  async confirmTx(page: Page, setAggressiveGas?: boolean) {
+  async confirmTx(setAggressiveGas?: boolean) {
     await test.step('Confirm TX', async () => {
+      const page = await getNotificationPage(
+        this.options.browserContext,
+        this.options.extensionUrl,
+      );
+      const pageTitle = await page
+        .locator('h2')
+        .textContent()
+        .catch(() => undefined);
       await new WalletOperationPage(page).confirmTransaction(setAggressiveGas);
+      await waitForWalletPageClosed(page, pageTitle);
     });
   }
 
-  async cancelTx(page: Page) {
+  async cancelTx() {
     await test.step('Reject TX', async () => {
+      const page = await getNotificationPage(
+        this.options.browserContext,
+        this.options.extensionUrl,
+      );
+      const pageTitle = await page
+        .locator('h2')
+        .textContent()
+        .catch(() => undefined);
       await new WalletOperationPage(page).cancelTransaction();
+      await waitForWalletPageClosed(page, pageTitle);
     });
   }
 
-  async approveTokenTx(page: Page) {
-    await test.step('Approve token TX', async () => {
-      await new WalletOperationPage(page).confirmTransactionOfTokenApproval();
-    });
-  }
-
-  async assertReceiptAddress(page: Page, expectedAddress: string) {
+  async assertReceiptAddress(expectedAddress: string) {
     await test.step('Assert receiptAddress/Contract', async () => {
+      const page = await getNotificationPage(
+        this.options.browserContext,
+        this.options.extensionUrl,
+      );
       const recipientAddress = await new WalletOperationPage(
         page,
       ).getReceiptAddress();

packages/wallets/src/metamask/metamask-latest/pages/walletOperations.page.ts

@@ -46,9 +46,9 @@ export class WalletOperationPage {
       'button[aria-label="Close"]',
     );
     this.txDetailBlock = this.page.getByTestId('simulation-details-layout');
-    this.txDetailAmount = this.txDetailBlock.getByTestId(
-      'simulation-details-amount-pill',
-    );
+    this.txDetailAmount = this.txDetailBlock
+      .getByTestId('simulation-details-amount-pill')
+      .first();
   }
 
   async cancelAllTxInQueue() {
@@ -79,15 +79,6 @@ export class WalletOperationPage {
     }
   }
 
-  async confirmTransactionOfTokenApproval() {
-    await test.step('Click "Use default" button in case if it exist', async () => {
-      // todo: im not sure this step is needed now
-      if (await this.page.locator('text=Use default').isVisible())
-        await this.page.click('text=Use default');
-    });
-    await this.confirmButton.click();
-  }
-
   async confirmTransaction(setAggressiveGas?: boolean) {
     if (setAggressiveGas) {
       await this.editGasFeeButton.click();
@@ -110,7 +101,8 @@ export class WalletOperationPage {
 
   async getTxAmount() {
     if (await this.txDetailBlock.isVisible()) {
-      return await this.txDetailAmount.textContent();
+      const amount = await this.txDetailAmount.textContent();
+      return amount.match(/\d+\.\d*/)[0];
     }
     return null;
   }