Merge branch 'main' into tabs-styling-update

Author: amandaye0h

.circleci/config.yml

@@ -3,13 +3,13 @@ version: 2.1
 executors:
   node-browsers-small:
     docker:
-      - image: cimg/node:22.13-browsers
+      - image: cimg/node:22.14-browsers
     resource_class: small
     environment:
       NODE_OPTIONS: --max_old_space_size=2048
   node-browsers-medium:
     docker:
-      - image: cimg/node:22.13-browsers
+      - image: cimg/node:22.14-browsers
     resource_class: medium
     environment:
       NODE_OPTIONS: --max_old_space_size=3072
@@ -21,7 +21,7 @@ executors:
       NODE_OPTIONS: --max_old_space_size=6144
   node-browsers-medium-plus:
     docker:
-      - image: cimg/node:22.13-browsers
+      - image: cimg/node:22.14-browsers
     resource_class: medium+
     environment:
       NODE_OPTIONS: --max_old_space_size=4096
@@ -159,6 +159,10 @@ workflows:
           requires:
             - prep-build-test
             - get-changed-files-with-git-diff
+      - test-api-specs-multichain:
+          requires:
+            - prep-build-test-flask
+            - get-changed-files-with-git-diff
       - test-e2e-chrome-multiple-providers:
           requires:
             - prep-build-test
@@ -272,26 +276,6 @@ workflows:
           requires:
             - prep-deps
 
-  locales_only:
-    when:
-      matches:
-        pattern: /^l10n_crowdin_action$/
-        value: << pipeline.git.branch >>
-    jobs:
-      - prep-deps
-      - get-changed-files-with-git-diff
-      - validate-locales-only:
-          requires:
-            - prep-deps
-            - get-changed-files-with-git-diff
-      - test-lint:
-          requires:
-            - prep-deps
-      - all-tests-pass:
-          requires:
-            - test-lint
-            - validate-locales-only
-
 jobs:
   create_release_pull_request:
     executor: node-browsers-medium
@@ -364,7 +348,7 @@ jobs:
           at: .
       - run:
           name: Get changed files with git diff
-          command: yarn git-diff-default-branch
+          command: yarn tsx .circleci/scripts/git-diff-default-branch.ts
       - persist_to_workspace:
           root: .
           paths:
@@ -373,15 +357,6 @@ jobs:
           path: changed-files
           destination: changed-files
 
-  validate-locales-only:
-    executor: node-browsers-small
-    steps:
-      - run: *shallow-git-clone-and-enable-vnc
-      - run: sudo corepack enable
-      - attach_workspace:
-          at: .
-      - run: yarn tsx .circleci/scripts/validate-locales-only.ts
-
   prep-build:
     executor: node-linux-medium
     steps:
@@ -703,6 +678,37 @@ jobs:
       - store_test_results:
           path: test/test-results/e2e
 
+  test-api-specs-multichain:
+    executor: node-browsers-medium-plus
+    steps:
+      - run: *shallow-git-clone-and-enable-vnc
+      - run: sudo corepack enable
+      - attach_workspace:
+          at: .
+      - run:
+          name: Move test build to dist
+          command: mv ./dist-test-flask ./dist
+      - run:
+          name: Move test zips to builds
+          command: mv ./builds-test-flask ./builds
+      - gh/install
+      - run:
+          name: test:api-specs-multichain
+          command: .circleci/scripts/test-run-e2e.sh yarn test:api-specs-multichain
+          no_output_timeout: 5m
+      - run:
+          name: Comment on PR
+          command: |
+            if [  -f html-report-multichain/index.html ]; then
+              gh pr comment "${CIRCLE_PR_NUMBER}" --body ":x: Multichain API Spec Test Failed. View the report [here](https://output.circle-artifacts.com/output/job/${CIRCLE_WORKFLOW_JOB_ID}/artifacts/${CIRCLE_NODE_INDEX}/html-report-multichain/index.html)."
+            else
+              echo "Multichain API Spec Report not found!"
+            fi
+          when: on_fail
+      - store_artifacts:
+          path: html-report-multichain
+          destination: html-report-multichain
+
   test-api-specs:
     executor: node-browsers-medium-plus
     steps:

