feat: v7.50.0

.depcheckrc.yml

@@ -1,6 +1,7 @@
 # List things here that *are - 'used, that depcheck is wrong about'
 ignores:
   - '@metamask/oss-attribution-generator'
+  - '@metamask/test-dapp-multichain'
   - 'webpack-cli'
   - '@react-native-community/datetimepicker'
   - '@react-native-community/slider'
@@ -10,6 +11,8 @@ ignores:
   - 'babel-plugin-inline-import'
   # This is used in index.d.ts
   - '@sentry/react'
+  # These dependencies are needed for react-compiler - https://react.dev/learn/react-compiler#using-react-compiler-with-react-17-or-18
+  - 'react-compiler-runtime'
   # This is used on the patch for TokenRatesController of Assets controllers, for we to be able to use the last version of it
   - cockatiel
 
@@ -49,7 +52,6 @@ ignores:
   - 'prettier-plugin-gherkin'
   - 'react-native-svg-asset-plugin'
   - 'regenerator-runtime'
-  - 'rn-nodeify'
 
   ## Unused devDependencies to investigate
   - '@metamask/swappable-obj-proxy'

.detoxrc.js

@@ -87,7 +87,8 @@ module.exports = {
   apps: {
     'ios.debug': {
       type: 'ios.app',
-      binaryPath: 'ios/build/Build/Products/Debug-iphonesimulator/MetaMask.app',
+      binaryPath:
+        process.env.PREBUILT_IOS_APP_PATH || 'ios/build/Build/Products/Debug-iphonesimulator/MetaMask.app',
       build: 'yarn start:ios:e2e',
     },
     'ios.qa': {
@@ -98,7 +99,8 @@ module.exports = {
     },
     'android.debug': {
       type: 'android.apk',
-      binaryPath: 'android/app/build/outputs/apk/prod/debug/app-prod-debug.apk',
+      binaryPath: process.env.PREBUILT_ANDROID_APK_PATH || 'android/app/build/outputs/apk/prod/debug/app-prod-debug.apk',
+      testBinaryPath: process.env.PREBUILT_ANDROID_TEST_APK_PATH,
       build: 'yarn start:android:e2e',
     },
     'android.qa': {

.e2e.env.example

@@ -5,3 +5,14 @@ export MM_TEST_ACCOUNT_PRIVATE_KEY=''
 export IS_TEST="true"
 # Temporary mechanism to enable security alerts API prior to release.
 export MM_SECURITY_ALERTS_API_ENABLED="true"
+
+# Multichain test dapp URL configuration
+# By default, uses the local embedded test dapp
+# Set USE_LOCAL_DAPP=false to use a remote dapp URL instead
+export USE_LOCAL_DAPP=true
+
+# Remote dapp URL (only used when USE_LOCAL_DAPP=false)
+# Option 1: Use the official MetaMask test dapp
+export MULTICHAIN_DAPP_URL="https://metamask.github.io/test-dapp-multichain/latest/"
+# Option 2: Use a custom remote URL
+# export MULTICHAIN_DAPP_URL="https://your-multichain-dapp.example.com/"

.eslintrc.js

@@ -12,7 +12,8 @@ module.exports = {
     'plugin:import/warnings',
     'plugin:react/recommended',
   ],
-  plugins: ['@typescript-eslint', '@metamask/design-tokens'],
+  // ESLint can find the plugin without the `eslint-plugin-` prefix. Ex. `eslint-plugin-react-compiler` -> `react-compiler`
+  plugins: ['@typescript-eslint', '@metamask/design-tokens', 'react-compiler'],
   overrides: [
     {
       files: ['*.{ts,tsx}'],
@@ -136,6 +137,8 @@ module.exports = {
   },
 
   rules: {
+    // Set to error once all warnings reported by React Compiler are resolved
+    'react-compiler/react-compiler': 'warn',
     'no-catch-shadow': 0,
     'no-console': ['error', { allow: ['warn', 'error'] }],
     quotes: [

.github/CODEOWNERS

@@ -7,14 +7,23 @@ app/component-library/               @MetaMask/design-system-engineers
 # Platform Team
 .github/CODEOWNERS                                          @MetaMask/mobile-platform
 patches/                                                    @MetaMask/mobile-platform
-app/core/Analytics/                                         @MetaMask/mobile-platform
+app/core/Analytics/index.ts                                 @MetaMask/mobile-platform
+app/core/Analytics/MetaMetrics.constants.ts                 @MetaMask/mobile-platform
+app/core/Analytics/MetaMetrics.test.ts                      @MetaMask/mobile-platform
+app/core/Analytics/MetaMetrics.ts                           @MetaMask/mobile-platform
+app/core/Analytics/MetaMetrics.types.ts                     @MetaMask/mobile-platform
+app/core/Analytics/MetaMetricsPrivacySegmentPlugin.ts       @MetaMask/mobile-platform
+app/core/Analytics/MetaMetricsPrivacySegmentPlugin.test.ts  @MetaMask/mobile-platform
+app/core/Analytics/MetaMetricsTestUtils.test.ts             @MetaMask/mobile-platform
+app/core/Analytics/MetaMetricsTestUtils.ts                  @MetaMask/mobile-platform
+app/core/Analytics/MetricsEventBuilder.test.ts              @MetaMask/mobile-platform
+app/core/Analytics/MetricsEventBuilder.ts                   @MetaMask/mobile-platform
 app/util/metrics/                                           @MetaMask/mobile-platform
 app/components/hooks/useMetrics/                            @MetaMask/mobile-platform
 app/selectors/featureFlagController/*                       @MetaMask/mobile-platform
 app/selectors/featureFlagController/minimumAppVersion/      @MetaMask/mobile-platform
 app/store/migrations/                                       @MetaMask/mobile-platform
 bitrise.yml                                                 @MetaMask/mobile-platform
-yarn.lock                                                   @MetaMask/mobile-platform
 ios/Podfile.lock                                            @MetaMask/mobile-platform
 app/components/Views/BrowserTab/BrowserTab.tsx              @MetaMask/mobile-platform
 app/components/Nav/NavigationProvider                       @MetaMask/mobile-platform
@@ -64,6 +73,16 @@ app/util/walletconnect.js   @MetaMask/sdk-devs
 app/core/Encryptor/                                         @MetaMask/accounts-engineers
 app/core/Engine/controllers/accounts-controller             @MetaMask/accounts-engineers
 app/core/Engine/messengers/accounts-controller-messenger    @MetaMask/accounts-engineers
+app/core/SnapKeyring                                        @MetaMask/accounts-engineers
+
+# Co-owned by accounts and wallet-ux
+app/components/Views/AccountSelector                        @MetaMask/accounts-engineers @MetaMask/wallet-ux
+app/components/UI/EvmAccountSelectorList                    @MetaMask/accounts-engineers @MetaMask/wallet-ux
+
+# Multichain Accounts
+**/multichain-accounts/**                                   @MetaMask/accounts-engineers
+**/MultichainAccounts/**                                    @MetaMask/accounts-engineers
+**/multichainAccounts/**                                    @MetaMask/accounts-engineers
 
 # Swaps Team
 app/components/UI/Swaps              @MetaMask/swaps-engineers
@@ -124,6 +143,7 @@ app/components/UI/CollectibleMedia @MetaMask/metamask-assets
 app/components/UI/CollectibleModal @MetaMask/metamask-assets
 app/components/UI/CollectibleOverview @MetaMask/metamask-assets
 app/components/UI/ConfirmAddAsset @MetaMask/metamask-assets
+app/components/UI/DeFiPositions @MetaMask/metamask-assets
 app/components/UI/Tokens @MetaMask/metamask-assets
 app/components/Views/AddAsset @MetaMask/metamask-assets
 app/components/Views/Asset @MetaMask/metamask-assets
@@ -136,6 +156,8 @@ app/components/Views/DetectedTokens @MetaMask/metamask-assets
 app/components/Views/NFTAutoDetectionModal @MetaMask/metamask-assets
 app/components/Views/NftDetails @MetaMask/metamask-assets
 app/reducers/collectibles @MetaMask/metamask-assets
+app/core/Engine/controllers/defi-positions-controller @MetaMask/metamask-assets
+app/core/Engine/messengers/defi-positions-controller-messenger @MetaMask/metamask-assets
 
 # UX Team
 app/components/Views/AccountActions @MetaMask/wallet-ux
@@ -146,7 +168,6 @@ app/components/Views/LockScreen @MetaMask/wallet-ux
 app/components/Views/Login @MetaMask/wallet-ux
 app/components/Views/NetworkConnect @MetaMask/wallet-ux
 app/components/Views/NetworkSelector @MetaMask/wallet-ux
-app/components/Views/Onboarding @MetaMask/wallet-ux
 app/components/Views/OnboardingCarousel @MetaMask/wallet-ux
 app/components/Views/OnboardingSuccess @MetaMask/wallet-ux
 app/components/Views/QRAccountDisplay @MetaMask/wallet-ux
@@ -156,13 +177,17 @@ app/components/Views/TermsAndConditions @MetaMask/wallet-ux
 app/reducers/experimentalSettings @MetaMask/wallet-ux
 app/reducers/modals @MetaMask/wallet-ux
 app/reducers/navigation @MetaMask/wallet-ux
-app/reducers/onboarding @MetaMask/wallet-ux
 app/reducers/privacy @MetaMask/wallet-ux
 app/reducers/settings @MetaMask/wallet-ux
 
 # Transactions Team
 app/components/Views/transactions @MetaMask/transactions
 
+# Web3auth Team
+app/components/Views/Onboarding @MetaMask/web3auth
+app/reducers/onboarding @MetaMask/web3auth
+
+
 # Snapshots – no code owners assigned
 # This allows anyone with write access to approve changes to any *.snap files.
 # ⚠️ Note: Leaving this rule unassigned disables Code Owner review enforcement for snapshot files.

.github/guidelines/CODING_GUIDELINES.md

@@ -70,7 +70,7 @@ const Foo = class extends React.PureComponent {
 
 ### 9. Write Tests for Each Component/Utility
 - Write tests for the components you create as it reduces the possibilities of errors. Testing ensures that the components are behaving as you would expect. In this project Jest is used, and it provides an environment where you can execute your tests.
-- Follow the contributor docs [Unit Testing Guidelines](https://github.com/MetaMask/contributor-docs/blob/main/docs/unit-testing.md).
+- Follow the contributor docs [Unit Testing Guidelines](https://github.com/MetaMask/contributor-docs/blob/main/docs/testing/unit-testing.md).
 
 ### 10. External packages should be well maintained
 - New packages should only be integrated if the application doesn’t have the existing functionality and it cannot be added by implementing a small utility function. Use the https://snyk.io/advisor/ to assess the popularity, maintainability and security analysis. The package must be in good standing to be added to the project.

.github/scripts/bitrise/bitrise-results-check.ts

@@ -88,4 +88,4 @@ async function main(): Promise<void> {
   main().catch((error: Error): void => {
     console.error(error);
     process.exit(1);
-  });
+  });

.github/scripts/bitrise/bitrise-utils.ts

@@ -133,6 +133,11 @@ export async function removeLabel(label: string) {
   }
 }
 
+export function isMergeFromMainBranch(commitMessage: string): boolean {
+  const mergeFromMainCommitMessagePrefix = `Merge branch 'main' into`;
+  return commitMessage.startsWith(mergeFromMainCommitMessagePrefix);
+}
+
 export async function getLatestAssociatedBitriseComment(commitHashes: string[]): Promise<GithubComment | undefined> {
 
   // Get all Bitrise comments
@@ -145,16 +150,48 @@ export async function getLatestAssociatedBitriseComment(commitHashes: string[]):
 
   console.log(`Checking if recent commits have Bitrise comments: ${commitHashes}`);
 
-  // Iterate through each commit hash to find the first matching Bitrise comment
-  // Return the first matching comment as our commits are sorted by newest to oldest
-  for (let i = 0; i < commitHashes.length; i++) {
-    const foundComment = comments.find(comment => comment.commitSha === commitHashes[i]);
-    if (foundComment) {
-      return foundComment;
+  // Check if the latest commit has a Bitrise comment
+  if (commitHashes.length > 0) {
+    const latestCommit = commitHashes[0];
+    const latestCommitComment = comments.find(comment => comment.commitSha === latestCommit);
+
+    if (latestCommitComment) {
+      console.log(`Found Bitrise comment for latest commit: ${latestCommit}`);
+      return latestCommitComment;
+    }
+
+    // If we're here, the latest commit doesn't have a Bitrise comment
+    // Get commit messages to check if they're merge commits
+    const { owner, repo, number: pullRequestNumber } = context.issue;
+    const { data: commits } = await getOctokitInstance().rest.pulls.listCommits({
+      owner,
+      repo,
+      pull_number: pullRequestNumber
+    });
+
+    // Create a map of commit SHA to commit message
+    const commitMessages = new Map<string, string>();
+    commits.forEach(commit => {
+      commitMessages.set(commit.sha, commit.commit.message);
+    });
+
+    // Check older commits, but only consider those that are merge commits from main
+    for (let i = 1; i < commitHashes.length; i++) {
+      const commitHash = commitHashes[i];
+      const commitMessage = commitMessages.get(commitHash) || '';
+
+      // Only consider this commit if it's a merge from main
+      if (isMergeFromMainBranch(commitMessage)) {
+        const foundComment = comments.find(comment => comment.commitSha === commitHash);
+        if (foundComment) {
+          console.log(`Found Bitrise comment for merge commit: ${commitHash}`);
+          return foundComment;
+        }
+      }
     }
   }
 
-  return undefined
+  return undefined;
 }
 
 export async function getBitriseTestStatus(bitriseComment: GithubComment): Promise<BitriseTestStatus> {
@@ -344,4 +381,4 @@ export function shouldRunBitriseE2E(flags : E2ERunFlags): [boolean, string] {
 
   // Default case if no conditions met
   return [false, "Unexpected scenario or no relevant labels found."];
-}
+}

.github/scripts/bitrise/run-bitrise-e2e-check.ts

@@ -45,7 +45,7 @@ async function main(): Promise<void> {
   const removeAndApplyInstructions = `Remove and re-apply the "${e2eLabel}" label to trigger a E2E smoke test on Bitrise.`;
   const mergeFromMainCommitMessagePrefix = `Merge branch 'main' into`;
   const pullRequestLink = `https://github.com/MetaMask/metamask-mobile/pull/${pullRequestNumber}`;
-  const statusCheckName = 'Bitrise E2E Status';
+  const statusCheckName = process.env.STATUS_CHECK_NAME || 'Bitrise E2E Status';
   const statusCheckTitle = 'Bitrise E2E Smoke Test Run';
 
   // Define Bitrise comment tags
@@ -102,8 +102,9 @@ async function main(): Promise<void> {
   const [shouldRun, reason] = shouldRunBitriseE2E(flags);
   console.log(`Should run: ${shouldRun}, Reason: ${reason}`);
 
-  // One of these two labels must exist for pull_request type
-  if (!mergeQueue && !flags.hasSmokeTestLabel && !flags.hasAntiLabel) {
+  // One of these two labels must exist for pull_request type (unless it's a custom Flask workflow)
+  const isFlaskWorkflow = process.env.STATUS_CHECK_NAME && process.env.STATUS_CHECK_NAME !== 'Bitrise E2E Status';
+  if (!mergeQueue && !flags.hasSmokeTestLabel && !flags.hasAntiLabel && !isFlaskWorkflow) {
 
     // Fail Status due to missing labels
     await upsertStatusCheck(statusCheckName, latestCommitHash, StatusCheckStatusType.Completed, 

.github/workflows/check-pr-max-lines.yml

@@ -0,0 +1,12 @@
+name: "Check PR Max Lines"
+
+on:
+  pull_request:
+    types: [opened, reopened, synchronize]
+
+jobs:
+  check-pr-max-lines:
+    uses: metamask/github-tools/.github/workflows/pr-line-check.yml@main
+    with:
+      max_lines: 1000
+      ignore_patterns: '(\.lock|\.snap)$'

.github/workflows/run-bitrise-flask-e2e-check.yml

@@ -0,0 +1,44 @@
+name: Run Bitrise Flask E2E Check
+
+on:
+  issue_comment:
+    types: [edited, deleted]
+  pull_request:
+    types: [opened, reopened, labeled, unlabeled, synchronize]
+
+env:
+  E2E_LABEL: 'Run Flask E2E'
+  NO_E2E_LABEL: 'No Flask E2E Needed'
+  E2E_PIPELINE: 'flask_smoke_e2e_pipeline'
+  WORKFLOW_NAME: 'run-bitrise-flask-e2e-check'
+
+jobs:
+  run-bitrise-flask-e2e-check:
+    runs-on: ubuntu-latest
+    permissions:
+      pull-requests: write
+      contents: write
+      checks: write
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Set up Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version-file: '.nvmrc'
+
+      - name: Install dependencies
+        run: yarn --immutable
+        working-directory: '.github/scripts'
+
+      - name: Check Bitrise Flask E2E Status
+        env:
+          BITRISE_BUILD_TRIGGER_TOKEN: ${{ secrets.BITRISE_BUILD_TRIGGER_TOKEN }}
+          BITRISE_APP_ID: ${{ secrets.BITRISE_APP_ID }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          STATUS_CHECK_NAME: 'Bitrise Flask E2E Status'
+        # The status check created under this workflow may be bucketed under another check suite in Github actions. This is a result of workflows with the same triggers.
+        # For example, the status check may show as `CLA Signature Bot / Bitrise Flask E2E Status`. This is a bug on Github's UI. https://github.com/orgs/community/discussions/24616
+        run: yarn run run-bitrise-e2e-check
+        working-directory: '.github/scripts' 

.github/workflows/stale-issue-pr.yml

@@ -1,29 +1,13 @@
 name: 'Close stale issues and PRs'
+
+# run once daily at midnight (UTC)
 on:
   schedule:
-    - cron: '30 * * * *'
+    - cron: '0 0 * * *'
 
 jobs:
   stale:
-    runs-on: ubuntu-latest
+    uses: metamask/github-tools/.github/workflows/stale-issue-pr.yml@566da3332757544da431707bde71a242b182b3ac
     permissions:
       issues: write
       pull-requests: write
-    steps:
-      - uses: actions/stale@72afbce2b0dbd1d903bb142cebe2d15dc307ae57
-        with:
-          stale-issue-message: 'This issue has been automatically marked as stale because it has not had recent activity in the last 90 days. It will be closed in 7 days. Thank you for your contributions.'
-          stale-issue-label: 'stale'
-          only-issue-labels: 'type-bug'
-          exempt-issue-labels: 'type-security, type-pinned, feature-request, awaiting-metamask'
-          stale-pr-message: 'This PR has been automatically marked as stale because it has not had recent activity in the last 90 days. It will be closed in 7 days. Thank you for your contributions.'
-          stale-pr-label: 'stale'
-          exempt-pr-labels: 'work-in-progress'
-          close-issue-message: 'This issue was closed because there has been no follow activity in 7 days. If you feel this was closed in error please provide evidence on the current production app in a new issue or comment in the existing issue to a maintainer. Thank you for your contributions.'
-          close-pr-message: 'This PR was closed because there has been no follow up activity in 7 days. Thank you for your contributions.'
-          days-before-issue-stale: 90
-          days-before-pr-stale: 90
-          days-before-issue-close: 7
-          days-before-pr-close: 7
-          operations-per-run: 200
-

.gitignore

@@ -110,6 +110,8 @@ browserstack.err
 # Reports generated by tests
 e2e/reports
 
+# anvil binaries
+.metamask/*
 # ppom
 ppom/node_modules
 ppom/dist