corrections

test/e2e/page-objects/pages/account-list-page.ts

@@ -33,6 +33,19 @@ class AccountListPage {
       '.multichain-account-menu-popover__list--menu-item-hidden-account [data-testid="account-list-item-menu-button"]';
   }
 
+  async check_pageIsLoaded(): Promise<void> {
+    try {
+      await this.driver.waitForMultipleSelectors([
+        this.accountListItem,
+        this.accountOptionsMenuButton,
+      ]);
+    } catch (e) {
+      console.log('Timeout while waiting for account list to be loaded', e);
+      throw e;
+    }
+    console.log('Account list is loaded');
+  }
+
   async hideAccount(): Promise<void> {
     console.log(`Hide account in account list`);
     await this.driver.clickElement(this.hideUnhideAccountButton);

test/e2e/page-objects/pages/login-page.ts

@@ -22,7 +22,7 @@ class LoginPage {
     this.forgotPasswordButton = {
       text: 'Forgot password?',
       tag: 'a',
-    }
+    };
   }
 
   async check_pageIsLoaded(): Promise<void> {

test/e2e/page-objects/pages/reset-password-page.ts

@@ -3,22 +3,51 @@ import { Driver } from '../../webdriver/driver';
 class ResetPasswordPage {
   private driver: Driver;
 
+  private seedPhraseInput: string;
+
+  private passwordInput: string;
+
+  private confirmPasswordInput: string;
+
+  private restoreButton: string;
+
   constructor(driver: Driver) {
     this.driver = driver;
+    this.seedPhraseInput = '[data-testid="import-srp__srp-word-0"]';
+    this.passwordInput = '[data-testid="create-vault-password"]';
+    this.confirmPasswordInput = '[data-testid="create-vault-confirm-password"]';
+    this.restoreButton = '[data-testid="create-new-vault-submit-button"]';
   }
 
+  async check_pageIsLoaded(): Promise<void> {
+    try {
+      await this.driver.waitForMultipleSelectors([
+        this.passwordInput,
+        this.confirmPasswordInput,
+      ]);
+    } catch (e) {
+      console.log(
+        'Timeout while waiting for reset password page to be loaded',
+        e,
+      );
+      throw e;
+    }
+    console.log('Reset password page is loaded');
+  }
 
+  /**
+   * Resets the password using the provided seed phrase and new password.
+   *
+   * @param seedPhrase - The seed phrase to verify account ownership
+   * @param newPassword - The new password to set for the account
+   */
   async resetPassword(seedPhrase: string, newPassword: string): Promise<void> {
-    console.log('Resetting password');
-    await this.driver.pasteIntoField(
-      '[data-testid="import-srp__srp-word-0"]',
-      seedPhrase,
-    );
-    await this.driver.fill('#password', newPassword);
-    await this.driver.fill('#confirm-password', newPassword);
-    await this.driver.press('#confirm-password', this.driver.Key.ENTER);
+    console.log(`Resetting password with new password: ${newPassword}`);
+    await this.driver.pasteIntoField(this.seedPhraseInput, seedPhrase);
+    await this.driver.fill(this.passwordInput, newPassword);
+    await this.driver.fill(this.confirmPasswordInput, newPassword);
+    await this.driver.clickElement(this.restoreButton);
   }
-
 }
 
 export default ResetPasswordPage;

test/e2e/tests/account/account-hide-unhide.spec.ts

@@ -20,6 +20,7 @@ describe('Account list - hide/unhide functionality', function (this: Suite) {
 
         // hide account
         const accountListPage = new AccountListPage(driver);
+        await accountListPage.check_pageIsLoaded();
         await accountListPage.openAccountOptionsMenu();
         await accountListPage.hideAccount();
         await accountListPage.check_hiddenAccountsListExists();

test/e2e/tests/account/account-pin-unpin.spec.ts

@@ -20,6 +20,7 @@ describe('Account list - pin/unpin functionality', function (this: Suite) {
 
         // pin account
         const accountListPage = new AccountListPage(driver);
+        await accountListPage.check_pageIsLoaded();
         await accountListPage.openAccountOptionsMenu();
         await accountListPage.pinAccount();
         await accountListPage.check_accountIsPinned();
@@ -45,6 +46,7 @@ describe('Account list - pin/unpin functionality', function (this: Suite) {
 
         // pin account
         const accountListPage = new AccountListPage(driver);
+        await accountListPage.check_pageIsLoaded();
         await accountListPage.openAccountOptionsMenu();
         await accountListPage.pinAccount();
         await accountListPage.check_accountIsPinned();

test/e2e/tests/account/forgot-password.spec.ts

@@ -1,8 +1,6 @@
-import {
-  withFixtures,
-  TEST_SEED_PHRASE_TWO,
-} from '../../helpers';
+import { withFixtures } from '../../helpers';
 import FixtureBuilder from '../../fixture-builder';
+import { E2E_SRP } from '../../default-fixture';
 import { Driver } from '../../webdriver/driver';
 import HomePage from '../../page-objects/pages/homepage';
 import LoginPage from '../../page-objects/pages/login-page';
@@ -29,10 +27,7 @@ describe('Forgot password', function () {
         await new LoginPage(driver).gotoResetPasswordPage();
 
         // Reset password with a new password
-        await new ResetPasswordPage(driver).resetPassword(
-          TEST_SEED_PHRASE_TWO,
-          newPassword,
-        );
+        await new ResetPasswordPage(driver).resetPassword(E2E_SRP, newPassword);
 
         // Lock wallet again
         await homePage.headerNavbar.lockMetaMask();