.circleci/scripts/bundle-stats-commit.sh

@@ -38,43 +38,38 @@ git config --global user.email "[email protected]"
 
 git config --global user.name "MetaMask Bot"
 
-git clone [email protected]:MetaMask/extension_bundlesize_stats.git temp
-
-{
-    echo " '${CIRCLE_SHA1}': ";
-    cat test-artifacts/chrome/bundle_size_stats.json;
-    echo ", ";
-} >> temp/stats/bundle_size_data.temp.js
-
-cp temp/stats/bundle_size_data.temp.js temp/stats/bundle_size_data.js
-
-echo " }" >> temp/stats/bundle_size_data.js
-
-if [ -f temp/stats/bundle_size_data.json ]; then
-  # copy bundle_size_data.json in bundle_size_data.temp.json without last 2 lines
-  head -$(($(wc -l < temp/stats/bundle_size_data.json) - 2)) temp/stats/bundle_size_data.json > bundle_size_stats.temp.json
-
-  {
-    echo "},";
-    echo "\"$CIRCLE_SHA1\":";
-    cat test-artifacts/chrome/bundle_size_stats.json;
-    echo "}";
-  } >> bundle_size_stats.temp.json
-else
-  {
-    echo "{";
-    echo "\"$CIRCLE_SHA1\":";
-    cat test-artifacts/chrome/bundle_size_stats.json;
-    echo "}";
-  } > bundle_size_stats.temp.json
+git clone --depth=1 [email protected]:MetaMask/extension_bundlesize_stats.git temp
+
+BUNDLE_SIZE_FILE="test-artifacts/chrome/bundle_size_stats.json"
+STATS_FILE="temp/stats/bundle_size_data.json"
+TEMP_FILE="temp/stats/bundle_size_data.temp.json"
+
+# Ensure the JSON file exists
+if [[ ! -f "$STATS_FILE" ]]; then
+    echo "{}" > "$STATS_FILE"
 fi
 
-jq . bundle_size_stats.temp.json > temp/stats/bundle_size_data.json
-rm bundle_size_stats.temp.json
+# Validate JSON files before modification
+jq . "$STATS_FILE" > /dev/null || { echo "Error: Existing stats JSON is invalid"; exit 1; }
+jq . "$BUNDLE_SIZE_FILE" > /dev/null || { echo "Error: New bundle size JSON is invalid"; exit 1; }
+
+# Check if the SHA already exists in the stats file
+if jq -e "has(\"$CIRCLE_SHA1\")" "$STATS_FILE" > /dev/null; then
+    echo "SHA $CIRCLE_SHA1 already exists in stats file. No new commit needed."
+    exit 0
+fi
+
+# Append new bundle size data correctly using jq
+jq --arg sha "$CIRCLE_SHA1" --argjson data "$(cat "$BUNDLE_SIZE_FILE")" \
+   '. + {($sha): $data}' "$STATS_FILE" > "$TEMP_FILE"
+
+# Overwrite the original JSON file with the corrected version
+mv "$TEMP_FILE" "$STATS_FILE"
 
 cd temp
 
-git add .
+# Only add the JSON file
+git add stats/bundle_size_data.json
 
 git commit --message "Adding bundle size at commit: ${CIRCLE_SHA1}"
 

.depcheckrc.yml

@@ -23,6 +23,7 @@ ignores:
   - '@metamask/forwarder'
   - '@metamask/phishing-warning' # statically hosted as part of some e2e tests
   - '@metamask/test-dapp'
+  - '@metamask/test-dapp-multichain'
   - '@metamask/design-tokens' # Only imported in index.css
   - '@tsconfig/node22' # required dynamically by TS, used in tsconfig.json
   - '@sentry/cli' # invoked as `sentry-cli`

.github/CODEOWNERS

@@ -135,3 +135,6 @@ ui/components/app/nfts-items                          @MetaMask/metamask-assets
 ui/components/app/nfts-tab                            @MetaMask/metamask-assets
 ui/components/ui/deprecated-networks                  @MetaMask/metamask-assets
 ui/components/ui/nft-collection-image                 @MetaMask/metamask-assets
