feat: Remove 'Improved transactions requests' toggle

app/scripts/constants/sentry-state.ts

@@ -249,7 +249,6 @@ export const SENTRY_BACKGROUND_STATE = {
       autoLockTimeLimit: true,
       hideZeroBalanceTokens: true,
       redesignedConfirmationsEnabled: true,
-      redesignedTransactionsEnabled: false,
       isRedesignedConfirmationsDeveloperEnabled: false,
       showExtensionInFullSizeView: true,
       showFiatInTestnets: true,

app/scripts/controllers/preferences-controller.test.ts

@@ -726,7 +726,6 @@ describe('preferences controller', () => {
         hideZeroBalanceTokens: false,
         petnamesEnabled: true,
         redesignedConfirmationsEnabled: true,
-        redesignedTransactionsEnabled: true,
         shouldShowAggregatedBalancePopover: true,
         featureNotificationsEnabled: false,
         isRedesignedConfirmationsDeveloperEnabled: false,
@@ -757,7 +756,6 @@ describe('preferences controller', () => {
         petnamesEnabled: true,
         privacyMode: false,
         redesignedConfirmationsEnabled: true,
-        redesignedTransactionsEnabled: true,
         shouldShowAggregatedBalancePopover: true,
         featureNotificationsEnabled: false,
         isRedesignedConfirmationsDeveloperEnabled: false,

app/scripts/controllers/preferences-controller.ts

@@ -110,7 +110,6 @@ export type Preferences = {
   hideZeroBalanceTokens: boolean;
   petnamesEnabled: boolean;
   redesignedConfirmationsEnabled: boolean;
-  redesignedTransactionsEnabled: boolean;
   featureNotificationsEnabled: boolean;
   showMultiRpcModal: boolean;
   privacyMode: boolean;
@@ -223,7 +222,6 @@ export const getDefaultPreferencesControllerState =
       hideZeroBalanceTokens: false,
       petnamesEnabled: true,
       redesignedConfirmationsEnabled: true,
-      redesignedTransactionsEnabled: true,
       featureNotificationsEnabled: false,
       isRedesignedConfirmationsDeveloperEnabled: false,
       showConfirmationAdvancedDetails: false,

app/scripts/lib/transaction/metrics.test.ts

@@ -74,7 +74,6 @@ const mockTransactionMetricsRequest = {
   trackEvent: jest.fn(),
   getIsSmartTransaction: jest.fn(),
   getSmartTransactionByMinedTxHash: jest.fn(),
-  getRedesignedTransactionsEnabled: jest.fn(),
   getMethodData: jest.fn(),
   getIsRedesignedConfirmationsDeveloperEnabled: jest.fn(),
   getIsConfirmationAdvancedDetailsOpen: jest.fn(),

app/scripts/lib/transaction/metrics.ts

@@ -101,7 +101,6 @@ export type TransactionMetricsRequest = {
   getSmartTransactionByMinedTxHash: (
     txhash: string | undefined,
   ) => SmartTransaction;
-  getRedesignedTransactionsEnabled: () => boolean;
   getMethodData: (data: string) => Promise<{ name: string }>;
   getIsRedesignedConfirmationsDeveloperEnabled: () => boolean;
   getIsConfirmationAdvancedDetailsOpen: () => boolean;
@@ -1015,8 +1014,6 @@ async function buildEventFragmentProperties({
 
   const isRedesignedForTransaction = shouldUseRedesignForTransactions({
     transactionMetadataType: transactionMeta.type as TransactionType,
-    isRedesignedTransactionsUserSettingEnabled:
-      transactionMetricsRequest.getRedesignedTransactionsEnabled(),
     isRedesignedConfirmationsDeveloperEnabled:
       transactionMetricsRequest.getIsRedesignedConfirmationsDeveloperEnabled(),
   });

app/scripts/metamask-controller.js

@@ -6663,11 +6663,6 @@ export default class MetamaskController extends EventEmitter {
       .redesignedConfirmationsEnabled;
   }
 
-  isTransactionsRedesignEnabled() {
-    return this.preferencesController.state.preferences
-      .redesignedTransactionsEnabled;
-  }
-
   isConfirmationRedesignDeveloperEnabled() {
     return this.preferencesController.state.preferences
       .isRedesignedConfirmationsDeveloperEnabled;
@@ -6859,8 +6854,6 @@ export default class MetamaskController extends EventEmitter {
       },
       getRedesignedConfirmationsEnabled:
         this.isConfirmationRedesignEnabled.bind(this),
-      getRedesignedTransactionsEnabled:
-        this.isTransactionsRedesignEnabled.bind(this),
       getMethodData: (data) => {
         if (!data) {
           return null;

app/scripts/migrations/137.test.ts

@@ -0,0 +1,71 @@
+import { migrate, version } from './137';
+
+const oldVersion = 136;
+
+describe(`migration #${version}`, () => {
+  it('updates the version metadata', async () => {
+    const oldStorage = {
+      meta: { version: oldVersion },
+      data: {},
+    };
+    const newStorage = await migrate(oldStorage);
+    expect(newStorage.meta).toStrictEqual({ version });
+  });
+
+  describe(`migration #${version}`, () => {
+    it('removes the redesignedTransactionsEnabled preference if it is set to true', async () => {
+      const oldStorage = {
+        meta: { version: oldVersion },
+        data: {
+          PreferencesController: {
+            redesignedTransactionsEnabled: true,
+          },
+        },
+      };
+      const expectedData = {
+        PreferencesController: {},
+      };
+      const newStorage = await migrate(oldStorage);
+
+      expect(newStorage.data).toStrictEqual(expectedData);
+    });
+
+    it('removes the redesignedTransactionsEnabled preference if it is set to false', async () => {
+      const oldStorage = {
+        meta: { version: oldVersion },
+        data: {
+          PreferencesController: {
+            redesignedTransactionsEnabled: false,
+          },
+        },
+      };
+      const expectedData = {
+        PreferencesController: {},
+      };
+      const newStorage = await migrate(oldStorage);
+
+      expect(newStorage.data).toStrictEqual(expectedData);
+    });
+
+    it('does nothing to other PreferencesController state if there is not a redesignedTransactionsEnabled preference', async () => {
+      const oldStorage = {
+        meta: { version: oldVersion },
+        data: {
+          PreferencesController: {
+            existingPreference: true,
+          },
+        },
+      };
+
+      const expectedData = {
+        PreferencesController: {
+          existingPreference: true,
+        },
+      };
+
+      const newStorage = await migrate(oldStorage);
+
+      expect(newStorage.data).toStrictEqual(expectedData);
+    });
+  });
+});

app/scripts/migrations/137.ts

@@ -0,0 +1,44 @@
+import { cloneDeep } from 'lodash';
+
+type VersionedData = {
+  meta: { version: number };
+  data: Record<string, unknown>;
+};
+
+export const version = 137;
+
+/**
+ * This migration deletes the preference `redesignedTransactionsEnabled` if the
+ * user has existing data.
+ *
+ * @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>): void {
+  const preferencesControllerState = state?.PreferencesController as
+    | Record<string, unknown>
+    | undefined;
+
+  const preferences = preferencesControllerState?.preferences as
+    | Record<string, unknown>
+    | undefined;
+
+  if (preferences && preferences.redesignedTransactionsEnabled) {
+    // Existing MetaMask users will have the option off by default
+    delete preferences.redesignedTransactionsEnabled;
+  }
+}

app/scripts/migrations/index.js

@@ -160,6 +160,7 @@ const migrations = [
   require('./134'),
   require('./135'),
   require('./136'),
+  require('./137'),
 ];
 
 export default migrations;