Merge branch 'develop' into move-unit-tests-to-github-actions

MetaMask · Jul 2, 2024 · c082f24 · c082f24
2 parents 6b03bd3 + fe12ae4
commit c082f24
Show file tree

Hide file tree

Showing 36 changed files with 14 additions and 440 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
@@ -51,7 +51,6 @@ export default class PreferencesController {
         eth_sign: false,
       },
       useMultiAccountBalanceChecker: true,
-      hasDismissedOpenSeaToBlockaidBanner: false,
       useSafeChainsListValidation: true,
       // set to true means the dynamic list from the API is being used
       // set to false will be using the static list from contract-metadata
@@ -191,14 +190,6 @@ export default class PreferencesController {
     this.store.updateState({ useMultiAccountBalanceChecker: val });
   }
 
-  /**
-   * Setter for the `dismissOpenSeaToBlockaidBanner` property
-   *
-   */
-  dismissOpenSeaToBlockaidBanner() {
-    this.store.updateState({ hasDismissedOpenSeaToBlockaidBanner: true });
-  }
-
   /**
    * Setter for the `useSafeChainsListValidation` property
    *

diff --git a/app/scripts/controllers/preferences.test.js b/app/scripts/controllers/preferences.test.js
@@ -308,23 +308,6 @@ describe('preferences controller', () => {
     });
   });
 
-  describe('dismissOpenSeaToBlockaidBanner', () => {
-    it('hasDismissedOpenSeaToBlockaidBanner should default to false', () => {
-      expect(
-        preferencesController.store.getState()
-          .hasDismissedOpenSeaToBlockaidBanner,
-      ).toStrictEqual(false);
-    });
-
-    it('should set the hasDismissedOpenSeaToBlockaidBanner property in state', () => {
-      preferencesController.dismissOpenSeaToBlockaidBanner();
-      expect(
-        preferencesController.store.getState()
-          .hasDismissedOpenSeaToBlockaidBanner,
-      ).toStrictEqual(true);
-    });
-  });
-
   describe('setUseSafeChainsListValidation', function () {
     it('should default to true', function () {
       const state = preferencesController.store.getState();

diff --git a/app/scripts/lib/setupSentry.js b/app/scripts/lib/setupSentry.js
@@ -271,7 +271,6 @@ export const SENTRY_BACKGROUND_STATE = {
     useRequestQueue: true,
     useTransactionSimulations: true,
     enableMV3TimestampSave: true,
-    hasDismissedOpenSeaToBlockaidBanner: true,
   },
   PushPlatformNotificationsController: {
     fcmToken: false,

diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
@@ -2982,10 +2982,6 @@ export default class MetamaskController extends EventEmitter {
         preferencesController.setUseMultiAccountBalanceChecker.bind(
           preferencesController,
         ),
-      dismissOpenSeaToBlockaidBanner:
-        preferencesController.dismissOpenSeaToBlockaidBanner.bind(
-          preferencesController,
-        ),
       setUseSafeChainsListValidation:
         preferencesController.setUseSafeChainsListValidation.bind(
           preferencesController,

diff --git a/test/e2e/tests/bridge/bridge-click-from-asset-overview.spec.ts b/test/e2e/tests/bridge/bridge-click-from-asset-overview.spec.ts
@@ -8,7 +8,8 @@ import { BridgePage, getBridgeFixtures } from './bridge-test-utils';
 describe('Click bridge button from asset page @no-mmi', function (this: Suite) {
   it('loads portfolio tab when flag is turned off', async function () {
     await withFixtures(
-      getBridgeFixtures(this.test?.fullTitle()),
+      // withErc20 param is false, as we test it manually below
+      getBridgeFixtures(this.test?.fullTitle(), undefined, false),
       async ({
         driver,
         ganacheServer,

diff --git a/test/e2e/tests/bridge/bridge-test-utils.ts b/test/e2e/tests/bridge/bridge-test-utils.ts
@@ -108,15 +108,21 @@ export class BridgePage {
 export const getBridgeFixtures = (
   title?: string,
   testSpecificMock?: (server: Mockttp) => Promise<void>,
+  withErc20: boolean = true,
 ) => {
+  const fixtureBuilder = new FixtureBuilder({
+    inputChainId: CHAIN_IDS.MAINNET,
+  }).withNetworkControllerOnMainnet();
+
+  if (withErc20) {
+    fixtureBuilder.withTokensControllerERC20();
+  }
+
   return {
     driverOptions: {
       openDevToolsForTabs: true,
     },
-    fixtures: new FixtureBuilder({ inputChainId: CHAIN_IDS.MAINNET })
-      .withNetworkControllerOnMainnet()
-      .withTokensControllerERC20()
-      .build(),
+    fixtures: fixtureBuilder.build(),
     testSpecificMock,
     smartContract: SMART_CONTRACTS.HST,
     ganacheOptions: generateGanacheOptions({

diff --git a/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-background-state.json b/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-background-state.json
@@ -180,7 +180,6 @@
     "dismissSeedBackUpReminder": true,
     "disabledRpcMethodPreferences": { "eth_sign": false },
     "useMultiAccountBalanceChecker": true,
-    "hasDismissedOpenSeaToBlockaidBanner": false,
     "useSafeChainsListValidation": "boolean",
     "useTokenDetection": false,
     "useNftDetection": false,

diff --git a/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-ui-state.json b/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-ui-state.json
@@ -114,7 +114,6 @@
     "dismissSeedBackUpReminder": true,
     "disabledRpcMethodPreferences": { "eth_sign": false },
     "useMultiAccountBalanceChecker": true,
-    "hasDismissedOpenSeaToBlockaidBanner": false,
     "useSafeChainsListValidation": true,
     "useTokenDetection": false,
     "useNftDetection": false,