test: Fix/wallet create session

test/e2e/benchmarks/user-actions-benchmark.ts

@@ -13,6 +13,8 @@ import { unlockWallet, withFixtures } from '../helpers';
 import { loginWithBalanceValidation } from '../page-objects/flows/login.flow';
 import BridgeQuotePage from '../page-objects/pages/bridge/quote-page';
 import HomePage from '../page-objects/pages/home/homepage';
+import HeaderNavbar from '../page-objects/pages/header-navbar';
+import AccountListPage from '../page-objects/pages/account-list-page';
 import {
   DEFAULT_BRIDGE_FEATURE_FLAGS,
   MOCK_TOKENS_ETHEREUM,
@@ -45,20 +47,13 @@ async function loadNewAccount(): Promise<number> {
     async ({ driver }: { driver: Driver }) => {
       await unlockWallet(driver);
 
-      await driver.clickElement('[data-testid="account-menu-icon"]');
-      await driver.clickElement(
-        '[data-testid="multichain-account-menu-popover-action-button"]',
-      );
+      const headerNavbar = new HeaderNavbar(driver);
+      await headerNavbar.openAccountMenu();
+      const accountListPage = new AccountListPage(driver);
+      await accountListPage.checkPageIsLoaded();
+
       const timestampBeforeAction = new Date();
-      await driver.clickElement(
-        '[data-testid="multichain-account-menu-popover-add-account"]',
-      );
-      await driver.fill('[placeholder="Account 2"]', '2nd account');
-      await driver.clickElement({ text: 'Add account', tag: 'button' });
-      await driver.waitForSelector({
-        css: '.currency-display-component__text',
-        text: '0',
-      });
+      await accountListPage.addMultichainAccount();
       const timestampAfterAction = new Date();
       loadingTimes =
         timestampAfterAction.getTime() - timestampBeforeAction.getTime();
@@ -101,11 +96,10 @@ async function confirmTx(): Promise<number> {
       );
       await driver.wait(async () => {
         const confirmedTxes = await driver.findElements(
-          '.transaction-list__completed-transactions .transaction-list-item',
+          '.transaction-status-label--confirmed',
         );
         return confirmedTxes.length === 1;
       }, 10000);
-
       await driver.waitForSelector('.transaction-status-label--confirmed');
       const timestampAfterAction = new Date();
       loadingTimes =

test/e2e/constants.ts

@@ -1,3 +1,5 @@
+import { BIP44_STAGE_TWO } from './tests/multichain-accounts/feature-flag-mocks';
+
 /** Address of the first account generated by the default local node mnemonic. */
 export const LOCAL_NODE_ACCOUNT = '0xe18035bf8712672935fdb4e5e431b1a0183d2dfc';
 
@@ -140,15 +142,7 @@ export const MOCK_META_METRICS_ID =
 
 /* Mock remote feature flags response */
 export const MOCK_REMOTE_FEATURE_FLAGS_RESPONSE = {
-  feature1: true,
-  feature2: false,
-  feature3: {
-    name: 'groupC',
-    value: 'valueC',
-  },
-  sendRedesign: {
-    enabled: false,
-  },
+  ...BIP44_STAGE_TWO,
 };
 
 /* Mock customized remote feature flags response*/

test/e2e/fixtures/fixture-builder.js

@@ -817,6 +817,14 @@ class FixtureBuilder {
     });
   }
 
+  withPreferencesControllerShowNativeTokenAsMainBalanceEnabled() {
+    return this.withPreferencesController({
+      preferences: {
+        showNativeTokenAsMainBalance: true,
+      },
+    });
+  }
+
   withPreferencesControllerTxSimulationsDisabled() {
     return this.withPreferencesController({
       useTransactionSimulations: false,
@@ -1200,11 +1208,12 @@ class FixtureBuilder {
             {
               address: `__FIXTURE_SUBSTITUTION__CONTRACT${SMART_CONTRACTS.HST}`,
               symbol: 'TST',
-              decimals: 4,
               image:
                 'https://static.cx.metamask.io/api/v1/tokenIcons/1337/0x581c3c1a2a4ebde2a0df29b5cf4c116e42945947.png',
               isERC721: false,
-              aggregators: [],
+              decimals: 4,
+              aggregators: ['Metamask', 'Aave'],
+              name: 'test',
             },
           ],
         },

test/e2e/flask/btc/common-btc.ts

@@ -1,10 +1,7 @@
 import { Mockttp } from 'mockttp';
 import { withFixtures } from '../../helpers';
-import { ACCOUNT_TYPE } from '../../constants';
 import { Driver } from '../../webdriver/driver';
 import { loginWithBalanceValidation } from '../../page-objects/flows/login.flow';
-import AccountListPage from '../../page-objects/pages/account-list-page';
-import HeaderNavbar from '../../page-objects/pages/header-navbar';
 import FixtureBuilder from '../../fixtures/fixture-builder';
 import { MultichainNetworks } from '../../../../shared/constants/multichain/networks';
 import {
@@ -21,6 +18,7 @@ export async function withBtcAccountSnap(
 ) {
   await withFixtures(
     {
+      forceBip44Version: false,
       fixtures: new FixtureBuilder()
         .withEnabledNetworks({
           eip155: {
@@ -48,11 +46,6 @@ export async function withBtcAccountSnap(
     },
     async ({ driver, mockServer }: { driver: Driver; mockServer: Mockttp }) => {
       await loginWithBalanceValidation(driver);
-      // create one BTC account
-      await new HeaderNavbar(driver).openAccountMenu();
-      const accountListPage = new AccountListPage(driver);
-      await accountListPage.checkPageIsLoaded();
-      await accountListPage.addAccount({ accountType: ACCOUNT_TYPE.Bitcoin });
       await test(driver, mockServer);
     },
   );

test/e2e/flask/btc/mocks/feature-flag.ts

@@ -1,4 +1,5 @@
 import { Mockttp } from 'mockttp';
+import { BIP44_STAGE_TWO } from '../../../tests/multichain-accounts/feature-flag-mocks';
 
 const FEATURE_FLAGS_URL = 'https://client-config.api.cx.metamask.io/v1/flags';
 
@@ -15,7 +16,10 @@ export const mockBitcoinFeatureFlag = (mockServer: Mockttp) =>
         ok: true,
         statusCode: 200,
         json: [
-          { bitcoinAccounts: { enabled: true, minimumVersion: '13.6.0' } },
+          {
+            bitcoinAccounts: { enabled: true, minimumVersion: '13.6.0' },
+            ...BIP44_STAGE_TWO,
+          },
         ],
       };
     });

test/e2e/flask/create-watch-account.spec.ts

@@ -17,7 +17,9 @@ const EOA_ADDRESS = '0xd8dA6BF26964aF9D7eEd9e03E53415D37aA96045';
 const SHORTENED_EOA_ADDRESS = '0xd8dA6...96045';
 const DEFAULT_WATCHED_ACCOUNT_NAME = 'Watched Account 1';
 
-describe('Account-watcher snap', function (this: Suite) {
+// #37563 - Creating a watch account with EOA address is not possible with BIP44 at the moment
+// eslint-disable-next-line mocha/no-skipped-tests
+describe.skip('Account-watcher snap', function (this: Suite) {
   describe('Adding watched accounts', function () {
     it('adds watch account with valid EOA address', async function () {
       await withFixtures(

test/e2e/flask/multi-srp/add-accounts.spec.ts

@@ -2,7 +2,6 @@ import { Suite } from 'mocha';
 import { Driver } from '../../webdriver/driver';
 import HeaderNavbar from '../../page-objects/pages/header-navbar';
 import AccountListPage from '../../page-objects/pages/account-list-page';
-import { ACCOUNT_TYPE } from '../../constants';
 import { mockActiveNetworks, withMultiSrp } from './common-multi-srp';
 
 const addAccountToSrp = async (driver: Driver, srpIndex: number) => {
@@ -12,12 +11,13 @@ const addAccountToSrp = async (driver: Driver, srpIndex: number) => {
   const accountListPage = new AccountListPage(driver);
   await accountListPage.checkPageIsLoaded();
 
-  // This will create 'Account 3'.
-  await accountListPage.addAccount({
-    accountType: ACCOUNT_TYPE.Ethereum,
+  // This will create 'Account 2'.
+  await accountListPage.addMultichainAccount({
     srpIndex,
   });
-  await accountListPage.checkAccountBelongsToSrp('Account 3', srpIndex);
+
+  await accountListPage.closeMultichainAccountsPage();
+  await accountListPage.checkAccountBelongsToSrp('Account 2', srpIndex + 1);
 };
 
 describe('Multi SRP - Add accounts', function (this: Suite) {
@@ -28,7 +28,7 @@ describe('Multi SRP - Add accounts', function (this: Suite) {
         testSpecificMock: mockActiveNetworks,
       },
       async (driver: Driver) => {
-        await addAccountToSrp(driver, 1);
+        await addAccountToSrp(driver, 0);
       },
     );
   });
@@ -40,7 +40,7 @@ describe('Multi SRP - Add accounts', function (this: Suite) {
         testSpecificMock: mockActiveNetworks,
       },
       async (driver: Driver) => {
-        await addAccountToSrp(driver, 2);
+        await addAccountToSrp(driver, 1);
       },
     );
   });

test/e2e/flask/multi-srp/common-multi-srp.ts

@@ -1,9 +1,11 @@
 import { Mockttp } from 'mockttp';
 import { Driver } from '../../webdriver/driver';
 import FixtureBuilder from '../../fixtures/fixture-builder';
-import { withFixtures } from '../../helpers';
+import { WALLET_PASSWORD, withFixtures } from '../../helpers';
 import AccountListPage from '../../page-objects/pages/account-list-page';
 import HeaderNavbar from '../../page-objects/pages/header-navbar';
+import PrivacySettings from '../../page-objects/pages/settings/privacy-settings';
+import SettingsPage from '../../page-objects/pages/settings/settings-page';
 import HomePage from '../../page-objects/pages/home/homepage';
 import { loginWithBalanceValidation } from '../../page-objects/flows/login.flow';
 import { MockedEndpoint } from '../../mock-e2e';
@@ -25,11 +27,20 @@ export async function withMultiSrp(
   await withFixtures(
     {
       dappOptions: { numberOfTestDapps: 1 },
-      fixtures: new FixtureBuilder().build(),
-      testSpecificMock,
+      fixtures: new FixtureBuilder()
+        .withEnabledNetworks({
+          eip155: {
+            '0x539': true,
+          },
+        })
+        .build(),
       title,
+      testSpecificMock: async (mockServer: Mockttp) => [
+        await mockActiveNetworks(mockServer),
+        await testSpecificMock(mockServer),
+      ],
     },
-    async ({ driver }: { driver: Driver; mockServer: Mockttp }) => {
+    async ({ driver }) => {
       await loginWithBalanceValidation(driver);
       const homePage = new HomePage(driver);
       await homePage.checkPageIsLoaded();
@@ -44,6 +55,23 @@ export async function withMultiSrp(
   );
 }
 
+export const verifySrp = async (
+  driver: Driver,
+  srp: string,
+  srpIndex: number,
+) => {
+  await new HeaderNavbar(driver).openSettingsPage();
+  const settingsPage = new SettingsPage(driver);
+  await settingsPage.checkPageIsLoaded();
+  await settingsPage.goToPrivacySettings();
+
+  const privacySettings = new PrivacySettings(driver);
+  await privacySettings.openRevealSrpQuiz(srpIndex);
+  await privacySettings.completeRevealSrpQuiz();
+  await privacySettings.fillPasswordToRevealSrp(WALLET_PASSWORD);
+  await privacySettings.checkSrpTextIsDisplayed(srp);
+};
+
 export async function mockActiveNetworks(mockServer: Mockttp) {
   return await mockServer
     .forGet('https://accounts.api.cx.metamask.io/v2/activeNetworks')

test/e2e/flask/multi-srp/import-srp.spec.ts

@@ -54,15 +54,14 @@ describe('Multi SRP - Import SRP', function (this: Suite) {
       async (driver: Driver) => {
         const headerNavbar = new HeaderNavbar(driver);
         await headerNavbar.openAccountMenu();
-
         const accountListPage = new AccountListPage(driver);
-        await accountListPage.checkPageIsLoaded();
-        await accountListPage.openAccountDetailsModal('Account 2');
-
+        await accountListPage.openMultichainAccountMenu({
+          accountLabel: 'Account 1',
+          srpIndex: 1,
+        });
+        await accountListPage.clickMultichainAccountMenuItem('Account details');
         const accountDetailsPage = new MultichainAccountDetailsPage(driver);
-        await accountDetailsPage.checkPageIsLoaded();
-        await accountDetailsPage.clickSecretRecoveryPhraseRow();
-
+        await accountDetailsPage.clickRevealRow();
         const privacySettings = new PrivacySettings(driver);
         await privacySettings.completeRevealSrpQuiz();
         await privacySettings.fillPasswordToRevealSrp(testPassword);
@@ -90,7 +89,8 @@ describe('Multi SRP - Import SRP', function (this: Suite) {
         const accountListPage = new AccountListPage(driver);
         await accountListPage.checkPageIsLoaded();
 
-        await accountListPage.openImportSrpModal();
+        await accountListPage.addMultichainWallet();
+        await accountListPage.clickImportWallet();
 
         const firstSrpInputSelector =
           '[data-testid="srp-input-import__srp-note"]';

test/e2e/flask/multi-srp/settings-reveal-srp.spec.ts

@@ -1,29 +1,13 @@
 import { Suite } from 'mocha';
 import { Driver } from '../../webdriver/driver';
-import HeaderNavbar from '../../page-objects/pages/header-navbar';
-import PrivacySettings from '../../page-objects/pages/settings/privacy-settings';
-import SettingsPage from '../../page-objects/pages/settings/settings-page';
 import { E2E_SRP as FIRST_TEST_E2E_SRP } from '../../fixtures/default-fixture';
-import { WALLET_PASSWORD } from '../../helpers';
 import {
-  SECOND_TEST_E2E_SRP,
   mockActiveNetworks,
+  SECOND_TEST_E2E_SRP,
   withMultiSrp,
+  verifySrp,
 } from './common-multi-srp';
 
-const verifySrp = async (driver: Driver, srp: string, srpIndex: number) => {
-  await new HeaderNavbar(driver).openSettingsPage();
-  const settingsPage = new SettingsPage(driver);
-  await settingsPage.checkPageIsLoaded();
-  await settingsPage.goToPrivacySettings();
-
-  const privacySettings = new PrivacySettings(driver);
-  await privacySettings.openRevealSrpQuiz(srpIndex);
-  await privacySettings.completeRevealSrpQuiz();
-  await privacySettings.fillPasswordToRevealSrp(WALLET_PASSWORD);
-  await privacySettings.checkSrpTextIsDisplayed(srp);
-};
-
 describe('Multi SRP - Reveal Imported SRP', function (this: Suite) {
   const firstSrpIndex = 1;
   const secondSrpIndex = 2;

test/e2e/flask/multichain-api/evm/wallet_createSession.spec.ts

@@ -214,7 +214,7 @@ describe('Multichain API', function () {
               driver,
             );
             await editConnectedAccountsModal.checkPageIsLoaded();
-            await editConnectedAccountsModal.addNewEthereumAccount();
+            await editConnectedAccountsModal.addNewAccount();
 
             await connectAccountConfirmation.checkPageIsLoaded();
             await connectAccountConfirmation.goToPermissionsTab();
@@ -332,7 +332,7 @@ describe('Multichain API', function () {
               driver,
             );
             await editConnectedAccountsModal.checkPageIsLoaded();
-            await editConnectedAccountsModal.addNewEthereumAccount();
+            await editConnectedAccountsModal.addNewAccount();
 
             await connectAccountConfirmation.checkPageIsLoaded();
             await connectAccountConfirmation.confirmConnect();
@@ -388,7 +388,7 @@ describe('Multichain API', function () {
             );
             await editConnectedAccountsModal.checkPageIsLoaded();
             await editConnectedAccountsModal.selectAccount(1);
-            await editConnectedAccountsModal.disconnectAccount();
+            await editConnectedAccountsModal.clickOnConnect();
 
             await connectAccountConfirmation.checkPageIsLoaded();
             assert.strictEqual(
@@ -472,8 +472,8 @@ describe('Multichain API', function () {
           const expectedNewSessionScopes = [...OLD_SCOPES, ...NEW_SCOPES].map(
             (scope) => ({
               [scope]: getExpectedSessionScope(scope, [
-                ACCOUNT_1,
                 TREZOR_ACCOUNT,
+                ACCOUNT_1,
               ]),
             }),
           );

test/e2e/flask/multichain-api/evm/wallet_revokeSession.spec.ts

@@ -52,7 +52,7 @@ describe('Initializing a session w/ several scopes and accounts, then calling `w
           driver,
         );
         await editConnectedAccountsModal.checkPageIsLoaded();
-        await editConnectedAccountsModal.addNewEthereumAccount();
+        await editConnectedAccountsModal.addNewAccount();
 
         await connectAccountConfirmation.checkPageIsLoaded();
         await connectAccountConfirmation.confirmConnect();
@@ -119,7 +119,7 @@ describe('Initializing a session w/ several scopes and accounts, then calling `w
           driver,
         );
         await editConnectedAccountsModal.checkPageIsLoaded();
-        await editConnectedAccountsModal.addNewEthereumAccount();
+        await editConnectedAccountsModal.addNewAccount();
 
         await connectAccountConfirmation.checkPageIsLoaded();
         await connectAccountConfirmation.confirmConnect();

test/e2e/flask/multichain-api/evm/wallet_sessionChanged.spec.ts

@@ -63,7 +63,7 @@ describe('Call `wallet_createSession`, then update the accounts and/or scopes in
           driver,
         );
         await editConnectedAccountsModal.checkPageIsLoaded();
-        await editConnectedAccountsModal.addNewEthereumAccount();
+        await editConnectedAccountsModal.addNewAccount();
         await connectAccountConfirmation.confirmConnect();
         await driver.switchToWindowWithTitle(
           WINDOW_TITLES.ExtensionInFullScreenView,