chore: centralize redesigned confirmation decision logic

app/scripts/lib/createRPCMethodTrackingMiddleware.js

@@ -27,7 +27,7 @@ import {
 } from '../../../ui/helpers/utils/metrics';
 // TODO: Remove restricted import
 // eslint-disable-next-line import/no-restricted-paths
-import { REDESIGN_APPROVAL_TYPES } from '../../../ui/pages/confirmations/utils/confirm';
+import { shouldUseRedesignForSignatures } from '../../../shared/lib/confirmation.utils';
 import { getSnapAndHardwareInfoForMetrics } from './snap-keyring/metrics';
 
 /**
@@ -196,6 +196,7 @@ function finalizeSignatureFragment(
  * @param {Function} opts.getAccountType
  * @param {Function} opts.getDeviceModel
  * @param {Function} opts.isConfirmationRedesignEnabled
+ * @param {Function} opts.isRedesignedConfirmationsDeveloperEnabled
  * @param {RestrictedControllerMessenger} opts.snapAndHardwareMessenger
  * @param {number} [opts.globalRateLimitTimeout] - time, in milliseconds, of the sliding
  * time window that should limit the number of method calls tracked to globalRateLimitMaxAmount.
@@ -214,6 +215,7 @@ export default function createRPCMethodTrackingMiddleware({
   getAccountType,
   getDeviceModel,
   isConfirmationRedesignEnabled,
+  isRedesignedConfirmationsDeveloperEnabled,
   snapAndHardwareMessenger,
   appStateController,
   metaMetricsController,
@@ -315,13 +317,15 @@ export default function createRPCMethodTrackingMiddleware({
             req.securityAlertResponse.description;
         }
 
-        const isConfirmationRedesign =
-          isConfirmationRedesignEnabled() &&
-          REDESIGN_APPROVAL_TYPES.find(
-            (type) => type === MESSAGE_TYPE_TO_APPROVAL_TYPE[method],
-          );
-
-        if (isConfirmationRedesign) {
+        if (
+          shouldUseRedesignForSignatures({
+            approvalType: MESSAGE_TYPE_TO_APPROVAL_TYPE[method],
+            isRedesignedSignaturesUserSettingEnabled:
+              isConfirmationRedesignEnabled(),
+            isRedesignedConfirmationsDeveloperEnabled:
+              isRedesignedConfirmationsDeveloperEnabled(),
+          })
+        ) {
           eventProperties.ui_customizations = [
             ...(eventProperties.ui_customizations || []),
             MetaMetricsEventUiCustomization.RedesignedConfirmation,

app/scripts/lib/createRPCMethodTrackingMiddleware.test.js

@@ -118,6 +118,7 @@ const createHandler = (opts) =>
     appStateController,
     metaMetricsController,
     isConfirmationRedesignEnabled: () => false,
+    isRedesignedConfirmationsDeveloperEnabled: () => false,
     ...opts,
   });
 
@@ -217,10 +218,22 @@ describe('createRPCMethodTrackingMiddleware', () => {
   });
 
   describe('participateInMetaMetrics is set to true', () => {
+    const originalEnableConfirmationRedesign =
+      process.env.ENABLE_CONFIRMATION_REDESIGN;
+
     beforeEach(() => {
       metaMetricsController.setParticipateInMetaMetrics(true);
     });
 
+    beforeAll(() => {
+      process.env.ENABLE_CONFIRMATION_REDESIGN = 'false';
+    });
+
+    afterAll(() => {
+      process.env.ENABLE_CONFIRMATION_REDESIGN =
+        originalEnableConfirmationRedesign;
+    });
+
     it(`should immediately track a ${MetaMetricsEventName.SignatureRequested} event`, async () => {
       const req = {
         id: MOCK_ID,

app/scripts/lib/transaction/metrics.ts

@@ -43,16 +43,12 @@ import {
   // TODO: Remove restricted import
   // eslint-disable-next-line import/no-restricted-paths
 } from '../../../../ui/helpers/utils/metrics';
-import {
-  REDESIGN_DEV_TRANSACTION_TYPES,
-  REDESIGN_USER_TRANSACTION_TYPES,
-  // TODO: Remove restricted import
-  // eslint-disable-next-line import/no-restricted-paths
-} from '../../../../ui/pages/confirmations/utils';
+
 import {
   getSnapAndHardwareInfoForMetrics,
   type SnapAndHardwareMessenger,
 } from '../snap-keyring/metrics';
+import { shouldUseRedesignForTransactions } from '../../../../shared/lib/confirmation.utils';
 
 export type TransactionMetricsRequest = {
   createEventFragment: (
@@ -996,23 +992,15 @@ async function buildEventFragmentProperties({
   if (simulationFails) {
     uiCustomizations.push(MetaMetricsEventUiCustomization.GasEstimationFailed);
   }
-  const isRedesignedConfirmationsDeveloperSettingEnabled =
-    transactionMetricsRequest.getIsRedesignedConfirmationsDeveloperEnabled() ||
-    process.env.ENABLE_CONFIRMATION_REDESIGN === 'true';
 
-  const isRedesignedTransactionsUserSettingEnabled =
-    transactionMetricsRequest.getRedesignedTransactionsEnabled();
-
-  if (
-    (isRedesignedConfirmationsDeveloperSettingEnabled &&
-      REDESIGN_DEV_TRANSACTION_TYPES.includes(
-        transactionMeta.type as TransactionType,
-      )) ||
-    (isRedesignedTransactionsUserSettingEnabled &&
-      REDESIGN_USER_TRANSACTION_TYPES.includes(
-        transactionMeta.type as TransactionType,
-      ))
-  ) {
+  const isRedesignedForTransaction = shouldUseRedesignForTransactions({
+    transactionMetadataType: transactionMeta.type as TransactionType,
+    isRedesignedTransactionsUserSettingEnabled:
+      transactionMetricsRequest.getRedesignedTransactionsEnabled(),
+    isRedesignedConfirmationsDeveloperEnabled:
+      transactionMetricsRequest.getIsRedesignedConfirmationsDeveloperEnabled(),
+  });
+  if (isRedesignedForTransaction) {
     uiCustomizations.push(
       MetaMetricsEventUiCustomization.RedesignedConfirmation,
     );

app/scripts/metamask-controller.js

@@ -5789,16 +5789,14 @@ export default class MetamaskController extends EventEmitter {
       ),
     );
 
-    const isConfirmationRedesignEnabled = () => {
-      return this.preferencesController.state.preferences
-        .redesignedConfirmationsEnabled;
-    };
-
     engine.push(
       createRPCMethodTrackingMiddleware({
         getAccountType: this.getAccountType.bind(this),
         getDeviceModel: this.getDeviceModel.bind(this),
-        isConfirmationRedesignEnabled,
+        isConfirmationRedesignEnabled:
+          this.isConfirmationRedesignEnabled.bind(this),
+        isRedesignedConfirmationsDeveloperEnabled:
+          this.isConfirmationRedesignDeveloperEnabled.bind(this),
         snapAndHardwareMessenger: this.controllerMessenger.getRestricted({
           name: 'SnapAndHardwareMessenger',
           allowedActions: [
@@ -6436,6 +6434,21 @@ export default class MetamaskController extends EventEmitter {
     });
   }
 
+  isConfirmationRedesignEnabled() {
+    return this.preferencesController.state.preferences
+      .redesignedConfirmationsEnabled;
+  }
+
+  isTransactionsRedesignEnabled() {
+    return this.preferencesController.state.preferences
+      .redesignedTransactionsEnabled;
+  }
+
+  isConfirmationRedesignDeveloperEnabled() {
+    return this.preferencesController.state.preferences
+      .isRedesignedConfirmationsDeveloperEnabled;
+  }
+
   /**
    * The chain list is fetched live at runtime, falling back to a cache.
    * This preseeds the cache at startup with a static list provided at build.
@@ -6620,14 +6633,10 @@ export default class MetamaskController extends EventEmitter {
           txHash,
         );
       },
-      getRedesignedConfirmationsEnabled: () => {
-        return this.preferencesController.state.preferences
-          .redesignedConfirmationsEnabled;
-      },
-      getRedesignedTransactionsEnabled: () => {
-        return this.preferencesController.state.preferences
-          .redesignedTransactionsEnabled;
-      },
+      getRedesignedConfirmationsEnabled:
+        this.isConfirmationRedesignEnabled.bind(this),
+      getRedesignedTransactionsEnabled:
+        this.isTransactionsRedesignEnabled.bind(this),
       getMethodData: (data) => {
         if (!data) {
           return null;
@@ -6645,10 +6654,8 @@ export default class MetamaskController extends EventEmitter {
           this.provider,
         );
       },
-      getIsRedesignedConfirmationsDeveloperEnabled: () => {
-        return this.preferencesController.state.preferences
-          .isRedesignedConfirmationsDeveloperEnabled;
-      },
+      getIsRedesignedConfirmationsDeveloperEnabled:
+        this.isConfirmationRedesignDeveloperEnabled.bind(this),
       getIsConfirmationAdvancedDetailsOpen: () => {
         return this.preferencesController.state.preferences
           .showConfirmationAdvancedDetails;