Merge branch 'main' into mikesposito/update-message-manager

Author: mikesposito

.github/CODEOWNERS

@@ -99,20 +99,21 @@ app/scripts/constants/snaps.ts       @MetaMask/core-platform
 # Co-owned by Confirmations and Snaps
 ui/components/app/metamask-template-renderer @MetaMask/confirmations @MetaMask/core-platform
 
-# Wallet UX
-ui/components/app/whats-new-popup     @MetaMask/wallet-ux
-ui/css                                @MetaMask/wallet-ux
-ui/pages/home                         @MetaMask/wallet-ux
-ui/components/multichain/             @MetaMask/wallet-ux
-
-# Co-owned by accounts and wallet-ux
-ui/components/multichain/multi-srp/              @MetaMask/accounts-engineers @MetaMask/wallet-ux
-ui/components/multichain/account-picker/         @MetaMask/accounts-engineers @MetaMask/wallet-ux
-ui/components/multichain/account-details/        @MetaMask/accounts-engineers @MetaMask/wallet-ux
-ui/components/multichain/account-overview/       @MetaMask/accounts-engineers @MetaMask/wallet-ux
-ui/components/multichain/account-list-item/      @MetaMask/accounts-engineers @MetaMask/wallet-ux
-ui/components/multichain/account-list-menu/      @MetaMask/accounts-engineers @MetaMask/wallet-ux
-ui/components/multichain/account-list-item-menu/ @MetaMask/accounts-engineers @MetaMask/wallet-ux
+# Core Extension UX
+ui/components/app/whats-new-popup     @MetaMask/core-extension-ux
+ui/css                                @MetaMask/core-extension-ux
+ui/pages/home                         @MetaMask/core-extension-ux
+ui/pages/core                         @MetaMask/core-extension-ux
+ui/components/multichain/             @MetaMask/core-extension-ux
+
+# Co-owned by accounts and core-extension-ux
+ui/components/multichain/multi-srp/              @MetaMask/accounts-engineers @MetaMask/core-extension-ux
+ui/components/multichain/account-picker/         @MetaMask/accounts-engineers @MetaMask/core-extension-ux
+ui/components/multichain/account-details/        @MetaMask/accounts-engineers @MetaMask/core-extension-ux
+ui/components/multichain/account-overview/       @MetaMask/accounts-engineers @MetaMask/core-extension-ux
+ui/components/multichain/account-list-item/      @MetaMask/accounts-engineers @MetaMask/core-extension-ux
+ui/components/multichain/account-list-menu/      @MetaMask/accounts-engineers @MetaMask/core-extension-ux
+ui/components/multichain/account-list-item-menu/ @MetaMask/accounts-engineers @MetaMask/core-extension-ux
 
 # Web3Auth / Onboarding
 ui/pages/onboarding-flow              @MetaMask/web3auth

.github/actions/page-load-benchmark-comment/action.yml

@@ -0,0 +1,32 @@
+name: 'Page load benchmark comment'
+description: 'Download benchmark results, create directory structure, and comment on PR'
+inputs:
+  head-commit-hash:
+    description: 'The head commit hash to pass to the benchmark comment script'
+    required: true
+  pr-comment-token:
+    description: 'GitHub token for commenting on PR'
+    required: true
+runs:
+  using: 'composite'
+  steps:
+    - name: Download page load benchmark results
+      uses: actions/download-artifact@v4
+      with:
+        name: benchmark-results
+
+    - name: Create expected page load benchmark results directory structure
+      shell: bash
+      run: |
+        mkdir -p test-artifacts/benchmarks
+        mv benchmark-results.json test-artifacts/benchmarks/benchmark-results.json
+
+    - name: Page load benchmark compare and comment
+      shell: bash
+      run: yarn tsx development/page-load-benchmark-pr-comment.ts
+      env:
+        PR_COMMENT_TOKEN: ${{ inputs.pr-comment-token }}
+        OWNER: ${{ github.repository_owner }}
+        REPOSITORY: ${{ github.event.repository.name }}
+        PR_NUMBER: ${{ github.event.pull_request.number }}
+        HEAD_COMMIT_HASH: ${{ inputs.head-commit-hash }}

.github/e2e-filter-rules.yml

