Merge branch 'main' into jongsun/build/enable-react-compiler-webpack

Author: MajorLift

.github/workflows/create-release-pr.yml

@@ -82,7 +82,7 @@ jobs:
       pull-requests: write
     steps:
       - name: Create Release PR
-        uses: MetaMask/github-tools/.github/actions/[email protected].0
+        uses: MetaMask/github-tools/.github/actions/[email protected].2
         with:
           platform: extension
           checkout-base-branch: ${{ needs.resolve-bases.outputs.checkout_base }}

.github/workflows/run-e2e.yml

@@ -74,7 +74,7 @@ jobs:
       RUN_ID: ${{ github.run_id }}
       PR_NUMBER: ${{ github.event.pull_request.number || '' }}
       TEST_SUITE_NAME: ${{ inputs.test-suite-name }}
-      IS_SIDEPANEL: true
+      IS_SIDEPANEL: false
     steps:
       - name: Checkout and setup environment
         uses: MetaMask/action-checkout-and-setup@v1

.github/workflows/update-release-changelog.yml

@@ -48,11 +48,11 @@ jobs:
       pull-requests: write
     steps:
       - name: Update Release Changelog
-        uses: MetaMask/github-tools/.github/actions/[email protected].0
+        uses: MetaMask/github-tools/.github/actions/[email protected].2
         with:
           release-branch: ${{ github.ref_name }}
           repository-url: ${{ github.server_url }}/${{ github.repository }}
           platform: extension
           previous-version-ref: 'null'
-          github-tools-version: v1.1.0
+          github-tools-version: v1.1.2
           github-token: ${{ secrets.PR_TOKEN }}

.yarn/patches/@metamask-assets-controllers-npm-92.0.0-ea998cb0bd.patch renamed to .yarn/patches/@metamask-assets-controllers-npm-93.0.0-ea998cb0bd.patch

@@ -87,8 +87,7 @@
     "unlimitedStorage",
     "webRequest",
     "offscreen",
-    "identity",
-    "sidePanel"
+    "identity"
   ],
   "sandbox": {
     "pages": ["snaps/index.html"]

app/_locales/en/messages.json

@@ -10,8 +10,5 @@
     "matches": ["http://*/*", "https://*/*"],
     "ids": ["*"]
   },
-  "minimum_chrome_version": "115",
-  "side_panel": {
-    "default_path": "sidepanel.html"
-  }
+  "minimum_chrome_version": "115"
 }

app/_locales/en_GB/messages.json

@@ -83,6 +83,10 @@ import {
   BackendWebSocketService,
 } from '@metamask/core-backend';
 import { ClaimsController, ClaimsService } from '@metamask/claims-controller';
+import {
+  ProfileMetricsController,
+  ProfileMetricsService,
+} from '@metamask/profile-metrics-controller';
 import OnboardingController from '../controllers/onboarding';
 import { PreferencesController } from '../controllers/preferences-controller';
 import SwapsController from '../controllers/swaps';
@@ -197,7 +201,9 @@ export type Controller =
   | AccountActivityService
   | MultichainAccountService
   | NetworkEnablementController
-  | ClaimsService;
+  | ClaimsService
+  | ProfileMetricsController
+  | ProfileMetricsService;
 
 /**
  * Flat state object for all controllers supporting or required by modular initialization.
@@ -270,4 +276,5 @@ export type ControllerFlatState = AccountOrderController['state'] &
   NftController['state'] &
   NftDetectionController['state'] &
   NetworkEnablementController['state'] &
-  AccountTrackerController['state'];
+  AccountTrackerController['state'] &
+  ProfileMetricsController['state'];