@lidofinance/wallets-testing-wallets 1.11.2 → 1.12.0-alpha.1

package/dist/src/coin98/coin98.page.d.ts

@@ -19,5 +19,6 @@ export declare class Coin98 implements WalletPage {
     signTx(page: Page): Promise<void>;
     assertReceiptAddress(page: Page, expectedAmount: string): Promise<void>;
     addNetwork(networkName: string, networkUrl: string, chainId: number, tokenSymbol: string): Promise<void>;
+    waitForAutomaticallyOpenedWalletPageAfterInstallation(): Promise<void>;
 }
 //# sourceMappingURL=coin98.page.d.ts.map

package/dist/src/coin98/coin98.page.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"coin98.page.d.ts","sourceRoot":"","sources":["../../../src/coin98/coin98.page.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAC5C,OAAO,EAAQ,cAAc,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAE9D,qBAAa,MAAO,YAAW,UAAU;IAIrC,OAAO,CAAC,cAAc;IACtB,OAAO,CAAC,YAAY;IACb,MAAM,EAAE,YAAY;IAL7B,IAAI,EAAE,IAAI,GAAG,SAAS,CAAC;gBAGb,cAAc,EAAE,cAAc,EAC9B,YAAY,EAAE,MAAM,EACrB,MAAM,EAAE,YAAY;IAGvB,QAAQ;IAYR,KAAK,CAAC,OAAO,EAAE,MAAM;IASrB,cAAc,CAAC,OAAO,EAAE,MAAM;IAyB9B,SAAS,CAAC,GAAG,EAAE,MAAM;IAcrB,aAAa,CAAC,IAAI,EAAE,IAAI;IAaxB,YAAY,CAAC,SAAS,EAAE,IAAI;IAW5B,MAAM,CAAC,IAAI,EAAE,IAAI;IAYjB,cAAc,CAAC,IAAI,EAAE,IAAI,EAAE,cAAc,EAAE,MAAM;IAEjD,SAAS,CAAC,IAAI,EAAE,IAAI;IAOpB,MAAM,CAAC,IAAI,EAAE,IAAI;IAGjB,oBAAoB,CAAC,IAAI,EAAE,IAAI,EAAE,cAAc,EAAE,MAAM;IAGvD,UAAU,CAAC,WAAW,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM;CAC/F"}
+{"version":3,"file":"coin98.page.d.ts","sourceRoot":"","sources":["../../../src/coin98/coin98.page.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAC5C,OAAO,EAAQ,cAAc,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAE9D,qBAAa,MAAO,YAAW,UAAU;IAIrC,OAAO,CAAC,cAAc;IACtB,OAAO,CAAC,YAAY;IACb,MAAM,EAAE,YAAY;IAL7B,IAAI,EAAE,IAAI,GAAG,SAAS,CAAC;gBAGb,cAAc,EAAE,cAAc,EAC9B,YAAY,EAAE,MAAM,EACrB,MAAM,EAAE,YAAY;IAGvB,QAAQ;IAUR,KAAK,CAAC,OAAO,EAAE,MAAM;IASrB,cAAc,CAAC,OAAO,EAAE,MAAM;IAyB9B,SAAS,CAAC,GAAG,EAAE,MAAM;IAcrB,aAAa,CAAC,IAAI,EAAE,IAAI;IAcxB,YAAY,CAAC,SAAS,EAAE,IAAI;IAW5B,MAAM,CAAC,IAAI,EAAE,IAAI;IAYjB,cAAc,CAAC,IAAI,EAAE,IAAI,EAAE,cAAc,EAAE,MAAM;IAEjD,SAAS,CAAC,IAAI,EAAE,IAAI;IAOpB,MAAM,CAAC,IAAI,EAAE,IAAI;IAGjB,oBAAoB,CAAC,IAAI,EAAE,IAAI,EAAE,cAAc,EAAE,MAAM;IAGvD,UAAU,CAAC,WAAW,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM;IAKxF,qDAAqD;CAM5D"}

package/dist/src/coin98/coin98.page.js

@@ -10,18 +10,15 @@ class Coin98 {
     }
     async navigate() {
         await test_1.test.step('Navigate to Coin98', async () => {
-            this.page = await this.browserContext.newPage();
             await this.page.goto(this.extensionUrl + this.config.COMMON.EXTENSION_START_PATH);
             await this.page.reload();
-            await this.page.waitForTimeout(1000);
             await this.closePopover(this.page);
         });
     }
     async setup(network) {
         await test_1.test.step('Setup', async () => {
+            await this.waitForAutomaticallyOpenedWalletPageAfterInstallation();
             await this.navigate();
-            if (!this.page)
-                throw "Page isn't ready";
             const firstTime = await this.page.waitForSelector('text=Get Started');
             if (firstTime)
                 await this.firstTimeSetup(network);
@@ -66,10 +63,12 @@ class Coin98 {
     async connectWallet(page) {
         await test_1.test.step('Connect wallet', async () => {
             await this.unlock(page);
-            const selectAllBtn = page.getByText('Select all');
+            const selectAllBtn = page.getByText('Select all', { exact: true });
             // for polygon network there is no account selection preview
             if (await selectAllBtn.isVisible()) {
                 await selectAllBtn.click();
+            }
+            if (await page.locator('button:has-text("Confirm")').isVisible()) {
                 await page.click('button:has-text("Confirm")');
             }
             await page.click('button:has-text("Connect")');
@@ -109,6 +108,15 @@ class Coin98 {
     async assertReceiptAddress(page, expectedAmount) { }
     // eslint-disable-next-line
     async addNetwork(networkName, networkUrl, chainId, tokenSymbol) { }
+    // We need this function cause Coin98 wallet open the extension page after installation
+    // and close other opened wallet pages (include page with we work so here was test crash)
+    // We wait for that action and after it we continue testing
+    async waitForAutomaticallyOpenedWalletPageAfterInstallation() {
+        if ((await this.browserContext.pages().length) === 1) {
+            await this.browserContext.waitForEvent('page');
+        }
+        this.page = await this.browserContext.pages()[1];
+    }
 }
 exports.Coin98 = Coin98;
 //# sourceMappingURL=coin98.page.js.map

package/dist/src/coin98/coin98.page.js.map

@@ -1 +1 @@
-{"version":3,"file":"coin98.page.js","sourceRoot":"","sources":["../../../src/coin98/coin98.page.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"coin98.page.js","sourceRoot":"","sources":["../../../src/coin98/coin98.page.ts"],"names":[],"mappings":"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"}

package/dist/src/metamask/metamask.page.d.ts

@@ -1,31 +1,31 @@
 import { WalletConfig } from '../wallets.constants';
 import { WalletPage } from '../wallet.page';
-import { BrowserContext, Page, Locator } from '@playwright/test';
+import { BrowserContext, Page } from '@playwright/test';
+import { MainPage, LoginPage, SettingsPage } from './pages';
+import { OperationActions, Header, NetworkList, OptionsMenu, PopoverElements, AccountMenu } from './pages/elements';
 export declare class MetamaskPage implements WalletPage {
     private browserContext;
     private extensionUrl;
     config: WalletConfig;
     page: Page | undefined;
-    networkDisplay: Locator;
-    networkDisplayDialog: Locator;
-    networkDisplayCloseBtn: Locator;
-    networkItemBtn: Locator;
-    networkItemText: Locator;
+    header: Header;
+    mainPage: MainPage;
+    settingsPage: SettingsPage;
+    loginPage: LoginPage;
+    networkList: NetworkList;
+    optionsMenu: OptionsMenu;
+    operationActions: OperationActions;
+    popoverElements: PopoverElements;
+    accountMenu: AccountMenu;
     constructor(browserContext: BrowserContext, extensionUrl: string, config: WalletConfig);
     initLocators(): Promise<void>;
     navigate(): Promise<void>;
-    goToActivity(): Promise<void>;
     setup(): Promise<void>;
-    unlock(): Promise<void>;
-    importTokens(token: string): Promise<void>;
-    isPopoverVisible(): Promise<boolean>;
     closePopover(): Promise<void>;
-    rejectAllTxInQueue(): Promise<void>;
     firstTimeSetup(): Promise<void>;
     changeNetwork(networkName: string): Promise<void>;
     switchNetwork(networkName?: string): Promise<void>;
     setupNetwork(standConfig: Record<string, any>): Promise<void>;
-    getNetworkListText(): Promise<string[]>;
     addNetwork(networkName: string, networkUrl: string, chainId: number, tokenSymbol: string, blockExplorer?: string): Promise<void>;
     importKey(key: string): Promise<void>;
     connectWallet(page: Page): Promise<void>;
@@ -37,7 +37,6 @@ export declare class MetamaskPage implements WalletPage {
     signTx(page: Page): Promise<void>;
     rejectTx(page: Page): Promise<void>;
     approveTokenTx(page: Page): Promise<void>;
-    useDefaultToApprove(page: Page): Promise<void>;
     assertReceiptAddress(page: Page, expectedAddress: string): Promise<void>;
     getWalletAddress(): Promise<string>;
     changeWalletAddress(addressName: string): Promise<void>;

package/dist/src/metamask/metamask.page.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"metamask.page.d.ts","sourceRoot":"","sources":["../../../src/metamask/metamask.page.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAE5C,OAAO,EAAQ,cAAc,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAEvE,qBAAa,YAAa,YAAW,UAAU;IAS3C,OAAO,CAAC,cAAc;IACtB,OAAO,CAAC,YAAY;IACb,MAAM,EAAE,YAAY;IAV7B,IAAI,EAAE,IAAI,GAAG,SAAS,CAAC;IACvB,cAAc,EAAE,OAAO,CAAC;IACxB,oBAAoB,EAAE,OAAO,CAAC;IAC9B,sBAAsB,EAAE,OAAO,CAAC;IAChC,cAAc,EAAE,OAAO,CAAC;IACxB,eAAe,EAAE,OAAO,CAAC;gBAGf,cAAc,EAAE,cAAc,EAC9B,YAAY,EAAE,MAAM,EACrB,MAAM,EAAE,YAAY;IAGvB,YAAY;IAYZ,QAAQ;IAkBR,YAAY;IAIZ,KAAK;IAWL,MAAM;IAYN,YAAY,CAAC,KAAK,EAAE,MAAM;IAU1B,gBAAgB;IAUhB,YAAY;IA4BZ,kBAAkB;IAmBlB,cAAc;IAoCd,aAAa,CAAC,WAAW,EAAE,MAAM;IAgBjC,aAAa,CAAC,WAAW,SAAkB;IAQ3C,YAAY,CAAC,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;IAsB7C,kBAAkB;IASlB,UAAU,CACd,WAAW,EAAE,MAAM,EACnB,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,MAAM,EACf,WAAW,EAAE,MAAM,EACnB,aAAa,SAAK;IAkCd,SAAS,CAAC,GAAG,EAAE,MAAM;IAiBrB,aAAa,CAAC,IAAI,EAAE,IAAI;IAQxB,cAAc,CAAC,IAAI,EAAE,IAAI,EAAE,cAAc,EAAE,MAAM;IAQjD,uBAAuB,CAAC,WAAW,EAAE,IAAI;IAKzC,qBAAqB,CAAC,OAAO,SAAI;IAYjC,eAAe,CAAC,SAAS,EAAE,MAAM;IAuBjC,SAAS,CAAC,IAAI,EAAE,IAAI,EAAE,gBAAgB,CAAC,EAAE,OAAO;IAWhD,MAAM,CAAC,IAAI,EAAE,IAAI;IAOjB,QAAQ,CAAC,IAAI,EAAE,IAAI;IAMnB,cAAc,CAAC,IAAI,EAAE,IAAI;IASzB,mBAAmB,CAAC,IAAI,EAAE,IAAI;IAS9B,oBAAoB,CAAC,IAAI,EAAE,IAAI,EAAE,eAAe,EAAE,MAAM;IAgBxD,gBAAgB;IAWhB,mBAAmB,CAAC,WAAW,EAAE,MAAM;CAW9C"}
+{"version":3,"file":"metamask.page.d.ts","sourceRoot":"","sources":["../../../src/metamask/metamask.page.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAE5C,OAAO,EAAQ,cAAc,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAC9D,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAC5D,OAAO,EAEL,gBAAgB,EAChB,MAAM,EACN,WAAW,EACX,WAAW,EACX,eAAe,EACf,WAAW,EACZ,MAAM,kBAAkB,CAAC;AAE1B,qBAAa,YAAa,YAAW,UAAU;IAc3C,OAAO,CAAC,cAAc;IACtB,OAAO,CAAC,YAAY;IACb,MAAM,EAAE,YAAY;IAf7B,IAAI,EAAE,IAAI,GAAG,SAAS,CAAC;IAEvB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,QAAQ,CAAC;IACnB,YAAY,EAAE,YAAY,CAAC;IAC3B,SAAS,EAAE,SAAS,CAAC;IACrB,WAAW,EAAE,WAAW,CAAC;IACzB,WAAW,EAAE,WAAW,CAAC;IACzB,gBAAgB,EAAE,gBAAgB,CAAC;IACnC,eAAe,EAAE,eAAe,CAAC;IACjC,WAAW,EAAE,WAAW,CAAC;gBAGf,cAAc,EAAE,cAAc,EAC9B,YAAY,EAAE,MAAM,EACrB,MAAM,EAAE,YAAY;IAGvB,YAAY;IAiBZ,QAAQ;IAYR,KAAK;IAWL,YAAY;IAwBZ,cAAc;IAiBd,aAAa,CAAC,WAAW,EAAE,MAAM;IAajC,aAAa,CAAC,WAAW,SAAkB;IAQ3C,YAAY,CAAC,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;IAqB7C,UAAU,CACd,WAAW,EAAE,MAAM,EACnB,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,MAAM,EACf,WAAW,EAAE,MAAM,EACnB,aAAa,SAAK;IAkBd,SAAS,CAAC,GAAG,EAAE,MAAM;IAiBrB,aAAa,CAAC,IAAI,EAAE,IAAI;IASxB,cAAc,CAAC,IAAI,EAAE,IAAI,EAAE,cAAc,EAAE,MAAM;IAQjD,uBAAuB,CAAC,WAAW,EAAE,IAAI;IAOzC,qBAAqB,CAAC,OAAO,SAAI;IAYjC,eAAe,CAAC,SAAS,EAAE,MAAM;IAoBjC,SAAS,CAAC,IAAI,EAAE,IAAI,EAAE,gBAAgB,CAAC,EAAE,OAAO;IAOhD,MAAM,CAAC,IAAI,EAAE,IAAI;IAOjB,QAAQ,CAAC,IAAI,EAAE,IAAI;IAOnB,cAAc,CAAC,IAAI,EAAE,IAAI;IAOzB,oBAAoB,CAAC,IAAI,EAAE,IAAI,EAAE,eAAe,EAAE,MAAM;IAQxD,gBAAgB;IAUhB,mBAAmB,CAAC,WAAW,EAAE,MAAM;CAS9C"}

package/dist/src/metamask/metamask.page.js

@@ -3,6 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.MetamaskPage = void 0;
 const test_1 = require("@playwright/test");
 const test_2 = require("@playwright/test");
+const pages_1 = require("./pages");
+const elements_1 = require("./pages/elements");
 class MetamaskPage {
     constructor(browserContext, extensionUrl, config) {
         this.browserContext = browserContext;
@@ -10,151 +12,77 @@ class MetamaskPage {
         this.config = config;
     }
     async initLocators() {
-        this.networkDisplay = this.page.getByTestId('network-display');
-        this.networkDisplayDialog = this.page.locator('[role = "dialog"]');
-        this.networkDisplayCloseBtn = this.networkDisplayDialog
-            .locator('[aria-label="Close"]')
-            .first();
-        this.networkItemBtn =
-            this.networkDisplayDialog.locator('div[role="button"]');
-        this.networkItemText = this.networkItemBtn.locator('p');
+        this.page = await this.browserContext.newPage();
+        this.header = new elements_1.Header(this.page);
+        this.mainPage = new pages_1.MainPage(this.page, this.extensionUrl, this.config);
+        this.settingsPage = new pages_1.SettingsPage(this.page, this.extensionUrl, this.config);
+        this.loginPage = new pages_1.LoginPage(this.page, this.config);
+        this.networkList = new elements_1.NetworkList(this.page);
+        this.optionsMenu = new elements_1.OptionsMenu(this.page);
+        this.operationActions = new elements_1.OperationActions(this.page);
+        this.popoverElements = new elements_1.PopoverElements(this.page);
+        this.accountMenu = new elements_1.AccountMenu(this.page);
     }
     async navigate() {
         await test_2.test.step('Navigate to metamask', async () => {
-            this.page = await this.browserContext.newPage();
             await this.initLocators();
-            await this.page.goto(this.extensionUrl + this.config.COMMON.EXTENSION_START_PATH, { waitUntil: 'load' });
-            await this.page
-                .locator('button[data-testid="app-header-logo"]')
-                .waitFor({ state: 'visible' });
-            await this.unlock();
-            if (await this.networkDisplay.isVisible()) {
+            await this.mainPage.openWidgetPage();
+            await this.header.appHeaderLogo.waitFor({ state: 'visible' });
+            await this.loginPage.unlock();
+            if (await this.header.networkListButton.isVisible()) {
                 await this.closePopover();
             }
         });
     }
-    async goToActivity() {
-        await this.page.locator('button:has-text("Activity")').click();
-    }
     async setup() {
         await test_2.test.step('Setup', async () => {
             // added explicit route to #onboarding due to unexpected first time route from /home.html to /onboarding -> page is close
             await this.navigate();
-            if (!this.page)
-                throw "Page isn't ready";
-            if (!(await this.networkDisplay.isVisible())) {
+            if (!(await this.header.networkListButton.isVisible())) {
                 await this.firstTimeSetup();
+                await this.settingsPage.setupNetworkChangingSetting();
             }
         });
     }
-    async unlock() {
-        await test_2.test.step('Unlock', async () => {
-            if (!this.page)
-                throw "Page isn't ready";
-            if ((await this.page.locator('id=password').count()) > 0) {
-                await this.page.fill('id=password', this.config.PASSWORD);
-                await this.page.click('text=Unlock');
-                await this.page.waitForURL('**/home.html#');
-                await this.closePopover();
-            }
-        });
-    }
-    async importTokens(token) {
-        await test_2.test.step('Import token', async () => {
-            await this.navigate();
-            if (!this.page)
-                throw "Page isn't ready";
-            await this.page.click("text='import tokens'");
-            await this.page.click('text=Custom token');
-            await this.page.type('id=custom-address', token);
-        });
-    }
-    async isPopoverVisible() {
-        try {
-            const popoverContent = this.page.getByTestId('popover-close');
-            await popoverContent.waitFor({ state: 'visible', timeout: 1000 });
-            return true;
-        }
-        catch (error) {
-            return false;
-        }
-    }
     async closePopover() {
         await test_2.test.step('Close popover if it exists', async () => {
             if (!this.page)
                 throw "Page isn't ready";
-            if (await this.isPopoverVisible()) {
-                await this.page.getByTestId('popover-close').click();
-            }
-            if (await this.page
-                .locator('button:has-text("Manage in settings")')
-                .isVisible()) {
-                await this.page
-                    .locator('button:has-text("Manage in settings")')
-                    .click();
-            }
-            if (await this.page.getByText('Not right now').isVisible())
-                await this.page.click('text=Not right now');
-            const gotItBtn = this.page.getByText('Got it');
-            if (await gotItBtn.first().isVisible())
-                await gotItBtn.first().click();
+            if (await this.popoverElements.isPopoverVisible())
+                await this.popoverElements.popoverCloseButton.click();
+            if (await this.popoverElements.manageInSettingButton.isVisible())
+                await this.popoverElements.manageInSettingButton.click();
+            if (await this.popoverElements.notRightNowButton.isVisible())
+                await this.popoverElements.notRightNowButton.click();
+            if (await this.popoverElements.gotItButton.first().isVisible())
+                await this.popoverElements.gotItButton.first().click();
+            if (await this.popoverElements.noThanksButton.isVisible())
+                await this.popoverElements.noThanksButton.click();
             // reject all tx in queue if exist
-            await this.rejectAllTxInQueue();
+            await this.operationActions.rejectAllTxInQueue();
         });
     }
-    async rejectAllTxInQueue() {
-        //Is there is any tx in queue.
-        try {
-            const rejectTxBtn = this.page.getByTestId('page-container-footer-cancel');
-            await rejectTxBtn.waitFor({ state: 'visible', timeout: 1000 });
-        }
-        catch (error) {
-            //No tx in queue
-            return;
-        }
-        const rejectTxsBtn = this.page.locator('div[class="page-container__footer-secondary"]');
-        if (await rejectTxsBtn.isVisible()) {
-            await rejectTxsBtn.click();
-            await this.page.locator('button:has-text("Reject all")').click();
-        }
-        else
-            await this.rejectTx(this.page);
-    }
     async firstTimeSetup() {
         await test_2.test.step('First time setup', async () => {
-            if (!this.page)
-                throw "Page isn't ready";
-            const checkbox = this.page.getByTestId('onboarding-terms-checkbox');
-            while (!(await this.page.locator('.check-box__checked').isVisible())) {
-                console.log('Checkbox is not checked');
-                await checkbox.click();
-            }
-            await this.page.click('data-testid=onboarding-import-wallet');
-            await this.page.click('data-testid=metametrics-i-agree');
-            const inputs = this.page.locator('.import-srp__srp-word >> input[type=password]');
-            const seedWords = this.config.SECRET_PHRASE.split(' ');
-            for (let i = 0; i < seedWords.length; i++) {
-                await inputs.nth(i).fill(seedWords[i]);
-            }
-            await this.page.click('data-testid=import-srp-confirm');
-            await this.page.fill('data-testid=create-password-new', this.config.PASSWORD);
-            await this.page.fill('data-testid=create-password-confirm', this.config.PASSWORD);
-            await this.page.click('data-testid=create-password-terms');
-            await this.page.click('data-testid=create-password-import');
-            await this.page.getByTestId('onboarding-complete-done').click();
-            await this.page.getByTestId('pin-extension-next').click();
-            await this.page.getByTestId('pin-extension-done').click();
+            const onboardingPage = new elements_1.OnboardingElement(this.page);
+            await onboardingPage.confirmTermsOfOnboarding();
+            await onboardingPage.importWalletButton.click();
+            await onboardingPage.metricAgreeButton.click();
+            await onboardingPage.fillSecretPhrase(this.config.SECRET_PHRASE);
+            await onboardingPage.secretPhraseImportButton.click();
+            await onboardingPage.createPassword(this.config.PASSWORD);
+            await onboardingPage.completeButton.click();
+            await onboardingPage.pinExtensionNextButton.click();
+            await onboardingPage.pinExtensionDoneButton.click();
             await this.page.waitForURL('**/home.html#');
             await this.closePopover();
         });
     }
     async changeNetwork(networkName) {
         await test_2.test.step(`Change Metamask network to ${networkName}`, async () => {
-            if (!this.page)
-                throw "Page isn't ready";
             await this.navigate();
-            await this.page.click('data-testid=network-display');
-            await this.page.locator('section').getByText(networkName).click();
+            await this.header.networkListButton.click();
+            await this.networkList.clickToNetwork(networkName);
             //Linea network require additional confirmation
             if (networkName === 'Linea Mainnet') {
                 await this.closePopover();
@@ -164,46 +92,39 @@ class MetamaskPage {
     }
     async switchNetwork(networkName = 'Linea Mainnet') {
         await this.navigate();
-        await this.page.getByTestId('network-display').click();
-        await this.page.getByText(networkName).click();
-        await this.page.getByText('Got it').click();
+        await this.header.networkListButton.click();
+        await this.networkList.clickToNetwork(networkName);
+        await this.popoverElements.gotItButton.click();
         await this.page.close();
     }
     async setupNetwork(standConfig) {
-        const networkDisplayText = await this.networkDisplay.textContent();
-        if (!networkDisplayText.includes(standConfig.chainName)) {
-            await this.networkDisplay.click();
-            const networkListText = await this.getNetworkListText();
+        const currentNetwork = await this.header.getCurrentNetworkName();
+        if (!currentNetwork.includes(standConfig.chainName)) {
+            await this.header.networkListButton.click();
+            const networkListText = await this.networkList.getNetworkListText();
             if (networkListText.includes(standConfig.chainName)) {
-                await this.networkItemBtn.getByText(standConfig.chainName).click();
+                await this.networkList.clickToNetworkItemButton(standConfig.chainName);
             }
             else {
-                await this.networkDisplayCloseBtn.click();
+                await this.networkList.networkDisplayCloseBtn.click();
                 await this.addNetwork(standConfig.chainName, standConfig.rpcUrl, standConfig.chainId, standConfig.tokenSymbol, standConfig.scan);
             }
         }
     }
-    async getNetworkListText() {
-        const networkList = await this.networkItemText.all();
-        return Promise.all(networkList.map(async (networkType) => {
-            return await networkType.textContent();
-        }));
-    }
     async addNetwork(networkName, networkUrl, chainId, tokenSymbol, blockExplorer = '') {
         await test_2.test.step('Add network', async () => {
-            await this.page.click('data-testid=account-options-menu-button');
-            await this.page.click('text=Settings');
-            await this.page.click("text='Networks'");
-            await this.page.click('text=Add a network');
-            await this.page.click("a :has-text('Add a network manually')");
-            await this.page.fill(".form-field :has-text('Network Name') >> input", networkName);
-            await this.page.fill(".form-field :has-text('New RPC URL') >> input", networkUrl);
-            await this.page.fill(".form-field :has-text('Chain ID') >> input", String(chainId));
-            await this.page.fill('[data-testid="network-form-ticker-input"]', tokenSymbol);
+            await this.settingsPage.openSettings();
+            await this.settingsPage.networksTabButton.click();
+            await this.settingsPage.addNetworkButton.click();
+            await this.settingsPage.addNetworkManuallyButton.click();
+            await this.settingsPage.networkNameInput.fill(networkName);
+            await this.settingsPage.networkRpcUrlInput.fill(networkUrl);
+            await this.settingsPage.networkChainIdInput.fill(String(chainId));
+            await this.settingsPage.networkTickerInput.fill(tokenSymbol);
             if (blockExplorer != '')
-                await this.page.fill(".form-field :has-text('Block explorer URL') >> input", blockExplorer);
-            await this.page.click('text=Save');
-            await this.page.click('text=Switch to ');
+                await this.settingsPage.networkExplorerUrlInput.fill(blockExplorer);
+            await this.settingsPage.saveNewTokenButton.click();
+            await this.popoverElements.switchToButton.click();
         });
     }
     async importKey(key) {
@@ -215,19 +136,20 @@ class MetamaskPage {
             do {
                 await this.page.reload();
                 await this.closePopover();
-            } while (!(await this.page.getByTestId('account-menu-icon').isVisible()));
-            await this.page.click('data-testid=account-menu-icon');
-            await this.page.click('text=Add account or hardware wallet');
-            await this.page.click('text=Import account');
-            await this.page.fill('id=private-key-box', key);
-            await this.page.click("text='Import'");
+            } while (!(await this.header.accountMenuButton.isVisible()));
+            await this.header.accountMenuButton.click();
+            await this.accountMenu.addAccountOrHardwareWalletButton.click();
+            await this.accountMenu.importAccountButton.click();
+            await this.accountMenu.privateKeyInput.fill(key);
+            await this.accountMenu.importAccountConfirmButton.click();
         });
     }
     async connectWallet(page) {
         await test_2.test.step('Connect wallet', async () => {
+            const operationPage = new elements_1.OperationActions(page);
             await page.click('text=Next');
-            await page.click('data-testid=page-container-footer-next');
-            await page.close();
+            await operationPage.nextButton.click();
+            await operationPage.page.close();
         });
     }
     async assertTxAmount(page, expectedAmount) {
@@ -237,36 +159,36 @@ class MetamaskPage {
     }
     async confirmAddTokenToWallet(confirmPage) {
         await test_2.test.step('Confirm add token to wallet', async () => {
-            await confirmPage.locator('button:has-text("Add token")').click();
+            const operationPage = new elements_1.OperationActions(confirmPage);
+            await operationPage.addTokenButton.click();
         });
     }
     async openLastTxInEthplorer(txIndex = 0) {
         if (!this.page)
             throw "Page isn't ready";
         await this.navigate();
-        await this.goToActivity();
-        await this.page.getByTestId('activity-list-item').nth(txIndex).click();
-        const [, etherscanPage] = await Promise.all([
-            await this.page.locator('text=View on block explorer').click(),
-            await this.page.context().waitForEvent('page', { timeout: 120000 }),
+        await this.mainPage.openActivityTab();
+        await this.mainPage.activityList.nth(txIndex).click();
+        const [etherscanPage] = await Promise.all([
+            this.page.context().waitForEvent('page', { timeout: 10000 }),
+            this.mainPage.transactionExplorerButton.click(),
         ]);
         return etherscanPage;
     }
     async getTokenBalance(tokenName) {
         await this.navigate();
-        const tokenTab = await this.page
-            .getByTestId('home__asset-tab')
-            .locator('text=Tokens');
-        await tokenTab.click();
+        await this.mainPage.openTokensTab();
         //Cannot find locator by exact text since need to find row by text "stETH"/"ETH" but "stETH" contains "ETH"
-        const elements = await this.page.$$('data-testid=multichain-token-list-item-value');
+        const tokensValue = await this.mainPage.tokensListItemValues.all();
         let tokenBalance = NaN;
-        for (const element of elements) {
-            await element.waitForElementState('visible');
-            const textContent = await element.textContent();
-            const letterTextContent = textContent.match(/[a-zA-Z]+/g);
-            if (letterTextContent.toString().trim() === tokenName) {
-                tokenBalance = parseFloat(await element.textContent());
+        for (const value of tokensValue) {
+            await value.waitFor({ state: 'visible' });
+            const tokenNameFromValue = (await value.textContent())
+                .match(/[a-zA-Z]+/g)
+                .toString()
+                .trim();
+            if (tokenNameFromValue === tokenName) {
+                tokenBalance = parseFloat(await value.textContent());
                 break;
             }
         }
@@ -274,71 +196,48 @@ class MetamaskPage {
     }
     async confirmTx(page, setAggressiveGas) {
         await test_2.test.step('Confirm TX', async () => {
-            if (setAggressiveGas) {
-                await page.click('button[data-testid="edit-gas-fee-icon"]');
-                await page.mouse.move(1, 1);
-                await page.click('button[data-testid="edit-gas-fee-item-high"]');
-            }
-            await page.getByTestId('page-container-footer-next').click();
+            const operationPage = new elements_1.OperationActions(page);
+            await operationPage.confirmTransaction(setAggressiveGas);
         });
     }
     async signTx(page) {
         await test_2.test.step('Sign TX', async () => {
-            await page.getByTestId('signature-request-scroll-button').click();
-            await page.getByTestId('page-container-footer-next').click();
+            const operationPage = new elements_1.OperationActions(page);
+            await operationPage.signTransaction();
         });
     }
     async rejectTx(page) {
         await test_2.test.step('Reject TX', async () => {
-            await page.getByTestId('page-container-footer-cancel').click();
+            const operationPage = new elements_1.OperationActions(page);
+            await operationPage.cancelTransaction();
         });
     }
     async approveTokenTx(page) {
         await test_2.test.step('Approve token tx', async () => {
-            await this.useDefaultToApprove(page);
-            await page.click('text=Next');
-            await page.waitForTimeout(2000);
-            await page.click('text=Approve');
-        });
-    }
-    async useDefaultToApprove(page) {
-        await test_2.test.step('Click "Use default" button in case if it exist', async () => {
-            if (!page)
-                throw "Page isn't ready";
-            const useDefaultButton = (await page.locator('text=Use default').count()) > 0;
-            if (useDefaultButton)
-                await page.click('text=Use default');
+            const operationPage = new elements_1.OperationActions(page);
+            await operationPage.confirmTransactionOfTokenApproval();
         });
     }
     async assertReceiptAddress(page, expectedAddress) {
         await test_2.test.step('Assert receiptAddress/Contract', async () => {
-            const recipient = page.locator('.sender-to-recipient__party--recipient-with-address');
-            while (!(await recipient.isEnabled())) {
-                await this.page.waitForTimeout(500);
-            }
-            await recipient.click();
-            const recipientAddress = await page
-                .locator('input[id="address"]')
-                .getAttribute('value');
-            await page.click('button[aria-label="Close"]');
+            const operationAction = new elements_1.OperationActions(page);
+            const recipientAddress = await operationAction.assertReceiptAddress();
             (0, test_1.expect)(recipientAddress).toBe(expectedAddress);
         });
     }
     async getWalletAddress() {
         await this.navigate();
-        await this.page.getByTestId('account-options-menu-button').click();
-        await this.page.getByTestId('account-list-menu-details').click();
-        const address = await this.page
-            .locator("button[data-testid='address-copy-button-text']")
-            .textContent();
+        await this.header.optionsMenuButton.click();
+        await this.optionsMenu.menuAccountDetailsButton.click();
+        const address = await this.popoverElements.accountDetailCopyAddressButton.textContent();
         await this.page.close();
         return address;
     }
     async changeWalletAddress(addressName) {
         await this.navigate();
-        await this.page.click('data-testid=account-menu-icon');
-        await this.page.click(`section:has-text("${addressName}")`);
-        const accountNumber = this.page.locator(`button[data-testid="account-menu-icon"]:has-text("${addressName}")`);
+        await this.header.accountMenuButton.click();
+        await this.accountMenu.clickToAddress(addressName);
+        const accountNumber = this.header.accountMenuButton.getByText(addressName);
         await accountNumber.waitFor({ state: 'visible', timeout: 2000 });
         await this.page.waitForTimeout(2000);
         await this.page.close();