test: Fix Per dapp selected network e2e to include GNS disabled scenario

e2e/specs/confirmations-redesigned/transactions/per-dapp-selected-network.spec.ts

@@ -0,0 +1,199 @@
+import FixtureBuilder from '../../../framework/fixtures/FixtureBuilder.ts';
+import { withFixtures } from '../../../framework/fixtures/FixtureHelper.ts';
+import { buildPermissions } from '../../../framework/fixtures/FixtureUtils.ts';
+import Browser from '../../../pages/Browser/BrowserView.ts';
+import ConfirmationFooterActions from '../../../pages/Browser/Confirmations/FooterActions.ts';
+import ConfirmationUITypes from '../../../pages/Browser/Confirmations/ConfirmationUITypes.ts';
+import TestDApp from '../../../pages/Browser/TestDApp.ts';
+import NetworkEducationModal from '../../../pages/Network/NetworkEducationModal.ts';
+import NetworkListModal from '../../../pages/Network/NetworkListModal.ts';
+import TabBarComponent from '../../../pages/wallet/TabBarComponent.ts';
+import WalletView from '../../../pages/wallet/WalletView.ts';
+import {
+  RegressionConfirmations,
+  SmokeConfirmationsRedesigned,
+} from '../../../tags.js';
+import Assertions from '../../../framework/Assertions.ts';
+import { loginToApp } from '../../../viewHelper.ts';
+import { DappVariants } from '../../../framework/Constants.ts';
+import { setupRemoteFeatureFlagsMock } from '../../../api-mocking/helpers/remoteFeatureFlagsHelper.ts';
+import { confirmationsRedesignedFeatureFlags } from '../../../api-mocking/mock-responses/feature-flags-mocks.ts';
+import { Mockttp } from 'mockttp';
+
+const LOCAL_CHAIN_ID = '0x539';
+const LOCAL_CHAIN_NAME = 'Localhost';
+
+async function changeNetworkFromNetworkListModal(networkName: string) {
+  await TabBarComponent.tapWallet();
+  await WalletView.tapNetworksButtonOnNavBar();
+  await NetworkListModal.changeNetworkTo(networkName);
+  await device.disableSynchronization();
+  await NetworkEducationModal.tapGotItButton();
+  await device.enableSynchronization();
+}
+
+async function changeNetworkFromNetworkListModalGNSDisabled(
+  networkName: string,
+) {
+  await TabBarComponent.tapWallet();
+  await WalletView.tapTokenNetworkFilter();
+  await NetworkListModal.changeNetworkTo(networkName);
+}
+
+describe(SmokeConfirmationsRedesigned('Per Dapp Selected Network'), () => {
+  const testSpecificMock = async (mockServer: Mockttp) => {
+    await setupRemoteFeatureFlagsMock(
+      mockServer,
+      Object.assign({}, ...confirmationsRedesignedFeatureFlags),
+    );
+  };
+
+  // Some tests depend on the MM_REMOVE_GLOBAL_NETWORK_SELECTOR environment variable being set to false.
+  const isRemoveGlobalNetworkSelectorEnabled =
+    process.env.MM_REMOVE_GLOBAL_NETWORK_SELECTOR === 'true';
+  const itif = (condition: boolean) => (condition ? it : it.skip);
+
+  beforeAll(async () => {
+    jest.setTimeout(15000);
+  });
+
+  itif(isRemoveGlobalNetworkSelectorEnabled)(
+    'submits a transaction to a dApp selected network',
+    async () => {
+      await withFixtures(
+        {
+          dapps: [
+            {
+              dappVariant: DappVariants.TEST_DAPP,
+            },
+          ],
+          fixture: new FixtureBuilder()
+            .withGanacheNetwork()
+            .withPermissionControllerConnectedToTestDapp(
+              buildPermissions([LOCAL_CHAIN_ID]),
+            )
+            .build(),
+          restartDevice: true,
+          testSpecificMock,
+        },
+        async () => {
+          await loginToApp();
+          await TabBarComponent.tapBrowser();
+          await Browser.navigateToTestDApp();
+
+          // Make sure the dapp is connected to the predefined network in configuration (LOCAL_CHAIN_ID)
+          // by checking chainId text in the test dapp
+          await TestDApp.verifyCurrentNetworkText('Chain id ' + LOCAL_CHAIN_ID);
+
+          // Change the network to Ethereum Main Network in app
+          await changeNetworkFromNetworkListModalGNSDisabled(
+            'Ethereum Main Network',
+          );
+
+          await TabBarComponent.tapBrowser();
+          // Assert the dapp is still connected the previously selected network (LOCAL_CHAIN_ID)
+          await TestDApp.verifyCurrentNetworkText('Chain id ' + LOCAL_CHAIN_ID);
+
+          // Now do a transaction
+          await TestDApp.tapSendEIP1559Button();
+
+          // Wait for the confirmation modal to appear
+          await Assertions.expectElementToBeVisible(
+            ConfirmationUITypes.ModalConfirmationContainer,
+          );
+
+          // Assert the transaction is happening on the correct network
+          await Assertions.expectTextDisplayed(LOCAL_CHAIN_NAME);
+
+          // Accept confirmation
+          await ConfirmationFooterActions.tapConfirmButton();
+
+          // Change the network to Localhost in app
+          await changeNetworkFromNetworkListModalGNSDisabled(LOCAL_CHAIN_NAME);
+
+          // Check activity tab
+          await TabBarComponent.tapActivity();
+          await Assertions.expectTextDisplayed('Confirmed');
+        },
+      );
+    },
+  );
+});
+
+describe(RegressionConfirmations('Per Dapp Selected Network'), () => {
+  const testSpecificMock = async (mockServer: Mockttp) => {
+    await setupRemoteFeatureFlagsMock(
+      mockServer,
+      Object.assign({}, ...confirmationsRedesignedFeatureFlags),
+    );
+  };
+
+  // Some tests depend on the MM_REMOVE_GLOBAL_NETWORK_SELECTOR environment variable being set to false.
+  const isRemoveGlobalNetworkSelectorEnabled =
+    process.env.MM_REMOVE_GLOBAL_NETWORK_SELECTOR === 'true';
+  const itif = (condition: boolean) => (condition ? it.skip : it);
+
+  beforeAll(async () => {
+    jest.setTimeout(15000);
+  });
+
+  itif(isRemoveGlobalNetworkSelectorEnabled)(
+    'submits a transaction to a dApp selected network',
+    async () => {
+      await withFixtures(
+        {
+          dapps: [
+            {
+              dappVariant: DappVariants.TEST_DAPP,
+            },
+          ],
+          fixture: new FixtureBuilder()
+            .withGanacheNetwork()
+            .withPermissionControllerConnectedToTestDapp(
+              buildPermissions([LOCAL_CHAIN_ID]),
+            )
+            .build(),
+          restartDevice: true,
+          testSpecificMock,
+        },
+        async () => {
+          await loginToApp();
+          await TabBarComponent.tapBrowser();
+          await Browser.navigateToTestDApp();
+
+          // Make sure the dapp is connected to the predefined network in configuration (LOCAL_CHAIN_ID)
+          // by checking chainId text in the test dapp
+          await TestDApp.verifyCurrentNetworkText('Chain id ' + LOCAL_CHAIN_ID);
+
+          // Change the network to Ethereum Main Network in app
+          await changeNetworkFromNetworkListModal('Ethereum Main Network');
+
+          await TabBarComponent.tapBrowser();
+          // Assert the dapp is still connected the previously selected network (LOCAL_CHAIN_ID)
+          await TestDApp.verifyCurrentNetworkText('Chain id ' + LOCAL_CHAIN_ID);
+
+          // Now do a transaction
+          await TestDApp.tapSendEIP1559Button();
+
+          // Wait for the confirmation modal to appear
+          await Assertions.expectElementToBeVisible(
+            ConfirmationUITypes.ModalConfirmationContainer,
+          );
+
+          // Assert the transaction is happening on the correct network
+          await Assertions.expectTextDisplayed(LOCAL_CHAIN_NAME);
+
+          // Accept confirmation
+          await ConfirmationFooterActions.tapConfirmButton();
+
+          // Change the network to Localhost in app
+          await changeNetworkFromNetworkListModal(LOCAL_CHAIN_NAME);
+
+          // Check activity tab
+          await TabBarComponent.tapActivity();
+          await Assertions.expectTextDisplayed('Confirmed');
+        },
+      );
+    },
+  );
+});