+
+# Extension Platform
+yarnrc.yml                                            @MetaMask/extension-platform

.github/scripts/git-diff-default-branch.ts

@@ -0,0 +1,120 @@
+import fs from 'fs';
+import path from 'path';
+import { context, getOctokit } from '@actions/github';
+import * as core from '@actions/core';
+
+// Get PR number from GitHub Actions environment variables
+const PR_NUMBER = context.payload.pull_request?.number;
+
+const CHANGED_FILES_DIR = 'changed-files';
+
+const octokit = getOctokit(process.env.GITHUB_TOKEN || '');
+
+type PRInfo = {
+  base: {
+    ref: string;
+  };
+  body: string;
+  labels: { name: string }[];
+};
+
+/**
+ * Get JSON info about the given pull request using Octokit
+ *
+ * @returns PR information from GitHub
+ */
+async function getPrInfo(): Promise<PRInfo | null> {
+  if (!PR_NUMBER) {
+    return null;
+  }
+
+  const { owner, repo } = context.repo;
+
+  return (
+    await octokit.request(`GET /repos/${owner}/${repo}/pulls/${PR_NUMBER}`)
+  ).data;
+}
+
+/**
+ * Get the list of files changed in the pull request using GraphQL
+ *
+ * @returns List of files changed in the PR
+ */
+async function getPrFilesChanged() {
+  const { owner, repo } = context.repo;
+
+  const response = await octokit.graphql({
+    query: `
+        {
+          repository(owner: "${owner}", name: "${repo}") {
+            pullRequest(number: ${PR_NUMBER}) {
+              files(first: 100) {
+                nodes {
+                  changeType
+                  path,
+                }
+              }
+            }
+          }
+        }`,
+  });
+
+  return response.repository.pullRequest.files.nodes;
+}
+
+function writePrBodyAndInfoToFile(prInfo: PRInfo) {
+  const prBodyPath = path.resolve(CHANGED_FILES_DIR, 'pr-body.txt');
+  const labels = prInfo.labels.map((label) => label.name).join(', ');
+  const updatedPrBody = `PR labels: {${labels}}\nPR base: {${
+    prInfo.base.ref
+  }}\n${prInfo.body.trim()}`;
+  fs.writeFileSync(prBodyPath, updatedPrBody);
+  core.info(`PR body and info saved to ${prBodyPath}`);
+}
+
+/**
+ * Main run function, stores the output of git diff and the body of the matching PR to a file.
+ *
+ * @returns Returns a promise that resolves when the git diff output and PR body is successfully stored.
+ */
+async function storeGitDiffOutputAndPrBody() {
+  try {
+    // Create the directory
+    fs.mkdirSync(CHANGED_FILES_DIR, { recursive: true });
+
+    core.info(`Determining whether to run git diff...`);
+    if (!PR_NUMBER) {
+      core.info('Not a PR, skipping git diff');
+      return;
+    }
+
+    const prInfo = await getPrInfo();
+
+    const baseRef = prInfo?.base.ref;
+    if (!baseRef) {
+      core.info('Not a PR, skipping git diff');
+      return;
+    }
+    // We perform git diff even if the PR base is not main or skip-e2e-quality-gate label is applied
+    // because we rely on the git diff results for other jobs
+    core.info('Attempting to get git diff...');
+    const diffOutput = JSON.stringify(await getPrFilesChanged());
+    core.info(diffOutput);
+
+    // Store the output of git diff
+    const outputPath = path.resolve(CHANGED_FILES_DIR, 'changed-files.json');
+    fs.writeFileSync(outputPath, diffOutput);
+    core.info(`Git diff results saved to ${outputPath}`);
+
+    writePrBodyAndInfoToFile(prInfo);
+
+    core.info('success');
+  } catch (error: any) {
+    core.setFailed(`Failed to process git diff: ${error.message}`);
+  }
+}
+
+// If main module (i.e. this is the TS file that was run directly)
+if (require.main === module) {
+  storeGitDiffOutputAndPrBody();
+}