feat: Remove 'Improved signature requests' setting toggle

app/scripts/constants/sentry-state.ts

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

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

@@ -725,7 +725,6 @@ describe('preferences controller', () => {
         useNativeCurrencyAsPrimaryCurrency: true,
         hideZeroBalanceTokens: false,
         petnamesEnabled: true,
-        redesignedConfirmationsEnabled: true,
         shouldShowAggregatedBalancePopover: true,
         featureNotificationsEnabled: false,
         isRedesignedConfirmationsDeveloperEnabled: false,
@@ -755,7 +754,6 @@ describe('preferences controller', () => {
         hideZeroBalanceTokens: false,
         petnamesEnabled: true,
         privacyMode: false,
-        redesignedConfirmationsEnabled: true,
         shouldShowAggregatedBalancePopover: true,
         featureNotificationsEnabled: false,
         isRedesignedConfirmationsDeveloperEnabled: false,

app/scripts/controllers/preferences-controller.ts

@@ -109,7 +109,6 @@ export type Preferences = {
   useNativeCurrencyAsPrimaryCurrency: boolean;
   hideZeroBalanceTokens: boolean;
   petnamesEnabled: boolean;
-  redesignedConfirmationsEnabled: boolean;
   featureNotificationsEnabled: boolean;
   showMultiRpcModal: boolean;
   privacyMode: boolean;
@@ -221,7 +220,6 @@ export const getDefaultPreferencesControllerState =
       useNativeCurrencyAsPrimaryCurrency: true,
       hideZeroBalanceTokens: false,
       petnamesEnabled: true,
-      redesignedConfirmationsEnabled: true,
       featureNotificationsEnabled: false,
       isRedesignedConfirmationsDeveloperEnabled: false,
       showConfirmationAdvancedDetails: false,

app/scripts/fixtures/with-preferences.js

@@ -7,7 +7,6 @@ export const FIXTURES_PREFERENCES = {
     smartTransactionsOptInStatus: true,
     useNativeCurrencyAsPrimaryCurrency: true,
     petnamesEnabled: true,
-    redesignedConfirmationsEnabled: true,
     featureNotificationsEnabled: true,
     showTokenAutodetectModal: false,
     showNftAutodetectModal: false,

app/scripts/lib/createRPCMethodTrackingMiddleware.js

@@ -195,7 +195,6 @@ function finalizeSignatureFragment(
  *  that should be tracked for methods rate limited by random sample.
  * @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
@@ -214,7 +213,6 @@ export default function createRPCMethodTrackingMiddleware({
   globalRateLimitMaxAmount = 10, // max of events in the globalRateLimitTimeout window. pass 0 for no global rate limit
   getAccountType,
   getDeviceModel,
-  isConfirmationRedesignEnabled,
   isRedesignedConfirmationsDeveloperEnabled,
   snapAndHardwareMessenger,
   appStateController,
@@ -320,8 +318,6 @@ export default function createRPCMethodTrackingMiddleware({
         if (
           shouldUseRedesignForSignatures({
             approvalType: MESSAGE_TYPE_TO_APPROVAL_TYPE[method],
-            isRedesignedSignaturesUserSettingEnabled:
-              isConfirmationRedesignEnabled(),
             isRedesignedConfirmationsDeveloperEnabled:
               isRedesignedConfirmationsDeveloperEnabled(),
           })

app/scripts/lib/createRPCMethodTrackingMiddleware.test.js

@@ -113,7 +113,6 @@ const createHandler = (opts) =>
     globalRateLimitMaxAmount: 0,
     appStateController,
     metaMetricsController,
-    isConfirmationRedesignEnabled: () => false,
     isRedesignedConfirmationsDeveloperEnabled: () => false,
     ...opts,
   });
@@ -335,6 +334,9 @@ describe('createRPCMethodTrackingMiddleware', () => {
           security_alert_reason: BlockaidReason.maliciousDomain,
           ppom_eth_call_count: 5,
           ppom_eth_getCode_count: 3,
+          ui_customizations: [
+            MetaMetricsEventUiCustomization.RedesignedConfirmation,
+          ],
         },
         referrer: { url: 'some.dapp' },
         uniqueIdentifier: expectedUniqueIdentifier,
@@ -600,38 +602,6 @@ describe('createRPCMethodTrackingMiddleware', () => {
       });
     });
 
-    it('should track Confirmation Redesign through ui_customizations prop if enabled', async () => {
-      const req = {
-        id: MOCK_ID,
-        method: MESSAGE_TYPE.PERSONAL_SIGN,
-        origin: 'some.dapp',
-      };
-      const res = {
-        error: null,
-      };
-      const { next, executeMiddlewareStack } = getNext();
-      const handler = createHandler({
-        isConfirmationRedesignEnabled: () => true,
-      });
-
-      await handler(req, res, next);
-      await executeMiddlewareStack();
-
-      expect(trackEventSpy).toHaveBeenCalledTimes(2);
-
-      expect(trackEventSpy.mock.calls[1][0]).toMatchObject({
-        category: MetaMetricsEventCategory.InpageProvider,
-        event: MetaMetricsEventName.SignatureApproved,
-        properties: {
-          signature_type: MESSAGE_TYPE.PERSONAL_SIGN,
-          ui_customizations: [
-            MetaMetricsEventUiCustomization.RedesignedConfirmation,
-          ],
-        },
-        referrer: { url: 'some.dapp' },
-      });
-    });
-
     it('should not track Confirmation Redesign through ui_customizations prop if not enabled', async () => {
       const req = {
         id: MOCK_ID,
@@ -685,7 +655,10 @@ describe('createRPCMethodTrackingMiddleware', () => {
         event: MetaMetricsEventName.SignatureApproved,
         properties: {
           signature_type: MESSAGE_TYPE.PERSONAL_SIGN,
-          ui_customizations: [MetaMetricsEventUiCustomization.Siwe],
+          ui_customizations: [
+            MetaMetricsEventUiCustomization.RedesignedConfirmation,
+            MetaMetricsEventUiCustomization.Siwe,
+          ],
         },
         referrer: { url: 'some.dapp' },
       });
@@ -745,7 +718,10 @@ describe('createRPCMethodTrackingMiddleware', () => {
         event: MetaMetricsEventName.SignatureApproved,
         properties: {
           signature_type: MESSAGE_TYPE.ETH_SIGN_TYPED_DATA_V4,
-          ui_customizations: [MetaMetricsEventUiCustomization.Permit],
+          ui_customizations: [
+            MetaMetricsEventUiCustomization.RedesignedConfirmation,
+            MetaMetricsEventUiCustomization.Permit,
+          ],
           eip712_primary_type: 'Permit',
         },
         referrer: { url: 'some.dapp' },
@@ -800,7 +776,10 @@ describe('createRPCMethodTrackingMiddleware', () => {
         event: MetaMetricsEventName.SignatureApproved,
         properties: {
           signature_type: MESSAGE_TYPE.ETH_SIGN_TYPED_DATA_V4,
-          ui_customizations: [MetaMetricsEventUiCustomization.Order],
+          ui_customizations: [
+            MetaMetricsEventUiCustomization.RedesignedConfirmation,
+            MetaMetricsEventUiCustomization.Order,
+          ],
         },
         referrer: { url: 'some.dapp' },
       });
@@ -832,13 +811,12 @@ describe('createRPCMethodTrackingMiddleware', () => {
         properties: {
           signature_type: MESSAGE_TYPE.ETH_SIGN_TYPED_DATA_V4,
           eip712_primary_type: 'Unknown',
+          ui_customizations: [
+            MetaMetricsEventUiCustomization.RedesignedConfirmation,
+          ],
         },
         referrer: { url: 'some.dapp' },
       });
-
-      expect(trackEventSpy.mock.calls[1][0].properties).not.toHaveProperty(
-        'ui_customizations',
-      );
     });
 
     describe('when request is flagged as safe by security provider', () => {