Merge branch 'develop' into fix-15104

MetaMask · Oct 28, 2022 · 5671977 · 5671977
2 parents d2124b9 + 2f84010
commit 5671977
Show file tree

Hide file tree

Showing 141 changed files with 2,662 additions and 4,044 deletions.
diff --git a/app/_locales/de/messages.json b/app/_locales/de/messages.json
diff --git a/app/_locales/el/messages.json b/app/_locales/el/messages.json
diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json
diff --git a/app/_locales/es/messages.json b/app/_locales/es/messages.json
diff --git a/app/_locales/fr/messages.json b/app/_locales/fr/messages.json
diff --git a/app/_locales/hi/messages.json b/app/_locales/hi/messages.json
diff --git a/app/_locales/id/messages.json b/app/_locales/id/messages.json
diff --git a/app/_locales/ja/messages.json b/app/_locales/ja/messages.json
diff --git a/app/_locales/ko/messages.json b/app/_locales/ko/messages.json
diff --git a/app/_locales/pt/messages.json b/app/_locales/pt/messages.json
diff --git a/app/_locales/ru/messages.json b/app/_locales/ru/messages.json
diff --git a/app/_locales/tl/messages.json b/app/_locales/tl/messages.json
diff --git a/app/_locales/tr/messages.json b/app/_locales/tr/messages.json
diff --git a/app/_locales/vi/messages.json b/app/_locales/vi/messages.json
diff --git a/app/_locales/zh_CN/messages.json b/app/_locales/zh_CN/messages.json
diff --git a/app/scripts/controllers/preferences.js b/app/scripts/controllers/preferences.js
@@ -69,7 +69,6 @@ export default class PreferencesController {
         ? LEDGER_TRANSPORT_TYPES.WEBHID
         : LEDGER_TRANSPORT_TYPES.U2F,
       theme: 'light',
-      customNetworkListEnabled: false,
       ...opts.initState,
     };
 
@@ -188,17 +187,6 @@ export default class PreferencesController {
     this.store.updateState({ theme: val });
   }
 
-  /**
-   * Setter for the `customNetworkListEnabled` property
-   *
-   * @param customNetworkListEnabled
-   */
-  setCustomNetworkListEnabled(customNetworkListEnabled) {
-    this.store.updateState({
-      customNetworkListEnabled,
-    });
-  }
-
   /**
    * Add new methodData to state, to avoid requesting this information again through Infura
    *

diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
@@ -1647,10 +1647,6 @@ export default class MetamaskController extends EventEmitter {
         preferencesController,
       ),
       setTheme: preferencesController.setTheme.bind(preferencesController),
-      setCustomNetworkListEnabled:
-        preferencesController.setCustomNetworkListEnabled.bind(
-          preferencesController,
-        ),
       // AssetsContractController
       getTokenStandardAndDetails: this.getTokenStandardAndDetails.bind(this),
 

diff --git a/test/e2e/fixtures/README.md → docs/generating-fixture-data.md b/test/e2e/fixtures/README.md → docs/generating-fixture-data.md
@@ -1,10 +1,3 @@
-# End-to-end tests
-
-This directory contains the fixture data used to bootstrap the individual e2e tests. Each sub-directory contains
-one thing:
-
-1. A `state.json` file that represents a the saved state for the extension (see _Generating fixture data_ below)
-
 ## Generating fixture data
 
 Fixture data can be generated by following these steps:

diff --git a/test/e2e/benchmark.js b/test/e2e/benchmark.js
@@ -13,22 +13,26 @@ const {
 } = require('../helpers/file');
 const { withFixtures, tinyDelayMs } = require('./helpers');
 const { PAGES } = require('./webdriver/driver');
+const FixtureBuilder = require('./fixture-builder');
 
 const DEFAULT_NUM_SAMPLES = 20;
 const ALL_PAGES = Object.values(PAGES);
 
 async function measurePage(pageName) {
   let metrics;
-  await withFixtures({ fixtures: 'imported-account' }, async ({ driver }) => {
-    await driver.delay(tinyDelayMs);
-    await driver.navigate();
-    await driver.fill('#password', 'correct horse battery staple');
-    await driver.press('#password', driver.Key.ENTER);
-    await driver.findElement('.selected-account__name');
-    await driver.navigate(pageName);
-    await driver.delay(1000);
-    metrics = await driver.collectMetrics();
-  });
+  await withFixtures(
+    { fixtures: new FixtureBuilder().build() },
+    async ({ driver }) => {
+      await driver.delay(tinyDelayMs);
+      await driver.navigate();
+      await driver.fill('#password', 'correct horse battery staple');
+      await driver.press('#password', driver.Key.ENTER);
+      await driver.findElement('.selected-account__name');
+      await driver.navigate(pageName);
+      await driver.delay(1000);
+      metrics = await driver.collectMetrics();
+    },
+  );
   return metrics;
 }