Enable ppom by default

app/scripts/controllers/preferences.js

@@ -65,7 +65,7 @@ export default class PreferencesController {
       useRequestQueue: false,
       openSeaEnabled: false,
       ///: BEGIN:ONLY_INCLUDE_IF(blockaid)
-      securityAlertsEnabled: false,
+      securityAlertsEnabled: true,
       ///: END:ONLY_INCLUDE_IF
       ///: BEGIN:ONLY_INCLUDE_IF(keyring-snaps)
       addSnapAccountEnabled: false,

app/scripts/migrations/106.js

@@ -0,0 +1,30 @@
+import { cloneDeep } from 'lodash';
+
+export const version = 106;
+
+/**
+ * This migration set preference securityAlertsEnabled to true.
+ *
+ * @param originalVersionedData - Versioned MetaMask extension state, exactly what we persist to dist.
+ */
+export async function migrate(originalVersionedData) {
+  const versionedData = cloneDeep(originalVersionedData);
+  versionedData.meta.version = version;
+  const state = versionedData.data;
+  const newState = transformState(state);
+  versionedData.data = newState;
+  return versionedData;
+}
+
+function transformState(state) {
+  const PreferencesController = state?.PreferencesController || {};
+
+  return {
+    ...state,
+    PreferencesController: {
+      ...PreferencesController,
+      securityAlertsEnabled:
+        PreferencesController.transactionSecurityCheckEnabled !== true,
+    },
+  };
+}

app/scripts/migrations/106.test.js

@@ -0,0 +1,135 @@
+import { migrate } from './106';
+
+describe('migration #106', () => {
+  it('should update the version metadata', async () => {
+    const oldStorage = {
+      meta: {
+        version: 105,
+      },
+      data: {},
+    };
+
+    const newStorage = await migrate(oldStorage);
+    expect(newStorage.meta).toStrictEqual({
+      version: 106,
+    });
+  });
+
+  it('should set securityAlertsEnabled to true in PreferencesController', async () => {
+    const oldStorage = {
+      meta: {
+        version: 105,
+      },
+      data: {
+        PreferencesController: {
+          securityAlertsEnabled: false,
+        },
+      },
+    };
+
+    const newStorage = await migrate(oldStorage);
+    expect(newStorage).toStrictEqual({
+      meta: {
+        version: 106,
+      },
+      data: {
+        PreferencesController: {
+          securityAlertsEnabled: true,
+        },
+      },
+    });
+  });
+
+  it('should not set securityAlertsEnabled to true in PreferencesController if transactionSecurityCheckEnabled is set to true', async () => {
+    const oldStorage = {
+      meta: {
+        version: 105,
+      },
+      data: {
+        PreferencesController: {
+          securityAlertsEnabled: false,
+          transactionSecurityCheckEnabled: true,
+        },
+      },
+    };
+
+    const newStorage = await migrate(oldStorage);
+    expect(newStorage).toStrictEqual({
+      meta: {
+        version: 106,
+      },
+      data: {
+        PreferencesController: {
+          securityAlertsEnabled: false,
+          transactionSecurityCheckEnabled: true,
+        },
+      },
+    });
+  });
+
+  it('should preserve other PreferencesController state', async () => {
+    const oldStorage = {
+      meta: {
+        version: 105,
+      },
+      data: {
+        PreferencesController: {
+          currentLocale: 'en',
+          dismissSeedBackUpReminder: false,
+          ipfsGateway: 'dweb.link',
+          securityAlertsEnabled: false,
+          openSeaEnabled: false,
+          useTokenDetection: false,
+        },
+      },
+    };
+
+    const newStorage = await migrate(oldStorage);
+    expect(newStorage).toStrictEqual({
+      meta: {
+        version: 106,
+      },
+      data: {
+        PreferencesController: {
+          currentLocale: 'en',
+          dismissSeedBackUpReminder: false,
+          ipfsGateway: 'dweb.link',
+          securityAlertsEnabled: true,
+          openSeaEnabled: false,
+          useTokenDetection: false,
+        },
+      },
+    });
+  });
+
+  it('should not change state in controllers other than PreferencesController', async () => {
+    const oldStorage = {
+      meta: {
+        version: 105,
+      },
+      data: {
+        PreferencesController: {
+          securityAlertsEnabled: false,
+        },
+        data: {
+          FooController: { a: 'b' },
+        },
+      },
+    };
+
+    const newStorage = await migrate(oldStorage);
+    expect(newStorage).toStrictEqual({
+      meta: {
+        version: 106,
+      },
+      data: {
+        PreferencesController: {
+          securityAlertsEnabled: true,
+        },
+        data: {
+          FooController: { a: 'b' },
+        },
+      },
+    });
+  });
+});

app/scripts/migrations/index.js

@@ -116,6 +116,7 @@ const migrations = [
   require('./103'),
   require('./104'),
   require('./105'),
+  require('./106'),
 ];
 
 export default migrations;

test/e2e/tests/ppom-toggle-settings.spec.js

@@ -23,6 +23,14 @@ describe('PPOM Settings @no-mmi', function () {
       async ({ driver }) => {
         await unlockWallet(driver);
 
+        await driver.clickElement(
+          '[data-testid="account-options-menu-button"]',
+        );
+
+        await driver.clickElement({ text: 'Settings', tag: 'div' });
+        await driver.clickElement({ text: 'Experimental', tag: 'div' });
+        await driver.clickElement('label.toggle-button');
+
         await openDapp(driver);
         await driver.clickElement('#maliciousPermit');
         const windowHandles = await getWindowHandles(driver, 3);
@@ -51,13 +59,6 @@ describe('PPOM Settings @no-mmi', function () {
         await driver.navigate();
         await unlockWallet(driver);
 
-        await driver.clickElement(
-          '[data-testid="account-options-menu-button"]',
-        );
-
-        await driver.clickElement({ text: 'Settings', tag: 'div' });
-        await driver.clickElement({ text: 'Experimental', tag: 'div' });
-
         await driver.clickElement(
           '[data-testid="settings-toggle-security-alert-blockaid"] .toggle-button > div',
         );