feat: Removed multichain flag for v1 release (#24362)

This PR is to remove all the Multichain flags from code except the send and swap flow ## **Related issues** Fixes: [MetaMask/MetaMask-planning#2431 ) ## **Manual testing steps** 1. Run the extension without Multichain flag. 2. All the changes should be there ## **Screenshots/Recordings** ### **Before**  ### **After**  ## **Pre-merge author checklist** - [ ] I’ve followed [MetaMask Coding Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md). - [ ] I've completed the PR template to the best of my ability - [ ] I’ve included tests if applicable - [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format if applicable - [ ] I’ve applied the right labels on the PR (see [labeling guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)). Not required for external contributors. ## **Pre-merge reviewer checklist** - [ ] I've manually tested the PR (e.g. pull and build branch, run the app, test code being changed). - [ ] I confirm that this PR addresses all acceptance criteria described in the ticket it closes and includes the necessary testing evidence such as recordings and or screenshots.
MetaMask · May 9, 2024 · 4dce340 · 4dce340
1 parent 8db28c7
commit 4dce340
Show file tree

Hide file tree

Showing 28 changed files with 1,517 additions and 831 deletions.
diff --git a/test/e2e/accounts/common.ts b/test/e2e/accounts/common.ts
@@ -202,9 +202,15 @@ export async function connectAccountToTestDapp(driver: Driver) {
 export async function disconnectFromTestDapp(driver: Driver) {
  await driver.switchToWindowWithTitle(WINDOW_TITLES.ExtensionInFullScreenView);
  await driver.clickElement('[data-testid="account-options-menu-button"]');
- await driver.clickElement('[data-testid="global-menu-connected-sites"]');
- await driver.clickElement({ text: 'Disconnect', tag: 'a' });
+ await driver.clickElement({ text: 'All Permissions', tag: 'div' });
+ await driver.clickElement({ text: 'Got it', tag: 'button' });
+ await driver.clickElement({
+ text: '127.0.0.1:8080',
+ tag: 'p',
+ });
+ await driver.clickElement('[data-testid="account-list-item-menu-button"]');
  await driver.clickElement({ text: 'Disconnect', tag: 'button' });
+ await driver.clickElement('[data-testid ="disconnect-all"]');
 }
 
 export async function approveOrRejectRequest(driver: Driver, flowType: string) {

diff --git a/test/e2e/tests/account/add-account.spec.js b/test/e2e/tests/account/add-account.spec.js
@@ -130,11 +130,9 @@ describe('Add account', function () {
 
  // Land in 1st account home page
  await driver.findElement('.home__main-view');
-
  if (!process.env.MULTICHAIN) {
  await waitForAccountRendered(driver);
  }
-
  // Check address of 1st account
  await driver.findElement('[data-testid="app-header-copy-button"]');
 

diff --git a/test/e2e/tests/dapp-interactions/dapp-interactions.spec.js b/test/e2e/tests/dapp-interactions/dapp-interactions.spec.js
@@ -3,7 +3,6 @@ const {
  defaultGanacheOptions,
  withFixtures,
  openDapp,
- DAPP_URL,
  DAPP_ONE_URL,
  unlockWallet,
  WINDOW_TITLES,
@@ -84,17 +83,17 @@ describe('Dapp interactions', function () {
  '[data-testid ="account-options-menu-button"]',
  );
 
- await driver.clickElement({ text: 'Connected sites', tag: 'div' });
+ await driver.clickElement({ text: 'All Permissions', tag: 'div' });
+ await driver.clickElement({ text: 'Got it', tag: 'button' });
 
  const connectedDapp1 = await driver.isElementPresent({
- text: DAPP_URL,
- tag: 'bdi',
+ text: '127.0.0.1:8080',
+ tag: 'p',
  });
  const connectedDapp2 = await driver.isElementPresent({
- text: DAPP_ONE_URL,
- tag: 'bdi',
+ text: '127.0.0.1:8081',
+ tag: 'p',
  });
-
  assert.ok(connectedDapp1, 'Account not connected to Dapp1');
  assert.ok(connectedDapp2, 'Account not connected to Dapp2');
  },

diff --git a/test/e2e/tests/dapp-interactions/permissions.spec.js b/test/e2e/tests/dapp-interactions/permissions.spec.js
@@ -50,18 +50,17 @@ describe('Permissions', function () {
  await driver.clickElement(
  '[data-testid="account-options-menu-button"]',
  );
- await driver.clickElement('.menu-item:nth-of-type(3)');
-
- await driver.findElement({
- text: 'Connected sites',
- tag: 'h2',
+ await driver.clickElement({
+ text: 'All Permissions',
+ tag: 'div',
  });
+ await driver.clickElement({ text: 'Got it', tag: 'button' });
  await driver.waitForSelector({
- css: '.connected-sites-list__subject-name',
  text: '127.0.0.1:8080',
+ tag: 'p',
  });
  const domains = await driver.findClickableElements(
- '.connected-sites-list__subject-name',
+ '[data-testid="connection-list-item"]',
  );
  assert.equal(domains.length, 1);
 

diff --git a/test/e2e/tests/metrics/dapp-viewed.spec.js b/test/e2e/tests/metrics/dapp-viewed.spec.js
@@ -7,7 +7,6 @@ const {
  openDapp,
  waitForAccountRendered,
  WINDOW_TITLES,
- DAPP_URL,
 } = require('../../helpers');
 const FixtureBuilder = require('../../fixture-builder');
 const {
@@ -332,24 +331,35 @@ describe('Dapp viewed Event @no-mmi', function () {
  await driver.clickElement(
  '[data-testid ="account-options-menu-button"]',
  );
- await driver.clickElement({ text: 'Connected sites', tag: 'div' });
- await driver.findElement({
- text: DAPP_URL,
- tag: 'bdi',
+ await driver.clickElement({
+ text: 'All Permissions',
+ tag: 'div',
+ });
+ await driver.clickElement({ text: 'Got it', tag: 'button' });
+ await driver.clickElement({
+ text: '127.0.0.1:8080',
+ tag: 'p',
  });
- await driver.clickElement({ text: 'Disconnect', tag: 'a' });
+ await driver.clickElement(
+ '[data-testid ="account-list-item-menu-button"]',
+ );
  await driver.clickElement({
- text: `Disconnect ${DAPP_URL}`,
- tag: 'h2',
+ text: 'Disconnect',
+ tag: 'button',
  });
- await driver.clickElement({ text: 'Disconnect', tag: 'button' });
+ await driver.clickElement('[data-testid ="disconnect-all"]');
+ await driver.clickElement('button[aria-label="Back"]');
+ await driver.clickElement('button[aria-label="Back"]');
  // validate dapp is not connected
  await driver.clickElement(
  '[data-testid ="account-options-menu-button"]',
  );
- await driver.clickElement({ text: 'Connected sites', tag: 'div' });
+ await driver.clickElement({
+ text: 'All Permissions',
+ tag: 'div',
+ });
  await driver.findElement({
- text: 'Account 1 is not connected to any sites.',
+ text: 'Nothing to see here',
  tag: 'p',
  });
  // reconnect again

diff --git a/test/e2e/tests/multichain/connection-page.spec.js b/test/e2e/tests/multichain/connection-page.spec.js
@@ -20,9 +20,6 @@ describe('Connections page', function () {
  title: this.test.fullTitle(),
  },
  async ({ driver }) => {
- if (!process.env.MULTICHAIN) {
- return;
- }
  await unlockWallet(driver);
  await waitForAccountRendered(driver);
  await connectToDapp(driver);
@@ -99,9 +96,6 @@ describe('Connections page', function () {
  title: this.test.fullTitle(),
  },
  async ({ driver }) => {
- if (!process.env.MULTICHAIN) {
- return;
- }
  await unlockWallet(driver);
  await waitForAccountRendered(driver);
  await connectToDapp(driver);

diff --git a/test/e2e/tests/multichain/permission-page.spec.js b/test/e2e/tests/multichain/permission-page.spec.js
@@ -18,9 +18,6 @@ describe('Permissions Page', function () {
  },
  async ({ driver }) => {
  await unlockWallet(driver);
- if (!process.env.MULTICHAIN) {
- return;
- }
  await waitForAccountRendered(driver);
  await connectToDapp(driver);
 
@@ -54,9 +51,6 @@ describe('Permissions Page', function () {
  },
  async ({ driver }) => {
  await unlockWallet(driver);
- if (!process.env.MULTICHAIN) {
- return;
- }
  await waitForAccountRendered(driver);
  await connectToDapp(driver);
 

diff --git a/test/e2e/tests/settings/change-language.spec.ts b/test/e2e/tests/settings/change-language.spec.ts
@@ -28,7 +28,7 @@ const selectors = {
  headerText: { text: 'الإعدادات', tag: 'h3' },
 };
 
-async function changeLanguage(driver: Driver , languageIndex: number) {
+async function changeLanguage(driver: Driver, languageIndex: number) {
  await driver.clickElement(selectors.accountOptionsMenuButton);
  await driver.clickElement(selectors.settingsOption);
 
@@ -91,7 +91,7 @@ describe('Settings - general tab @no-mmi', function (this: Suite) {
 
  async ({ driver }: { driver: Driver }) => {
  await unlockWallet(driver);
- await changeLanguage(driver, languageIndex );
+ await changeLanguage(driver, languageIndex);
 
  await driver.assertElementNotPresent('.loading-overlay__spinner');
 
@@ -134,7 +134,6 @@ describe('Settings - general tab @no-mmi', function (this: Suite) {
  if (process.env.MULTICHAIN) {
  return;
  }
-
  const languageIndex = 7;
  await withFixtures(
  {
@@ -145,7 +144,7 @@ describe('Settings - general tab @no-mmi', function (this: Suite) {
 
  async ({ driver }: { driver: Driver }) => {
  await unlockWallet(driver);
- await changeLanguage( driver, languageIndex );
+ await changeLanguage(driver, languageIndex);
  await driver.navigate();
  await driver.clickElement(selectors.ethOverviewSend);
  await driver.fill(selectors.ensInput, 'test');
@@ -167,7 +166,6 @@ describe('Settings - general tab @no-mmi', function (this: Suite) {
  if (process.env.MULTICHAIN) {
  return;
  }
-
  const languageIndex = 19;
  await withFixtures(
  {
@@ -178,7 +176,7 @@ describe('Settings - general tab @no-mmi', function (this: Suite) {
 
  async ({ driver }: { driver: Driver }) => {
  await unlockWallet(driver);
- await changeLanguage( driver, languageIndex );
+ await changeLanguage(driver, languageIndex);
  await driver.navigate();
 
  // Validate the account tooltip
@@ -216,7 +214,7 @@ describe('Settings - general tab @no-mmi', function (this: Suite) {
  async ({ driver }: { driver: Driver }) => {
  await unlockWallet(driver);
  // selects "Magyar" language
- await changeLanguage( driver, languageIndex );
+ await changeLanguage(driver, languageIndex);
  await driver.navigate();
  await driver.clickElement(selectors.nftsTab);
 
@@ -243,7 +241,7 @@ describe('Settings - general tab @no-mmi', function (this: Suite) {
  },
  async ({ driver }: { driver: Driver }) => {
  await unlockWallet(driver);
- await changeLanguage( driver, languageIndex );
+ await changeLanguage(driver, languageIndex);
 
  // Validate the header text
  const isHeaderTextChanged = await driver.isElementPresent(

diff --git a/ui/components/app/alerts/alerts.js b/ui/components/app/alerts/alerts.js
@@ -18,7 +18,7 @@ const Alerts = ({ history }) => {
  if (_invalidCustomNetworkAlertIsOpen) {
  return <InvalidCustomNetworkAlert history={history} />;
  }
- if (_unconnectedAccountAlertIsOpen && !process.env.MULTICHAIN) {
+ if (_unconnectedAccountAlertIsOpen) {
  return <UnconnectedAccountAlert />;
  }