Merge branch 'main' into fix/alert-modal-copy

MetaMask · Jan 10, 2025 · bd45f70 · bd45f70
2 parents 960980e + 5778b4a
commit bd45f70
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 8 deletions.
diff --git a/package.json b/package.json
@@ -340,7 +340,7 @@
     "@metamask/post-message-stream": "^8.0.0",
     "@metamask/ppom-validator": "0.36.0",
     "@metamask/preinstalled-example-snap": "^0.3.0",
-    "@metamask/profile-sync-controller": "^3.1.1",
+    "@metamask/profile-sync-controller": "^3.2.0",
     "@metamask/providers": "^18.2.0",
     "@metamask/queued-request-controller": "^7.0.1",
     "@metamask/rate-limit-controller": "^6.0.0",

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
@@ -347,6 +347,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
@@ -219,6 +219,7 @@
     "isProfileSyncingUpdateLoading": "boolean",
     "hasAccountSyncingSyncedAtLeastOnce": "boolean",
     "isAccountSyncingReadyToBeDispatched": "boolean",
+    "isAccountSyncingInProgress": "boolean",
     "subscriptionAccountsSeen": "object",
     "isMetamaskNotificationsFeatureSeen": "boolean",
     "isNotificationServicesEnabled": "boolean",

diff --git a/test/integration/notifications&auth/data/notification-state.ts b/test/integration/notifications&auth/data/notification-state.ts
@@ -40,6 +40,7 @@ export const getMockedNotificationsState = () => {
     isProfileSyncingUpdateLoading: false,
     hasAccountSyncingSyncedAtLeastOnce: false,
     isAccountSyncingReadyToBeDispatched: false,
+    isAccountSyncingInProgress: false,
     isMetamaskNotificationsFeatureSeen: true,
     isNotificationServicesEnabled: true,
     isFeatureAnnouncementsEnabled: true,

diff --git a/ui/components/app/name/index.scss b/ui/components/app/name/index.scss
@@ -6,6 +6,7 @@
   gap: 5px;
   font-size: 12px;
   max-width: 100%;
+  cursor: pointer;
 
   &__missing {
     background-color: var(--color-background-alternative);

diff --git 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,
     },
   };
 

diff --git a/yarn.lock b/yarn.lock
@@ -6073,11 +6073,11 @@ __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:^3.2.0":
+  version: 3.2.0
+  resolution: "@metamask/profile-sync-controller@npm:3.2.0"
   dependencies:
-    "@metamask/base-controller": "npm:^7.0.2"
+    "@metamask/base-controller": "npm:^7.1.0"
     "@metamask/keyring-api": "npm:^12.0.0"
     "@metamask/keyring-controller": "npm:^19.0.2"
     "@metamask/network-controller": "npm:^22.1.1"
@@ -6095,7 +6095,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/6fabb31266dfe14e67a3fcfcf8e5826786519bc0086d109b5cf324e4fa87f1fe5916bab2e9ac92489950531dee81e67e298b00b60fdaf9821312d170435005bf
   languageName: node
   linkType: hard
 
@@ -26665,7 +26665,7 @@ __metadata:
     "@metamask/ppom-validator": "npm:0.36.0"
     "@metamask/preferences-controller": "npm:^15.0.1"
     "@metamask/preinstalled-example-snap": "npm:^0.3.0"
-    "@metamask/profile-sync-controller": "npm:^3.1.1"
+    "@metamask/profile-sync-controller": "npm:^3.2.0"
     "@metamask/providers": "npm:^18.2.0"
     "@metamask/queued-request-controller": "npm:^7.0.1"
     "@metamask/rate-limit-controller": "npm:^6.0.0"