@@ -0,0 +1,54 @@
+# Filter rules for determining E2E test requirements
+# Used with dorny/paths-filter action
+#
+# Each filter creates two outputs:
+# - {filter_name}: 'true'/'false' if any changed files match any filter rules
+# - {filter_name}_count: number of matching files
+#
+# STRATEGY: Use separate filters to detect different file types non E2E related.
+# Conservative approach - add only files that safely allow skipping E2E tests.
+
+# DOCUMENTATION FILES
+documentation_files: &documentation_files
+  - '**/*.{md,mdx,txt}'
+  - 'docs/**/*'
+  - 'test/manual-scenarios/**/*'
+  - 'LICENSE'
+
+# LOW LEVEL TEST FILES
+test_files: &test_files
+  - '**/*.test.{js,ts,tsx,jsx}'
+  - '**/*.stories.*'
+  - '**/*.snap'
+  - 'test/jest/**/*'
+  - 'test/unit-global/**/*'
+  - 'test/lib/**/*'
+  - 'test/stub/**/*'
+  - 'test/integration/**/*'
+
+# CONFIG FILES
+config_files: &config_files
+  - '.eslint*'
+  - 'eslint.config.js'
+  - 'prettier.config.js'
+  - 'stylelint.config.js'
+  - 'tailwind.config.js'
+  - 'sonar-project.properties'
+  - 'codecov.yml'
+
+# DEVELOPMENT TOOLS
+dev_tools: &dev_tools
+  - 'development/fitness-functions/**/*'
+  - 'development/ts-migration-dashboard/**/*'
+  - 'development/generate-attributions/**/*'
+
+# ALL FILTERED FILES - non E2E related files
+non_e2e_related_files:
+  - *documentation_files
+  - *test_files
+  - *config_files
+  - *dev_tools
+
+# ALL CHANGED FILES
+all_changes:
+  - '**'

.github/guidelines/LABELING_GUIDELINES.md

@@ -2,38 +2,41 @@
 
 To maintain a consistent and efficient development workflow, we have set specific label guidelines for all pull requests (PRs). Please ensure you adhere to the following instructions:
 
-### Mandatory team labels:
+## Mandatory team label (automated)
 
 - **Internal Developers**: Every PR raised by an internal developer must include a label prefixed with `team-` (e.g., `team-extension-ux`, `team-extension-platform`, etc.). This indicates the respective internal team responsible for the PR.
 
 - **External Contributors**: PRs submitted by contributors who are not part of the organization will be automatically labeled with `external-contributor`.
 
-It's essential to ensure that PRs have the appropriate labels before they are considered for merging.
+## Mandatory checklog entry or label (manual addition)
 
-### Mandatory release version labels:
+The releases changelog generation is based on PR's changelog entries.
+The check can be bypassed when necessary, either by setting the changelog entry to "null" or by adding following label:
 
-- **release-x.y.z**: This label is automatically added to a PR and its linked issues upon the PR's merge. The `x.y.z` in the label represents the version in which the changes from the PR will be included. This label is auto-generated by a [GitHub action](../workflows/add-release-label.yml), which determines the version by incrementing the minor version number from the most recent release. Manual intervention is only required in specific cases. For instance, if a merged PR is cherry-picked into a release branch, typically done to address Release Candidate (RC) bugs, the label would need to be manually updated to reflect the correct version.
-- **regression-prod-x.y.z**: This label is automatically added to a bug report issue at the time of its creation. The `x.y.z` in the label represents the version in which the bug first appeared. This label is auto-generated by a [GitHub action](../workflows/check-template-and-add-labels.yml), which determines the `x.y.z` value based on the version information provided in the bug report issue form. Manual intervention is only necessary under certain circumstances. For example, if a user submits a bug report and specifies the version they are currently using, but the bug was actually introduced in a prior version, the label would need to be manually updated to accurately reflect the version where the bug originated.
-- **regression-RC-x.y.z**: This label is manually added to a bug report issue by release engineers when a bug is found during release regerssion testing phase. The `x.y.z` in the label represents the release candidate (RC) version in which the bug's been discovered.
+- **no-changelog**: PR's changes do not need to be included in the changelog.
+
+## Optional labels (manual addition)
+
+Any label can be manually added on demand depending on the PR's content. For instance, the label **QA passed** will indicate that a thorough manual testing has been performed and the PR is ready to be merged. In addition, following labels have some specific use cases.
 
