test: testing Confirmations e2e changes in all builds

.circleci/config.yml

@@ -172,7 +172,6 @@ workflows:
           requires:
             - prep-deps
       - prep-build-test-flask-mv2:
-          <<: *develop_master_rc_only
           requires:
             - prep-deps
       - prep-build-test-mmi:
@@ -200,7 +199,6 @@ workflows:
           requires:
             - prep-deps
       - test-e2e-chrome-webpack:
-          <<: *develop_master_rc_only
           requires:
             - prep-build-test-webpack
             - get-changed-files-with-git-diff
@@ -209,7 +207,6 @@ workflows:
             - prep-build-test
             - get-changed-files-with-git-diff
       - test-e2e-firefox:
-          <<: *develop_master_rc_only
           requires:
             - prep-build-test-mv2
             - get-changed-files-with-git-diff
@@ -229,7 +226,6 @@ workflows:
             - prep-build-test-flask
             - get-changed-files-with-git-diff
       - test-e2e-firefox-flask:
-          <<: *develop_master_rc_only
           requires:
             - prep-build-test-flask-mv2
       - test-e2e-chrome-mmi:

app/scripts/migrations/132.test.ts

@@ -0,0 +1,73 @@
+import { migrate, version } from './132';
+
+const oldVersion = 131;
+
+describe('migration #132', () => {
+  it('updates the version metadata', async () => {
+    const oldStorage = {
+      meta: { version: oldVersion },
+      data: {},
+    };
+
+    const newStorage = await migrate(oldStorage);
+
+    expect(newStorage.meta).toStrictEqual({ version });
+  });
+
+  it('does nothing if no preferences controller state is set', async () => {
+    const oldState = {
+      OtherController: {},
+    };
+
+    const transformedState = await migrate({
+      meta: { version: oldVersion },
+      data: oldState,
+    });
+
+    expect(transformedState.data).toEqual(oldState);
+  });
+
+  it('adds preferences property to the controller if it is not set and set the preference to true if migration runs', async () => {
+    const oldState = { PreferencesController: {} };
+
+    const expectedState = {
+      PreferencesController: {
+        preferences: {
+          redesignedTransactionsEnabled: true,
+        },
+      },
+    };
+
+    const transformedState = await migrate({
+      meta: { version: oldVersion },
+      data: oldState,
+    });
+
+    expect(transformedState.data).toEqual(expectedState);
+  });
+
+  it('changes property to true if migration runs', async () => {
+    const oldState = {
+      PreferencesController: {
+        preferences: {
+          redesignedTransactionsEnabled: false,
+        },
+      },
+    };
+
+    const expectedState = {
+      PreferencesController: {
+        preferences: {
+          redesignedTransactionsEnabled: true,
+        },
+      },
+    };
+
+    const transformedState = await migrate({
+      meta: { version: oldVersion },
+      data: oldState,
+    });
+
+    expect(transformedState.data).toEqual(expectedState);
+  });
+});

app/scripts/migrations/132.ts

@@ -0,0 +1,58 @@
+import { isObject } from '@metamask/utils';
+import { cloneDeep } from 'lodash';
+
+type VersionedData = {
+  meta: { version: number };
+  data: Record<string, unknown>;
+};
+
+export const version = 132;
+
+/**
+ * This migration sets `redesignedTransactionsEnabled` as true by default in preferences in PreferencesController.
+ *
+ * @param originalVersionedData - Versioned MetaMask extension state, exactly what we persist to dist.
+ * @param originalVersionedData.meta - State metadata.
+ * @param originalVersionedData.meta.version - The current state version.
+ * @param originalVersionedData.data - The persisted MetaMask state, keyed by controller.
+ * @returns Updated versioned MetaMask extension state.
+ */
+export async function migrate(
+  originalVersionedData: VersionedData,
+): Promise<VersionedData> {
+  const versionedData = cloneDeep(originalVersionedData);
+  versionedData.meta.version = version;
+  transformState(versionedData.data);
+  return versionedData;
+}
+
+function transformState(
+  state: Record<string, unknown>,
+): Record<string, unknown> {
+  if (!isObject(state?.PreferencesController)) {
+    return state;
+  }
+
+  if (!isObject(state.PreferencesController?.preferences)) {
+    state.PreferencesController = {
+      ...state.PreferencesController,
+      preferences: {},
+    };
+  }
+
+  const preferencesControllerState = state.PreferencesController as Record<
+    string,
+    unknown
+  >;
+
+  const preferences = preferencesControllerState.preferences as Record<
+    string,
+    unknown
+  >;
+
+  // `redesignedTransactionsEnabled` was previously set to `false` by
+  // default in `124.ts`
+  preferences.redesignedTransactionsEnabled = true;
+
+  return state;
+}

app/scripts/migrations/index.js

@@ -152,6 +152,7 @@ const migrations = [
   require('./129'),
   require('./130'),
   require('./131'),
+  require('./132'),
 ];
 
 export default migrations;

test/e2e/helpers.js

@@ -860,6 +860,46 @@ async function tempToggleSettingRedesignedConfirmations(driver) {
   );
 }
 
+/**
+ * Rather than using the FixtureBuilder#withPreferencesController to set the setting
+ * we need to manually set the setting because the migration #132 overrides this.
+ * We should be able to remove this when we delete the redesignedTransactionsEnabled setting.
+ *
+ * @param driver
+ */
+async function tempToggleSettingRedesignedTransactionConfirmations(driver) {
+  // Ensure we are on the extension window
+  await driver.switchToWindowWithTitle(WINDOW_TITLES.ExtensionInFullScreenView);
+
+  // Open settings menu button
+  await driver.clickElement('[data-testid="account-options-menu-button"]');
+
+  // fix race condition with mmi build
+  if (process.env.MMI) {
+    await driver.waitForSelector('[data-testid="global-menu-mmi-portfolio"]');
+  }
+
+  // Click settings from dropdown menu
+  await driver.clickElement('[data-testid="global-menu-settings"]');
+
+  // Click Experimental tab
+  const experimentalTabRawLocator = {
+    text: 'Experimental',
+    tag: 'div',
+  };
+  await driver.clickElement(experimentalTabRawLocator);
+
+  // Click redesigned transactions toggle
+  await driver.clickElement(
+    '[data-testid="toggle-redesigned-transactions-container"]',
+  );
+
+  // Close settings page
+  await driver.clickElement(
+    '.settings-page__header__title-container__close-button',
+  );
+}
+
 /**
  * Opens the account options menu safely, handling potential race conditions
  * with the MMI build.
@@ -928,6 +968,7 @@ module.exports = {
   editGasFeeForm,
   clickNestedButton,
   tempToggleSettingRedesignedConfirmations,
+  tempToggleSettingRedesignedTransactionConfirmations,
   openMenuSafe,
   sentryRegEx,
 };

test/e2e/json-rpc/eth_sendTransaction.spec.js

@@ -4,6 +4,7 @@ const {
   unlockWallet,
   WINDOW_TITLES,
   generateGanacheOptions,
+  tempToggleSettingRedesignedTransactionConfirmations,
 } = require('../helpers');
 const FixtureBuilder = require('../fixture-builder');
 
@@ -68,6 +69,8 @@ describe('eth_sendTransaction', function () {
       async ({ driver }) => {
         await unlockWallet(driver);
 
+        await tempToggleSettingRedesignedTransactionConfirmations(driver);
+
         // eth_sendTransaction
         await driver.openNewPage(`http://127.0.0.1:8080`);
         const request = JSON.stringify({