From 59e167bce80d052d99c8753d74e9f3bbfbb2188c Mon Sep 17 00:00:00 2001 From: Mathieu Artu Date: Wed, 18 Dec 2024 12:57:29 +0100 Subject: [PATCH 1/4] test: verify core PR 5078 --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 0cc3222a7d1d..28d83127ddaf 100644 --- a/package.json +++ b/package.json @@ -332,7 +332,7 @@ "@metamask/post-message-stream": "^8.0.0", "@metamask/ppom-validator": "0.36.0", "@metamask/preinstalled-example-snap": "^0.2.0", - "@metamask/profile-sync-controller": "^3.1.1", + "@metamask/profile-sync-controller": "npm:@metamask-previews/profile-sync-controller@3.1.1-preview-e218ba33", "@metamask/providers": "^18.2.0", "@metamask/queued-request-controller": "^7.0.1", "@metamask/rate-limit-controller": "^6.0.0", diff --git a/yarn.lock b/yarn.lock index 033ff849acd8..0c4115843734 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6046,9 +6046,9 @@ __metadata: languageName: node linkType: hard -"@metamask/profile-sync-controller@npm:^3.1.1": - version: 3.1.1 - resolution: "@metamask/profile-sync-controller@npm:3.1.1" +"@metamask/profile-sync-controller@npm:@metamask-previews/profile-sync-controller@3.1.1-preview-e218ba33": + version: 3.1.1-preview-e218ba33 + resolution: "@metamask-previews/profile-sync-controller@npm:3.1.1-preview-e218ba33" dependencies: "@metamask/base-controller": "npm:^7.0.2" "@metamask/keyring-api": "npm:^12.0.0" @@ -6068,7 +6068,7 @@ __metadata: "@metamask/providers": ^18.1.0 "@metamask/snaps-controllers": ^9.10.0 webextension-polyfill: ^0.10.0 || ^0.11.0 || ^0.12.0 - checksum: 10/42dd1ea0f9595eca6bd1a179681f7d16dfc6cc5090494131c8999a15caa02866f133febe1a95fca7cc74b4f3dafa7ef740f27b08eadbbf3049ebc087a739fb1b + checksum: 10/b58a997a48d56afb41d275b98de08d91d7fa485f27af306ae1ad0593dc8b8c23eb83f8552acb9a849a9363f49fc814b5c0932065f60e1c8f91e5e1b7b2616bc1 languageName: node linkType: hard @@ -26608,7 +26608,7 @@ __metadata: "@metamask/ppom-validator": "npm:0.36.0" "@metamask/preferences-controller": "npm:^15.0.1" "@metamask/preinstalled-example-snap": "npm:^0.2.0" - "@metamask/profile-sync-controller": "npm:^3.1.1" + "@metamask/profile-sync-controller": "npm:@metamask-previews/profile-sync-controller@3.1.1-preview-e218ba33" "@metamask/providers": "npm:^18.2.0" "@metamask/queued-request-controller": "npm:^7.0.1" "@metamask/rate-limit-controller": "npm:^6.0.0" From e54c67a8a2da84bfd97daf95dd97fdbb2798695b Mon Sep 17 00:00:00 2001 From: Mathieu Artu Date: Wed, 18 Dec 2024 13:51:03 +0100 Subject: [PATCH 2/4] fix: lint --- test/integration/notifications&auth/data/notification-state.ts | 1 + ui/selectors/identity/profile-syncing.test.ts | 1 + 2 files changed, 2 insertions(+) diff --git a/test/integration/notifications&auth/data/notification-state.ts b/test/integration/notifications&auth/data/notification-state.ts index 61d74d161671..0979ebf4643d 100644 --- a/test/integration/notifications&auth/data/notification-state.ts +++ b/test/integration/notifications&auth/data/notification-state.ts @@ -39,6 +39,7 @@ export const getMockedNotificationsState = () => { isProfileSyncingEnabled: true, isProfileSyncingUpdateLoading: false, hasAccountSyncingSyncedAtLeastOnce: false, + isAccountSyncingInProgress: false, isAccountSyncingReadyToBeDispatched: false, isMetamaskNotificationsFeatureSeen: true, isNotificationServicesEnabled: true, diff --git a/ui/selectors/identity/profile-syncing.test.ts b/ui/selectors/identity/profile-syncing.test.ts index d05512e59523..74d4a31984f9 100644 --- a/ui/selectors/identity/profile-syncing.test.ts +++ b/ui/selectors/identity/profile-syncing.test.ts @@ -7,6 +7,7 @@ describe('Profile Syncing Selectors', () => { isProfileSyncingUpdateLoading: false, isAccountSyncingReadyToBeDispatched: false, hasAccountSyncingSyncedAtLeastOnce: false, + isAccountSyncingInProgress: false, }, }; From a5a7b6502b0bf7fafe9a0293a4b914fdaaac3b97 Mon Sep 17 00:00:00 2001 From: Mathieu Artu Date: Wed, 18 Dec 2024 14:21:36 +0100 Subject: [PATCH 3/4] fix: sentry state --- app/scripts/constants/sentry-state.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/app/scripts/constants/sentry-state.ts b/app/scripts/constants/sentry-state.ts index ab53ffb3f22d..d74c9a50a05b 100644 --- a/app/scripts/constants/sentry-state.ts +++ b/app/scripts/constants/sentry-state.ts @@ -401,6 +401,7 @@ export const SENTRY_BACKGROUND_STATE = { isProfileSyncingUpdateLoading: false, hasAccountSyncingSyncedAtLeastOnce: false, isAccountSyncingReadyToBeDispatched: false, + isAccountSyncingInProgress: false, }, ///: BEGIN:ONLY_INCLUDE_IF(build-mmi) ...MMI_SENTRY_BACKGROUND_STATE, From 3d2e5c487d757aec5f081d4b1cbf459524a2692c Mon Sep 17 00:00:00 2001 From: Mathieu Artu Date: Wed, 18 Dec 2024 15:04:20 +0100 Subject: [PATCH 4/4] fix: e2e state --- .../errors-after-init-opt-in-background-state.json | 3 ++- .../state-snapshots/errors-after-init-opt-in-ui-state.json | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-background-state.json b/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-background-state.json index cae1a6ae8951..914394fc9c66 100644 --- a/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-background-state.json +++ b/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-background-state.json @@ -355,6 +355,7 @@ "isProfileSyncingEnabled": null, "isProfileSyncingUpdateLoading": "boolean", "hasAccountSyncingSyncedAtLeastOnce": "boolean", - "isAccountSyncingReadyToBeDispatched": "boolean" + "isAccountSyncingReadyToBeDispatched": "boolean", + "isAccountSyncingInProgress": "boolean" } } diff --git a/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-ui-state.json b/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-ui-state.json index a306c63c70b6..370d7571598e 100644 --- a/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-ui-state.json +++ b/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-ui-state.json @@ -223,6 +223,7 @@ "isProfileSyncingUpdateLoading": "boolean", "hasAccountSyncingSyncedAtLeastOnce": "boolean", "isAccountSyncingReadyToBeDispatched": "boolean", + "isAccountSyncingInProgress": "boolean", "subscriptionAccountsSeen": "object", "isMetamaskNotificationsFeatureSeen": "boolean", "isNotificationServicesEnabled": "boolean",