Merge branch 'main' into feat/shared-confirmation-navigation

.github/CODEOWNERS

@@ -69,21 +69,24 @@ ui/selectors/institutional           @MetaMask/mmi
 # Slack handle: @metamask-design-system-team | Slack channel: #metamask-design-system
 ui/components/component-library      @MetaMask/design-system-engineers
 
-# The Notifications team is responsible for code related to notifications,
-# authentication, and profile syncing inside the Extension.
+# The Notifications team is responsible for code related to notifications
 
 # Controllers
-**/controllers/authentication/**                    @MetaMask/notifications
 **/controllers/metamask-notifications/**            @MetaMask/notifications
 **/controllers/push-platform-notifications/**       @MetaMask/notifications
-**/controllers/user-storage/**                      @MetaMask/notifications
 
 # UI
 **/metamask-notifications/**                        @MetaMask/notifications
 **/multichain/notification*/**                      @MetaMask/notifications
 **/pages/notification*/**                           @MetaMask/notifications
 **/utils/notification.util.ts                       @MetaMask/notifications
 
+# Identity team is responsible for authentication and profile syncing inside the Extension.
+# Slack handle: @identity_team | Slack channel: #metamask-identity
+**/identity/**                                          @MetaMask/identity
+ui/pages/settings/security-tab/profile-sync-toggle      @MetaMask/identity
+
+
 # Accounts team is responsible for code related with snap management accounts
 # Slack handle: @accounts-team-devs | Slack channel: #metamask-accounts-team
 

.yarn/patches/@metamask-network-controller-npm-22.1.0-621c281f70.patch

@@ -0,0 +1,35 @@
+diff --git a/PATCH.txt b/PATCH.txt
+new file mode 100644
+index 0000000000000000000000000000000000000000..ce3b18534f055ee00aa5821793f855fd300fb72c
+--- /dev/null
++++ b/PATCH.txt
+@@ -0,0 +1,4 @@
++We remove lookupNetwork from initializeProvider in the network controller to prevent network requests before user onboarding is completed.
++The network lookup is done after onboarding is completed, and when the extension reloads if onboarding has been completed.
++This patch is part of a temporary fix that will be reverted soon to make way for a more permanent solution. https://github.com/MetaMask/metamask-extension/pull/23005
++You can see the changes before compilation on this branch: https://github.com/MetaMask/core/compare/pnf/ext-23622-review?expand=1
+\ No newline at end of file
+diff --git a/dist/NetworkController.cjs b/dist/NetworkController.cjs
+index cc9793f576eb39a51ab141b7d03de57cf99e5570..c573b5134d40f522217a6ab6df129040d02e9660 100644
+--- a/dist/NetworkController.cjs
++++ b/dist/NetworkController.cjs
+@@ -422,7 +422,6 @@ class NetworkController extends base_controller_1.BaseController {
+      */
+     async initializeProvider() {
+         __classPrivateFieldGet(this, _NetworkController_instances, "m", _NetworkController_applyNetworkSelection).call(this, this.state.selectedNetworkClientId);
+-        await this.lookupNetwork();
+     }
+     /**
+      * Refreshes the network meta with EIP-1559 support and the network status
+diff --git a/dist/NetworkController.mjs b/dist/NetworkController.mjs
+index 806f32edeffaad9f7eb1cafa4184368ec95f63e7..9268947cbed4bf717729ca6ac8ea83a8b91b6e8a 100644
+--- a/dist/NetworkController.mjs
++++ b/dist/NetworkController.mjs
+@@ -397,7 +397,6 @@ export class NetworkController extends BaseController {
+      */
+     async initializeProvider() {
+         __classPrivateFieldGet(this, _NetworkController_instances, "m", _NetworkController_applyNetworkSelection).call(this, this.state.selectedNetworkClientId);
+-        await this.lookupNetwork();
+     }
+     /**
+      * Refreshes the network meta with EIP-1559 support and the network status

.yarnrc.yml

@@ -43,6 +43,14 @@ npmAuditIgnoreAdvisories:
   # not appear to be used.
   - 1092461
 
+  # Issue: Malware in @solana/web3.js
+  # URL: https://github.com/advisories/GHSA-2mhj-xmf4-pr8m
+  # we patched this to ensure the vulnerable versions are not included, but the advisory
+  # was mistakenly originally created to flag all versions as vulnerable
+  - 1101059
+
+
+
   # Temp fix for https://github.com/MetaMask/metamask-extension/pull/16920 for the sake of 11.7.1 hotfix
   # This will be removed in this ticket https://github.com/MetaMask/metamask-extension/issues/22299
   - 'ts-custom-error (deprecation)'

app/scripts/background.js

@@ -1025,8 +1025,8 @@ export function setupController(
     METAMASK_CONTROLLER_EVENTS.UPDATE_BADGE,
     updateBadge,
   );
-  controller.appStateController.on(
-    METAMASK_CONTROLLER_EVENTS.UPDATE_BADGE,
+  controller.controllerMessenger.subscribe(
+    METAMASK_CONTROLLER_EVENTS.APP_STATE_UNLOCK_CHANGE,
     updateBadge,
   );