-### Optional labels:
+### Bypass Quality Gates
 
-- **regression-main**: This label can manually be added to a bug report issue at the time of its creation if the bug is present on the development branch, i.e., `main`, but is not yet released in production.
-- **feature-branch-bug**: This label can manually be added to a bug report issue at the time of its creation if the bug is present on a feature branch, i.e., before merging to `main`.
-- **needs-qa**: If the PR includes a new features, complex testing steps, or large refactors, this label must be added to indicated PR requires a full manual QA prior being merged and added to a release.
+Using any of these labels should be exceptional in case of CI friction and urgencies. Please use them reasonably and verify new changes and regressions manually.
 
-### Labels prohibited when PR needs to be merged:
+- **skip-e2e-quality-gate**: This label will disable the default test retries for E2E test files modified in the PR. Useful when making large refactors or when changes don't pose flakiness risk.
 
-Any PR that includes one of the following labels can not be merged:
+### Block merge if any is present
 
 - **needs-qa**: The PR requires a full manual QA prior to being merged and added to a release.
-- **QA'd but questions**: The PR has been checked by QA, but there are pending questions or clarifications needed on minor issues that were found.
-- **issues-found**: The PR has been checked by QA or other reviewers, and appeared to include issues that need to be addressed.
 - **need-ux-ds-review**: The PR requires a review from the User Experience or Design System teams.
 - **blocked**: There are unresolved dependencies or other issues blocking the progress of this PR.
 - **stale**: The PR has not had recent activity in the last 90 days. It will be closed in 7 days.
 - **DO-NOT-MERGE**: The PR should not be merged under any circumstances.
 
+## Release version label (automated)
+
+- **release-x.y.z**: This label is automatically added to a PR and its linked issues upon the PR's merge. The `x.y.z` in the label represents the version in which the changes from the PR will be included. This label is auto-generated by a [GitHub action](../workflows/add-release-label.yml), which determines the version by incrementing the minor version number from the most recent release. Manual intervention is only required in specific cases. For instance, if a merged PR is cherry-picked into a release branch, typically done to address Release Candidate (RC) bugs, the label would need to be manually updated to reflect the correct version.
+
 To maintain code quality and project integrity, it's crucial to respect these label guidelines. Please ensure you review and update labels appropriately throughout the PR lifecycle.
 
 Thank you for your cooperation!

.github/scripts/check-pr-has-required-labels.ts

