Merge branch 'main' into ogp/36966

Author: OGPoyraz

.github/scripts/post-nightly-builds.ts

@@ -12,6 +12,7 @@ async function main() {
     SLACK_NIGHTLY_BUILDS_WEBHOOK_URL:
       process.env.SLACK_NIGHTLY_BUILDS_WEBHOOK_URL || '',
     BUILD_STATUS: process.env.BUILD_STATUS || 'unknown',
+    BUILD_VERSION: process.env.BUILD_VERSION || '0',
   };
 
   if (!env.RUN_ID) throw new Error('RUN_ID not found');
@@ -41,7 +42,9 @@ async function main() {
   // Handle unknown or invalid status
   console.log(`❓ Unknown build status: ${env.BUILD_STATUS}`);
   console.log('⚠️ Skipping Slack notification due to unknown status');
-  throw new Error(`Invalid BUILD_STATUS: ${env.BUILD_STATUS}. Expected 'success' or 'failure'.`);
+  throw new Error(
+    `Invalid BUILD_STATUS: ${env.BUILD_STATUS}. Expected 'success' or 'failure'.`,
+  );
 }
 
 async function postFailureNotification(env: any, version: string) {
@@ -182,14 +185,16 @@ async function postFailureNotification(env: any, version: string) {
 }
 
 async function postSuccessNotification(env: any, version: string) {
+  const experimentalVersion = `${version}-experimental.${env.BUILD_VERSION}`;
+
   const buildMap = {
     builds: {
       chrome: `${env.HOST_URL}/build-dist-browserify/builds/metamask-chrome-${version}.zip`,
       firefox: `${env.HOST_URL}/build-dist-mv2-browserify/builds/metamask-firefox-${version}.zip`,
     },
     'builds (experimental)': {
-      chrome: `${env.HOST_URL}/build-experimental-browserify/builds/metamask-experimental-chrome-${version}.zip`,
-      firefox: `${env.HOST_URL}/build-experimental-mv2-browserify/builds/metamask-experimental-firefox-${version}.zip`,
+      chrome: `${env.HOST_URL}/build-experimental-browserify/builds/metamask-experimental-chrome-${experimentalVersion}.zip`,
+      firefox: `${env.HOST_URL}/build-experimental-mv2-browserify/builds/metamask-experimental-firefox-${experimentalVersion}.zip`,
     },
   };
 

.github/workflows/check-template-and-add-labels.yml

@@ -4,7 +4,7 @@ on:
   issues:
     types: [opened, edited, labeled, unlabeled, reopened]
   pull_request_target:
-    types: [opened, edited, labeled, unlabeled, reopened]
+    types: [opened, edited, labeled, unlabeled, reopened, synchronize]
   merge_group:
 
 jobs:

.yarn/patches/@metamask-assets-controllers-npm-81.0.0-706c32028b.patch

@@ -47,7 +47,7 @@ If you are not a MetaMask Internal Developer, or are otherwise developing on a f
 
 ## Building on your local machine
 
-- Install [Node.js](https://nodejs.org) version 20
+- Install [Node.js](https://nodejs.org) version 22
   - If you are using [nvm](https://github.com/nvm-sh/nvm#installing-and-updating) (recommended) running `nvm use` will automatically choose the right node version for you.
 - Enable Corepack by executing the command `corepack enable` within the metamask-extension project. Corepack is a utility included with Node.js by default. It manages Yarn on a per-project basis, using the version specified by the `packageManager` property in the project's package.json file. Please note that modern releases of [Yarn](https://yarnpkg.com/getting-started/install) are not intended to be installed globally or via npm.
 - Duplicate `.metamaskrc.dist` within the root and rename it to `.metamaskrc` by running `cp .metamaskrc{.dist,}`.