Merge branch 'main' into feat/793-oneKey-dedicated-keyring

Author: Akaryatrh

.circleci/config.yml

@@ -276,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
@@ -368,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:
@@ -377,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:

.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,175 @@
+import { exec as execCallback } from 'child_process';
+import fs from 'fs';
+import path from 'path';
+import { promisify } from 'util';
+import { context } from '@actions/github';
+import * as core from '@actions/core';
+
+const exec = promisify(execCallback);
+
+// Get PR number from GitHub Actions environment variables
+const PR_NUMBER = context.payload.pull_request?.number;
+
+const GITHUB_DEFAULT_BRANCH = 'main';
+const SOURCE_BRANCH = PR_NUMBER ? `refs/pull/${PR_NUMBER}/head` : '';
+
+const CHANGED_FILES_DIR = 'changed-files';
+
+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;
+
+  const response = await fetch(
+    `https://api.github.com/repos/${owner}/${repo}/pulls/${PR_NUMBER}`,
+    {
+      headers: {
+        Authorization: `token ${process.env.GITHUB_TOKEN}`,
+        Accept: 'application/vnd.github.v3+json',
+      },
+    },
+  );
+
+  return await response.json();
+}
+
+/**
+ * Fetches the git repository with a specified depth.
+ *
+ * @param depth - The depth to use for the fetch command.
+ * @returns True if the fetch is successful, otherwise false.
+ */
+async function fetchWithDepth(depth: number): Promise<boolean> {
+  try {
+    await exec(`git fetch --depth ${depth} origin "${GITHUB_DEFAULT_BRANCH}"`);
+    if (SOURCE_BRANCH) {
+      await exec(
+        `git fetch --depth ${depth} origin "${SOURCE_BRANCH}:${SOURCE_BRANCH}"`,
+      );
+    }
+    return true;
+  } catch (error) {
+    core.warning(`Failed to fetch with depth ${depth}:`, error);
+    return false;
+  }
+}
+
+/**
+ * Attempts to fetch the necessary commits until the merge base is found.
+ * It tries different fetch depths and performs a full fetch if needed.
+ *
+ * @throws If an unexpected error occurs during the execution of git commands.
+ */
+async function fetchUntilMergeBaseFound() {
+  const depths = [1, 10, 100];
+  for (const depth of depths) {
+    core.info(`Attempting git diff with depth ${depth}...`);
+    await fetchWithDepth(depth);
+
+    try {
+      await exec(`git merge-base origin/${GITHUB_DEFAULT_BRANCH} HEAD`);
+      return;
+    } catch (error: unknown) {
+      if (error instanceof Error && 'code' in error) {
+        core.warning(
+          `Error 'no merge base' encountered with depth ${depth}. Incrementing depth...`,
+        );
+      } else {
+        throw error;
+      }
+    }
+  }
+  await exec(`git fetch --unshallow origin "${GITHUB_DEFAULT_BRANCH}"`);
+}
+
+/**
+ * Performs a git diff command to get the list of files changed between the current branch and the origin.
+ * It first ensures that the necessary commits are fetched until the merge base is found.
+ *
+ * @returns The output of the git diff command, listing the file paths with status (A, M, D).
+ * @throws If unable to get the diff after fetching the merge base or if an unexpected error occurs.
+ */
+async function gitDiff(): Promise<string> {
+  await fetchUntilMergeBaseFound();
+  const { stdout: diffResult } = await exec(
+    `git diff --name-status "origin/${GITHUB_DEFAULT_BRANCH}...${
+      SOURCE_BRANCH || 'HEAD'
+    }"`,
+  );
+  if (!diffResult) {
+    throw new Error('Unable to get diff after full checkout.');
+  }
+  return diffResult;
+}
+
+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 = await gitDiff();
+    core.info(diffOutput);
+
+    // Store the output of git diff
+    const outputPath = path.resolve(CHANGED_FILES_DIR, 'changed-files.txt');
+    fs.writeFileSync(outputPath, diffOutput.trim());
+    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();
+}

.github/workflows/build-beta.yml

@@ -50,9 +50,10 @@ jobs:
       - name: Run beta build
         if: ${{ steps.needs-beta-build.outputs.NEEDS_BETA_BUILD == 'true' }}
         env:
-          INFURA_PROJECT_ID: 00000000000
-          INFURA_BETA_PROJECT_ID: 00000000000
+          INFURA_PROJECT_ID: ${{ vars.INFURA_PROJECT_ID }}
+          INFURA_BETA_PROJECT_ID: ${{ vars.INFURA_BETA_PROJECT_ID }}
           SEGMENT_BETA_WRITE_KEY: 00000000000
+          SENTRY_DSN: https://[email protected]/0000000
           ENABLE_MV3: true
         run: |
           yarn build --build-type beta --platform='chrome' dist

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

@@ -14,7 +14,7 @@ on:
         required: true
 jobs:
   create-release-pr:
-    uses: MetaMask/github-tools/.github/workflows/create-release-pr.yml@4f594ca7d90378da66b7efce987eff379934524b
+    uses: MetaMask/github-tools/.github/workflows/create-release-pr.yml@3e0b0204e41b576263b9060945de3b3b9b8c5448
     with:
       platform: extension
       base-branch: ${{ inputs.base-branch }}
@@ -23,6 +23,7 @@ jobs:
     secrets:
       # This token needs write permissions to metamask-extension & read permissions to metamask-planning
       github-token: ${{ secrets.PR_TOKEN }}
+      google-application-creds-base64: ${{ secrets.GCP_RLS_SHEET_ACCOUNT_BASE64 }}
     permissions:
       contents: write
       pull-requests: write

.github/workflows/locales-only.yml

@@ -0,0 +1,30 @@
+name: Locales only
+
+on:
+  pull_request:
+    types:
+      - opened
+      - reopened
+      - synchronize
+
+jobs:
+  locales-only:
+    # For the `pull_request` event, the branch is `github.head_ref``.
+    if: ${{ github.head_ref == 'l10n_crowdin_action' }}
+    runs-on: ubuntu-latest
+    env:
+      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+    steps:
+      - name: Checkout and setup environment
+        uses: metamask/github-tools/.github/actions/checkout-and-setup@1299bb1de0c6974ae6d0a32c7e8897fe168239ac
+        with:
+          is-high-risk-environment: false
+
+      - name: Get changed files with git diff
+        run: yarn tsx .github/scripts/git-diff-default-branch.ts
+
+      - name: Validate locales only
+        run: yarn tsx .circleci/scripts/validate-locales-only.ts
+
+      - name: Run lint
+        run: yarn lint && yarn verify-locales --quiet

.github/workflows/main.yml

@@ -17,12 +17,13 @@ on:
 jobs:
   prep-deps:
     runs-on: ubuntu-latest
+    if: ${{ github.head_ref != 'l10n_crowdin_action' }}
     steps:
       - name: Checkout and setup environment
         uses: metamask/github-tools/.github/actions/checkout-and-setup@1299bb1de0c6974ae6d0a32c7e8897fe168239ac
         with:
           is-high-risk-environment: false
-          cache-node-modules: 'true'
+          cache-node-modules: true
 
   lint-workflows:
     name: Lint workflows

.storybook/test-data.js

@@ -10,7 +10,10 @@ import { copyable, divider, heading, panel, text } from '@metamask/snaps-sdk';
 import { getJsxElementFromComponent } from '@metamask/snaps-utils';
 import { FirstTimeFlowType } from '../shared/constants/onboarding';
 import { ETH_EOA_METHODS } from '../shared/constants/eth-methods';
-import { mockNetworkState, mockMultichainNetworkState } from '../test/stub/networks';
+import {
+  mockNetworkState,
+  mockMultichainNetworkState,
+} from '../test/stub/networks';
 
 const state = {
   invalidCustomNetwork: {
@@ -1257,6 +1260,16 @@ const state = {
         accounts: ['0x9d0ba4ddac06032527b140912ec808ab9451b788'],
       },
     ],
+    keyringsMetadata: [
+      {
+        id: '01JN08SYECPZHFHB3K0J1NHJ4H',
+        name: '',
+      },
+      {
+        id: '01JN08T38HEXPYQX2HKP1FCRMZ',
+        name: '',
+      },
+    ],
     ...mockNetworkState(
       {
         id: 'test-networkConfigurationId-1',