@@ -42,8 +42,6 @@ async function main(): Promise<void> {
 
   const preventMergeLabels = [
     'needs-qa',
-    "QA'd but questions",
-    'issues-found',
     'need-ux-ds-review',
     'blocked',
     'stale',

.github/scripts/check-template-and-add-labels.ts

@@ -140,6 +140,7 @@ async function main(): Promise<void> {
       }
       // Add area-Sentry label to the bug report issue
       await addAreaSentryLabelToIssue(octokit, labelable);
+      await checkAndRemoveNeedsTriageIfFullyLabeled(octokit, labelable);
       process.exit(0); // Stop the process and exit with a success status code
     }
 
@@ -165,18 +166,22 @@ async function main(): Promise<void> {
       if (context.payload.action === 'opened') {
         await addNeedsTriageLabelToIssue(octokit, labelable);
       }
+      await checkAndRemoveNeedsTriageIfFullyLabeled(octokit, labelable);
+
     } else {
       const errorMessage =
         "Issue body does not match any of expected templates ('general-issue.yml' or 'bug-report.yml').\n\nMake sure issue's body includes all section titles.\n\nSections titles are listed here: https://github.com/MetaMask/metamask-extension/blob/main/.github/scripts/shared/template.ts#L14-L37";
       console.log(errorMessage);
 
-      // Add label to indicate issue doesn't match any template
+      // Add label to indicate issue does not match any template
       await addLabelToLabelable(octokit, labelable, invalidIssueTemplateLabel);
+      await checkAndRemoveNeedsTriageIfFullyLabeled(octokit, labelable);
 
       // Github action shall fail in case issue body doesn't match any template
       core.setFailed(errorMessage);
       process.exit(1);
     }
+
   } else if (labelable.type === LabelableType.PullRequest) {
     if (templateType === TemplateType.PullRequest) {
       console.log("PR matches 'pull-request-template.md' template.");
@@ -429,3 +434,36 @@ function hasChangelogEntry(body: string): boolean {
   console.log(`Changelog entry found: ${entry}`);
   return true; // allow any non-empty value, including "null"
 }
+
+// This function checks if issue has both team and severity labels and removes needs-triage label if present
+async function checkAndRemoveNeedsTriageIfFullyLabeled(
+  octokit: InstanceType<typeof GitHub>,
+  issue: Labelable,
+): Promise<void> {
+  let hasTeamLabel = false;
+  let hasSeverityLabel = false;
+
+  for (const label of issue.labels || []) {
+    // Check for team labels
+    if (
+      label.name.startsWith('team-') ||
+      label.name === externalContributorLabel.name
+    ) {
+      console.log(`Issue contains a team label: ${label.name}`);
+      hasTeamLabel = true;
+    }
+    // Check for severity labels (Sev0-urgent, Sev1-high, etc.)
+    if (/^Sev\d-\w+$/.test(label.name)) {
+      console.log(`Issue contains a severity label: ${label.name}`);
+      hasSeverityLabel = true;
+    }
+  }
+
+  // If both team and severity labels are present, remove needs-triage label
+  if (hasTeamLabel && hasSeverityLabel) {
+    console.log(
+      'Both team and severity labels found. Removing needs-triage label if present...',
+    );
+    await removeLabelFromLabelableIfPresent(octokit, issue, needsTriageLabel);
+  }
+}

.github/scripts/create-bug-report-issue.ts

@@ -103,7 +103,7 @@ async function main(): Promise<void> {
     process.exit(1);
   }
 
-  const issueBody = `**What is this bug report issue for?**\n\n1. This issue is used to track release dates on this [Github Project board](https://github.com/orgs/MetaMask/projects/${projectNumber}/views/${projectViewNumber}), which content then gets pulled into our metrics system.\n\n2. This issue is also used by our Zapier automations, to determine if automated notifications shall be sent on Slack for release \`${releaseVersion}\`. Notifications will only be sent as long as this issue is open.\n\n**Who created and/or closed this issue?**\n\n- This issue was automatically created by a GitHub action upon the creation of the release branch \`Version-v${releaseVersion}\`, indicating the release was cut.\n\n- This issue gets automatically closed by another GitHub action, once the release branch \`Version-v${releaseVersion}\` or \`release/${releaseVersion}\` merges into \`main\`, indicating the release is prepared for store submission.`;
+  const issueBody = `**What is this bug report issue for?**\n\n1. This issue is used to track release dates on this [Github Project board](https://github.com/orgs/MetaMask/projects/${projectNumber}/views/${projectViewNumber}), which content then gets pulled into our metrics system.\n\n2. This issue is also used by our Zapier automations, to determine if automated notifications shall be sent on Slack for release \`${releaseVersion}\`. Notifications will only be sent as long as this issue is open.\n\n**Who created and/or closed this issue?**\n\n- This issue was automatically created by a GitHub action upon the creation of the release branch \`release/${releaseVersion}\`, indicating the release was cut.\n\n- This issue gets automatically closed by another GitHub action, once the release branch \`release/${releaseVersion}\` merges into \`stable\`, indicating the release is prepared for store submission.`;
   const issueId = await createIssue(octokit, repoOwner, planningRepoName, issueTitle, issueBody, [regressionLabelTestingId, typeBugLabelId, teamLabelId]);
 
   // Retrieve project, in order to obtain its ID

.github/scripts/extract-semver.sh

@@ -0,0 +1,24 @@
+#!/bin/bash
+
+set -euo pipefail
+
+ref_name="${GITHUB_REF#refs/heads/}"
+
+# Extract semver based on prefix
+if [[ "$ref_name" == Version-v* ]]; then
+  semver="${ref_name#Version-v}"
+elif [[ "$ref_name" == release/* ]]; then
+  semver="${ref_name#release/}"
+else
+  echo "Error: Branch name must be Version-vX.Y.Z or release/X.Y.Z where X, Y, Z are numbers. Got: $ref_name" >&2
+  exit 1
+fi
+
+# Validate semver format X.Y.Z where X, Y, Z are numbers
+if ! [[ "$semver" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
+  echo "Error: Invalid semver in branch name: $ref_name (extracted: $semver; must be numeric X.Y.Z)" >&2
+  exit 1
+fi
+
+echo "  semver-version: ${semver}"
+echo "semver=${semver}" >> "$GITHUB_OUTPUT"

.github/scripts/resolve-previous-ref.sh

@@ -0,0 +1,66 @@
+#!/bin/bash
+
+set -euo pipefail
+
+# Ensure SEMVER is provided via environment and assign
+semver="${SEMVER:?SEMVER environment variable must be set}"
+
+patch="${semver##*.}"
+if [ "$patch" -gt 0 ]; then
+  previous_ref="null"
+  echo "Hotfix detected (patch=$patch > 0): setting previous-version-ref to 'null' (string)."
+  echo "previous_ref=${previous_ref}" >> "$GITHUB_OUTPUT"
+  exit 0
+fi
+
+# Function to paginate and collect refs for a prefix
+fetch_matching_refs() {
+  local prefix="$1"
+  local temp_file
+  temp_file="$(mktemp)"
+  local page=1
+  echo "Fetching branches matching $prefix* (paginated)..." >&2
+  while :; do
+    echo "Fetching page $page for $prefix..." >&2
+    local resp
+    resp="$(mktemp)"
+    url="https://api.github.com/repos/${GITHUB_REPOSITORY}/git/matching-refs/heads/${prefix}?per_page=100&page=${page}"
+    curl -sS -H "Authorization: token $GITHUB_TOKEN" -H "Accept: application/vnd.github.v3+json" "$url" -o "$resp"
+
+    cat "$resp" >> "$temp_file"
+
+    local count
+    count=$(jq length "$resp")
+    if [ "$count" -lt 100 ]; then
+      break
+    fi
+    page=$((page + 1))
+    if [ "$page" -gt 100 ]; then
+      echo "Error: Exceeded maximum pagination limit (100 pages) while fetching refs for prefix '$prefix'. This may indicate too many matching branches or an API issue." >&2
+      exit 1
+    fi
+  done
+  echo "$temp_file"
+}
+
+# Fetch for each prefix
+version_v_file=$(fetch_matching_refs "Version-v")
+release_file=$(fetch_matching_refs "release/")
+
+# Combine and process: extract {name, semver} for matches, sort desc by semver
+jq -s 'add | [ .[] | .ref | ltrimstr("refs/heads/") as $name | select($name | test("^Version-v[0-9]+\\.[0-9]+\\.[0-9]+$") or test("^release/[0-9]+\\.[0-9]+\\.[0-9]+$")) | {name: $name, semver: (if $name | test("^Version-v") then $name | ltrimstr("Version-v") else $name | ltrimstr("release/") end) } ] | sort_by( .semver | split(".") | map(tonumber) ) | reverse' "$version_v_file" "$release_file" > all_versions.json
+
+# Filter to those with semver strictly lower than current and non-hotfix (patch==0)
+jq --arg semver "$semver" '[ .[] | select( .semver as $v | $semver | split(".") as $c | $v | split(".") as $p | ( ($p[0] | tonumber) < ($c[0] | tonumber) or (($p[0] | tonumber) == ($c[0] | tonumber) and (($p[1] | tonumber) < ($c[1] | tonumber) or (($p[1] | tonumber) == ($c[1] | tonumber) and ($p[2] | tonumber) < ($c[2] | tonumber)))) ) and (($p[2] | tonumber) == 0) ) ]' all_versions.json > filtered_versions.json
+
+# Select the highest lower: first in filtered list. If none found, fail.
+if [ "$(jq length filtered_versions.json)" -eq 0 ]; then
+  echo "Error: No lower non-hotfix versions found; cannot determine previous-version-ref." >&2
+  echo "This likely indicates a missing prior minor release branch (e.g., Version-vX.(Y-1).0 or release/X.(Y-1).0)." >&2
+  exit 1
+else
+  highest_lower="$(jq -r '.[0].semver' filtered_versions.json)"
+  previous_ref="$(jq -r '.[0].name' filtered_versions.json)"
+  echo "Selected highest lower non-hotfix version: ${highest_lower} (branch: ${previous_ref})"
+  echo "previous_ref=${previous_ref}" >> "$GITHUB_OUTPUT"
+fi