feat: added create solana account test

test/data/mock-state.json

@@ -1891,6 +1891,7 @@
     "watchEthereumAccountEnabled": false,
     "bitcoinSupportEnabled": false,
     "bitcoinTestnetSupportEnabled": false,
+    "solanaSupportEnabled": false,
     "pendingApprovals": {
       "testApprovalId": {
         "id": "testApprovalId",

test/e2e/constants.ts

@@ -57,6 +57,9 @@ export const DEFAULT_BTC_FEES_RATE = 0.00001; // BTC
 /* Default BTC conversion rate to USD */
 export const DEFAULT_BTC_CONVERSION_RATE = 62000; // USD
 
+/* Default SOL conversion rate to USD */
+export const DEFAULT_SOL_CONVERSION_RATE = 226; // USD
+
 /* Default BTC transaction ID */
 export const DEFAULT_BTC_TRANSACTION_ID =
   'e4111a707317da67d49a71af4cbcf6c0546f900ca32c3842d2254e315d1fca18';

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

@@ -14,6 +14,7 @@ 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 { ACCOUNT_TYPE } from '../../page-objects/common';
 
 const QUICKNODE_URL_REGEX = /^https:\/\/.*\.btc.*\.quiknode\.pro(\/|$)/u;
 
@@ -217,7 +218,7 @@ export async function withBtcAccountSnap(
       await new HeaderNavbar(driver).openAccountMenu();
       const accountListPage = new AccountListPage(driver);
       await accountListPage.check_pageIsLoaded();
-      await accountListPage.addNewBtcAccount();
+      await accountListPage.addAccount(ACCOUNT_TYPE.Bitcoin, '');
       await test(driver, mockServer);
     },
   );

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

@@ -7,6 +7,7 @@ import LoginPage from '../../page-objects/pages/login-page';
 import PrivacySettings from '../../page-objects/pages/settings/privacy-settings';
 import ResetPasswordPage from '../../page-objects/pages/reset-password-page';
 import SettingsPage from '../../page-objects/pages/settings/settings-page';
+import { ACCOUNT_TYPE } from '../../page-objects/common';
 import { withBtcAccountSnap } from './common-btc';
 
 describe('Create BTC Account', function (this: Suite) {
@@ -34,14 +35,12 @@ describe('Create BTC Account', function (this: Suite) {
         await headerNavbar.openAccountMenu();
         const accountListPage = new AccountListPage(driver);
         await accountListPage.check_pageIsLoaded();
-        await accountListPage.addNewBtcAccount({
-          btcAccountCreationEnabled: false,
-        });
-
-        // check the number of available accounts is 2
-        await headerNavbar.openAccountMenu();
-        await accountListPage.check_pageIsLoaded();
         await accountListPage.check_numberOfAvailableAccounts(2);
+        await accountListPage.openAddAccountModal();
+        assert.equal(
+          await accountListPage.isBtcAccountCreationButtonEnabled(),
+          false,
+        );
       },
     );
   });
@@ -91,8 +90,14 @@ describe('Create BTC Account', function (this: Suite) {
 
         // Recreate account and check that the address is the same
         await headerNavbar.openAccountMenu();
-        await accountListPage.check_pageIsLoaded();
-        await accountListPage.addNewBtcAccount();
+        await accountListPage.openAddAccountModal();
+        assert.equal(
+          await accountListPage.isBtcAccountCreationButtonEnabled(),
+          true,
+        );
+        await accountListPage.closeAccountModal();
+        await headerNavbar.openAccountMenu();
+        await accountListPage.addAccount(ACCOUNT_TYPE.Bitcoin, '');
         await headerNavbar.check_accountLabel('Bitcoin Account');
 
         await headerNavbar.openAccountMenu();
@@ -146,7 +151,7 @@ describe('Create BTC Account', function (this: Suite) {
         await headerNavbar.check_pageIsLoaded();
         await headerNavbar.openAccountMenu();
         await accountListPage.check_pageIsLoaded();
-        await accountListPage.addNewBtcAccount();
+        await accountListPage.addAccount(ACCOUNT_TYPE.Bitcoin, '');
         await headerNavbar.check_accountLabel('Bitcoin Account');
 
         await headerNavbar.openAccountMenu();

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

@@ -0,0 +1,71 @@
+import { Mockttp } from 'mockttp';
+import { withFixtures } from '../../helpers';
+import { Driver } from '../../webdriver/driver';
+import HeaderNavbar from '../../page-objects/pages/header-navbar';
+import AccountListPage from '../../page-objects/pages/account-list-page';
+import FixtureBuilder from '../../fixture-builder';
+import { ACCOUNT_TYPE } from '../../page-objects/common';
+import { loginWithBalanceValidation } from '../../page-objects/flows/login.flow';
+
+const SOLANA_URL_REGEX = /^https:\/\/.*\.solana.*/u;
+
+export enum SendFlowPlaceHolders {
+  AMOUNT = 'Enter amount to send',
+  RECIPIENT = 'Enter receiving address',
+  LOADING = 'Preparing transaction',
+}
+
+export async function mockSolanaBalanceQuote(mockServer: Mockttp) {
+  return await mockServer
+    .forPost(SOLANA_URL_REGEX)
+    .withJsonBodyIncluding({
+      method: 'getBalance',
+    })
+    .thenCallback(() => {
+      return {
+        statusCode: 200,
+        json: {
+          result: {
+            context: {
+              apiVersion: '2.0.15',
+              slot: 305352614,
+            },
+            value: 0,
+          },
+        },
+      };
+    });
+}
+
+export async function withSolanaAccountSnap(
+  {
+    title,
+    solanaSupportEnabled,
+  }: { title?: string; solanaSupportEnabled?: boolean },
+  test: (driver: Driver, mockServer: Mockttp) => Promise<void>,
+) {
+  console.log('Starting withSolanaAccountSnap');
+  await withFixtures(
+    {
+      fixtures: new FixtureBuilder()
+        .withPreferencesControllerAndFeatureFlag({
+          solanaSupportEnabled: solanaSupportEnabled ?? true,
+        })
+        .build(),
+      title,
+      dapp: true,
+      testSpecificMock: async (mockServer: Mockttp) => {
+        console.log('Setting up test-specific mocks');
+        return [await mockSolanaBalanceQuote(mockServer)];
+      },
+    },
+    async ({ driver, mockServer }: { driver: Driver; mockServer: Mockttp }) => {
+      await loginWithBalanceValidation(driver);
+      const headerComponen = new HeaderNavbar(driver);
+      await headerComponen.openAccountMenu();
+      const accountListPage = new AccountListPage(driver);
+      await accountListPage.addAccount(ACCOUNT_TYPE.Solana, 'Solana 1');
+      await test(driver, mockServer);
+    },
+  );
+}

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

@@ -0,0 +1,62 @@
+import { Suite } from 'mocha';
+import HeaderNavbar from '../../page-objects/pages/header-navbar';
+import AccountListPage from '../../page-objects/pages/account-list-page';
+import { ACCOUNT_TYPE } from '../../page-objects/common';
+import { withSolanaAccountSnap } from './common-solana';
+
+// Scenarios skipped due to https://consensyssoftware.atlassian.net/browse/SOL-87
+describe('Create Solana Account', function (this: Suite) {
+  it.skip('Creates 2 Solana accounts', async function () {
+    await withSolanaAccountSnap(
+      { title: this.test?.fullTitle() },
+      async (driver) => {
+        // check that we have one Solana account
+        const headerNavbar = new HeaderNavbar(driver);
+        await headerNavbar.check_pageIsLoaded();
+        await headerNavbar.check_accountLabel('Solana 1');
+        await headerNavbar.openAccountMenu();
+        const accountListPage = new AccountListPage(driver);
+        await accountListPage.check_accountDisplayedInAccountList('Account 1');
+        await accountListPage.addAccount(ACCOUNT_TYPE.Solana, 'Solana 2');
+        await headerNavbar.check_accountLabel('Solana 2');
+        await headerNavbar.openAccountMenu();
+        await accountListPage.check_numberOfAvailableAccounts(3);
+      },
+    );
+  });
+  it('Creates a Solana account from the menu', async function () {
+    await withSolanaAccountSnap(
+      { title: this.test?.fullTitle() },
+      async (driver) => {
+        const headerNavbar = new HeaderNavbar(driver);
+        await headerNavbar.check_pageIsLoaded();
+        await headerNavbar.check_accountLabel('Solana 1');
+        await headerNavbar.openAccountMenu();
+        const accountListPage = new AccountListPage(driver);
+        await accountListPage.check_accountDisplayedInAccountList('Account 1');
+        await accountListPage.check_accountDisplayedInAccountList('Solana 1');
+      },
+    );
+  });
+});
+it.skip('Removes Solana account after creating it', async function () {
+  await withSolanaAccountSnap(
+    { title: this.test?.fullTitle() },
+    async (driver) => {
+      // check that we have one Solana account
+      const headerNavbar = new HeaderNavbar(driver);
+      await headerNavbar.check_accountLabel('Solana 1');
+      // check user can cancel the removal of the Solana account
+      await headerNavbar.openAccountMenu();
+      const accountListPage = new AccountListPage(driver);
+      await accountListPage.check_accountDisplayedInAccountList('Account 1');
+      await accountListPage.removeAccount('Solana 1', true);
+      await headerNavbar.check_accountLabel('Account 1');
+      await headerNavbar.openAccountMenu();
+      await accountListPage.check_accountDisplayedInAccountList('Account 1');
+      await accountListPage.check_accountIsNotDisplayedInAccountList(
+        'Solana 1',
+      );
+    },
+  );
+});

test/e2e/flask/solana/solana-eth-networks.spec.ts

@@ -0,0 +1,24 @@
+import { Suite } from 'mocha';
+import HeaderNavbar from '../../page-objects/pages/header-navbar';
+import AccountListPage from '../../page-objects/pages/account-list-page';
+import { withSolanaAccountSnap } from './common-solana';
+
+describe('Solana/Evm accounts', function (this: Suite) {
+  it('Network picker is disabled when Solana account is selected', async function () {
+    await withSolanaAccountSnap(
+      { title: this.test?.fullTitle() },
+      async (driver) => {
+        const headerNavbar = new HeaderNavbar(driver);
+        await headerNavbar.check_pageIsLoaded();
+        await headerNavbar.check_accountLabel('Solana 1');
+        await headerNavbar.check_currentSelectedNetwork('Solana');
+        await headerNavbar.check_ifNetworkPickerClickable(false);
+        await headerNavbar.openAccountMenu();
+        const accountMenu = new AccountListPage(driver);
+        await accountMenu.switchToAccount('Account 1');
+        await headerNavbar.check_currentSelectedNetwork('Localhost 8545');
+        await headerNavbar.check_ifNetworkPickerClickable(true);
+      },
+    );
+  });
+});

test/e2e/page-objects/common.ts

@@ -2,3 +2,9 @@ export type RawLocator =
   | string
   | { css?: string; text?: string }
   | { tag: string; text: string };
+
+export enum ACCOUNT_TYPE {
+  Ethereum,
+  Bitcoin,
+  Solana,
+}