Skip to content

Commit 36b0381

Browse files
feat: Remove 'Improved signature requests' setting toggle
1 parent bb9250d commit 36b0381

File tree

72 files changed

+1177
-2277
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+1177
-2277
lines changed

app/_locales/de/messages.json

-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/_locales/el/messages.json

-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/_locales/en/messages.json

-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/_locales/en_GB/messages.json

-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/_locales/es/messages.json

-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/_locales/fr/messages.json

-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/_locales/hi/messages.json

-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/_locales/id/messages.json

-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/_locales/ja/messages.json

-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/_locales/ko/messages.json

-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/_locales/pt/messages.json

-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/_locales/ru/messages.json

-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/_locales/tl/messages.json

-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/_locales/tr/messages.json

-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/_locales/vi/messages.json

-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/_locales/zh_CN/messages.json

-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/scripts/constants/sentry-state.ts

-1
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,6 @@ export const SENTRY_BACKGROUND_STATE = {
245245
preferences: {
246246
autoLockTimeLimit: true,
247247
hideZeroBalanceTokens: true,
248-
redesignedConfirmationsEnabled: true,
249248
isRedesignedConfirmationsDeveloperEnabled: false,
250249
showExtensionInFullSizeView: true,
251250
showFiatInTestnets: true,

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

-2
Original file line numberDiff line numberDiff line change
@@ -725,7 +725,6 @@ describe('preferences controller', () => {
725725
useNativeCurrencyAsPrimaryCurrency: true,
726726
hideZeroBalanceTokens: false,
727727
petnamesEnabled: true,
728-
redesignedConfirmationsEnabled: true,
729728
shouldShowAggregatedBalancePopover: true,
730729
featureNotificationsEnabled: false,
731730
isRedesignedConfirmationsDeveloperEnabled: false,
@@ -755,7 +754,6 @@ describe('preferences controller', () => {
755754
hideZeroBalanceTokens: false,
756755
petnamesEnabled: true,
757756
privacyMode: false,
758-
redesignedConfirmationsEnabled: true,
759757
shouldShowAggregatedBalancePopover: true,
760758
featureNotificationsEnabled: false,
761759
isRedesignedConfirmationsDeveloperEnabled: false,

app/scripts/controllers/preferences-controller.ts

-2
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,6 @@ export type Preferences = {
109109
useNativeCurrencyAsPrimaryCurrency: boolean;
110110
hideZeroBalanceTokens: boolean;
111111
petnamesEnabled: boolean;
112-
redesignedConfirmationsEnabled: boolean;
113112
featureNotificationsEnabled: boolean;
114113
showMultiRpcModal: boolean;
115114
privacyMode: boolean;
@@ -221,7 +220,6 @@ export const getDefaultPreferencesControllerState =
221220
useNativeCurrencyAsPrimaryCurrency: true,
222221
hideZeroBalanceTokens: false,
223222
petnamesEnabled: true,
224-
redesignedConfirmationsEnabled: true,
225223
featureNotificationsEnabled: false,
226224
isRedesignedConfirmationsDeveloperEnabled: false,
227225
showConfirmationAdvancedDetails: false,

app/scripts/fixtures/with-preferences.js

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ export const FIXTURES_PREFERENCES = {
77
smartTransactionsOptInStatus: true,
88
useNativeCurrencyAsPrimaryCurrency: true,
99
petnamesEnabled: true,
10-
redesignedConfirmationsEnabled: true,
1110
featureNotificationsEnabled: true,
1211
showTokenAutodetectModal: false,
1312
showNftAutodetectModal: false,

app/scripts/lib/createRPCMethodTrackingMiddleware.js

-4
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,6 @@ function finalizeSignatureFragment(
195195
* that should be tracked for methods rate limited by random sample.
196196
* @param {Function} opts.getAccountType
197197
* @param {Function} opts.getDeviceModel
198-
* @param {Function} opts.isConfirmationRedesignEnabled
199198
* @param {Function} opts.isRedesignedConfirmationsDeveloperEnabled
200199
* @param {RestrictedControllerMessenger} opts.snapAndHardwareMessenger
201200
* @param {number} [opts.globalRateLimitTimeout] - time, in milliseconds, of the sliding
@@ -214,7 +213,6 @@ export default function createRPCMethodTrackingMiddleware({
214213
globalRateLimitMaxAmount = 10, // max of events in the globalRateLimitTimeout window. pass 0 for no global rate limit
215214
getAccountType,
216215
getDeviceModel,
217-
isConfirmationRedesignEnabled,
218216
isRedesignedConfirmationsDeveloperEnabled,
219217
snapAndHardwareMessenger,
220218
appStateController,
@@ -320,8 +318,6 @@ export default function createRPCMethodTrackingMiddleware({
320318
if (
321319
shouldUseRedesignForSignatures({
322320
approvalType: MESSAGE_TYPE_TO_APPROVAL_TYPE[method],
323-
isRedesignedSignaturesUserSettingEnabled:
324-
isConfirmationRedesignEnabled(),
325321
isRedesignedConfirmationsDeveloperEnabled:
326322
isRedesignedConfirmationsDeveloperEnabled(),
327323
})

app/scripts/lib/createRPCMethodTrackingMiddleware.test.js

+18-40
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,6 @@ const createHandler = (opts) =>
113113
globalRateLimitMaxAmount: 0,
114114
appStateController,
115115
metaMetricsController,
116-
isConfirmationRedesignEnabled: () => false,
117116
isRedesignedConfirmationsDeveloperEnabled: () => false,
118117
...opts,
119118
});
@@ -335,6 +334,9 @@ describe('createRPCMethodTrackingMiddleware', () => {
335334
security_alert_reason: BlockaidReason.maliciousDomain,
336335
ppom_eth_call_count: 5,
337336
ppom_eth_getCode_count: 3,
337+
ui_customizations: [
338+
MetaMetricsEventUiCustomization.RedesignedConfirmation,
339+
],
338340
},
339341
referrer: { url: 'some.dapp' },
340342
uniqueIdentifier: expectedUniqueIdentifier,
@@ -600,38 +602,6 @@ describe('createRPCMethodTrackingMiddleware', () => {
600602
});
601603
});
602604

603-
it('should track Confirmation Redesign through ui_customizations prop if enabled', async () => {
604-
const req = {
605-
id: MOCK_ID,
606-
method: MESSAGE_TYPE.PERSONAL_SIGN,
607-
origin: 'some.dapp',
608-
};
609-
const res = {
610-
error: null,
611-
};
612-
const { next, executeMiddlewareStack } = getNext();
613-
const handler = createHandler({
614-
isConfirmationRedesignEnabled: () => true,
615-
});
616-
617-
await handler(req, res, next);
618-
await executeMiddlewareStack();
619-
620-
expect(trackEventSpy).toHaveBeenCalledTimes(2);
621-
622-
expect(trackEventSpy.mock.calls[1][0]).toMatchObject({
623-
category: MetaMetricsEventCategory.InpageProvider,
624-
event: MetaMetricsEventName.SignatureApproved,
625-
properties: {
626-
signature_type: MESSAGE_TYPE.PERSONAL_SIGN,
627-
ui_customizations: [
628-
MetaMetricsEventUiCustomization.RedesignedConfirmation,
629-
],
630-
},
631-
referrer: { url: 'some.dapp' },
632-
});
633-
});
634-
635605
it('should not track Confirmation Redesign through ui_customizations prop if not enabled', async () => {
636606
const req = {
637607
id: MOCK_ID,
@@ -685,7 +655,10 @@ describe('createRPCMethodTrackingMiddleware', () => {
685655
event: MetaMetricsEventName.SignatureApproved,
686656
properties: {
687657
signature_type: MESSAGE_TYPE.PERSONAL_SIGN,
688-
ui_customizations: [MetaMetricsEventUiCustomization.Siwe],
658+
ui_customizations: [
659+
MetaMetricsEventUiCustomization.RedesignedConfirmation,
660+
MetaMetricsEventUiCustomization.Siwe,
661+
],
689662
},
690663
referrer: { url: 'some.dapp' },
691664
});
@@ -745,7 +718,10 @@ describe('createRPCMethodTrackingMiddleware', () => {
745718
event: MetaMetricsEventName.SignatureApproved,
746719
properties: {
747720
signature_type: MESSAGE_TYPE.ETH_SIGN_TYPED_DATA_V4,
748-
ui_customizations: [MetaMetricsEventUiCustomization.Permit],
721+
ui_customizations: [
722+
MetaMetricsEventUiCustomization.RedesignedConfirmation,
723+
MetaMetricsEventUiCustomization.Permit,
724+
],
749725
eip712_primary_type: 'Permit',
750726
},
751727
referrer: { url: 'some.dapp' },
@@ -800,7 +776,10 @@ describe('createRPCMethodTrackingMiddleware', () => {
800776
event: MetaMetricsEventName.SignatureApproved,
801777
properties: {
802778
signature_type: MESSAGE_TYPE.ETH_SIGN_TYPED_DATA_V4,
803-
ui_customizations: [MetaMetricsEventUiCustomization.Order],
779+
ui_customizations: [
780+
MetaMetricsEventUiCustomization.RedesignedConfirmation,
781+
MetaMetricsEventUiCustomization.Order,
782+
],
804783
},
805784
referrer: { url: 'some.dapp' },
806785
});
@@ -832,13 +811,12 @@ describe('createRPCMethodTrackingMiddleware', () => {
832811
properties: {
833812
signature_type: MESSAGE_TYPE.ETH_SIGN_TYPED_DATA_V4,
834813
eip712_primary_type: 'Unknown',
814+
ui_customizations: [
815+
MetaMetricsEventUiCustomization.RedesignedConfirmation,
816+
],
835817
},
836818
referrer: { url: 'some.dapp' },
837819
});
838-
839-
expect(trackEventSpy.mock.calls[1][0].properties).not.toHaveProperty(
840-
'ui_customizations',
841-
);
842820
});
843821

844822
describe('when request is flagged as safe by security provider', () => {

0 commit comments

Comments
 (0)