Merge branch 'main' into mikesposito/deps/smart-transactions-controller

Author: mikesposito

.depcheckrc.yml

@@ -29,7 +29,8 @@ ignores:
   # Appium drivers are used by Appwright for mobile automation
   - 'appium-uiautomator2-driver'
   - 'appium-xcuitest-driver'
-
+  # Used in scripts/repack for CI optimization
+  - '@expo/repack-app'
   # Note: Everything below this line should be removed after investigation
   # TODO: Investigate each dependency to see whether it's used
 

.github/CODEOWNERS

@@ -82,6 +82,8 @@ app/core/Encryptor/                                         @MetaMask/accounts-e
 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
+**/Identity/**                                              @MetaMask/accounts-engineers
+**/identity/**                                              @MetaMask/accounts-engineers
 
 # Co-owned by accounts and mobile-core-ux
 app/components/Views/AccountSelector                        @MetaMask/accounts-engineers @MetaMask/mobile-core-ux
@@ -104,10 +106,6 @@ app/components/Views/Settings/NotificationsSettings @MetaMask/notifications
 **/notifications/** @MetaMask/notifications
 **/notification/** @MetaMask/notifications
 
-# Identity Team
-**/Identity/** @MetaMask/identity
-**/identity/** @MetaMask/identity
-
 # LavaMoat Team
 ses.cjs                              @MetaMask/supply-chain
 patches/react-native+0.*.patch       @MetaMask/supply-chain

.github/actionlint.yaml

@@ -2,13 +2,17 @@ self-hosted-runner:
   # Labels of self-hosted runner in array of strings.
   labels: 
     - "gha-mmsdk-scale-set-ubuntu-22.04-amd64-xl"
+    - "gha-mmsdk-scale-set-ubuntu-22.04-amd64-xxl"
+    - "gha-mmsdk-scale-set-ubuntu-22.04-amd64-l-kvm"
     - "gha-mmsdk-scale-set-ubuntu-22.04-amd64-large"
     - "gha-mm-scale-set-ubuntu-22.04-amd64-large"
     - "gha-mm-scale-set-ubuntu-22.04-amd64-small"
     - "gha-mm-scale-set-ubuntu-22.04-amd64-med"
     - "macos-15"
     - "ghcr.io/cirruslabs/macos-runner:sequoia"
     - "ghcr.io/cirruslabs/macos-runner:sequoia-xl"
+    - "ghcr.io/cirruslabs/ubuntu-runner-amd64:24.04-lg"
+    - "ghcr.io/cirruslabs/ubuntu-runner-amd64:24.04-xl"
     - "low-priority"
 
 # Configuration variables in array of strings defined in your repository or

.github/scripts/needs-e2e-builds.mjs

@@ -0,0 +1,124 @@
+import fs from 'node:fs';
+
+/**
+ * Convert a string to a boolean. Created to make sure the variables are
+ * evaluated properly by checking if the trimmed, lowercased
+ * string is equal to 'true'.
+ * @param {string} value - The string to convert
+ * @returns {boolean} - The boolean value
+ */
+function isTrue(value) {
+  return String(value).trim().toLowerCase() === 'true';
+}
+
+/**
+ * These variables are set in the workflow file
+ * @type {boolean}
+ */
+const hasAndroidChanges = isTrue(process.env.ANDROID);
+const hasIosChanges = isTrue(process.env.IOS);
+const hasSharedFilesChanges = isTrue(process.env.SHARED);
+const hasIgnoreFiles = process.env.IGNORE_FILES || '';
+const catchAllFiles = process.env.CATCH_ALL_FILES || '';
+const shouldSkipE2E = isTrue(process.env.SHOULD_SKIP_E2E);
+const githubEventName = process.env.GITHUB_EVENT_NAME;
+
+function writeOutputs({ message, willBuildAndroid, willBuildIos, changedFiles }) {
+  const willBuild = willBuildAndroid || willBuildIos ? 'true' : 'false';
+  console.log(message);
+
+  // Write simple, single-line outputs
+  const basicOutputs = [
+    `android_final=${willBuildAndroid}`,
+    `ios_final=${willBuildIos}`,
+    `builds=${willBuild}`,
+  ].join('\n') + '\n';
+  fs.appendFileSync(process.env.GITHUB_OUTPUT, basicOutputs);
+
+  // Write changed_files as a multiline output using a safe heredoc delimiter
+  const value = changedFiles ?? '';
+  if (!value) {
+    fs.appendFileSync(process.env.GITHUB_OUTPUT, 'changed_files=\n');
+  } else {
+    const delimiter = 'GH_EOF';
+    const multiLine = `changed_files<<${delimiter}\n${value}\n${delimiter}\n`;
+    fs.appendFileSync(process.env.GITHUB_OUTPUT, multiLine);
+  }
+}
+
+async function main() {
+  /**
+   * These variables are used to store the build outputs
+   * @type {boolean}
+   */
+  let willBuildAndroid = false;
+  let willBuildIos = false;
+  let changedFiles = '';
+  let message = '';
+
+  // Guard: explicit skip
+  if (shouldSkipE2E) {
+    writeOutputs({
+      message: 'Skipping E2E builds',
+      willBuildAndroid: false,
+      willBuildIos: false,
+      changedFiles: '',
+    });
+    return;
+  }
+
+  // Determine the build outputs
+  const hasChanges = Boolean(catchAllFiles && String(catchAllFiles).trim().length > 0);
+  const isPureIgnore = Boolean(hasIgnoreFiles && hasIgnoreFiles === catchAllFiles);
+
+  if (hasSharedFilesChanges) {
+    message = 'Building both platforms (shared files changes)';
+    willBuildAndroid = true;
+    willBuildIos = true;
+    changedFiles = catchAllFiles;
+  } else if (!hasChanges) {
+    message = 'Ignoring - no changes detected';
+    changedFiles = '';
+  } else if (isPureIgnore) {
+    message = 'Ignoring - no mobile-impacting changes (pure ignore)';
+    changedFiles = '';
+  } else if (hasAndroidChanges || hasIosChanges) {
+    if (hasAndroidChanges && hasIosChanges) {
+      message = 'Building both platforms (mixed changes)';
+      willBuildAndroid = true;
+      willBuildIos = true;
+    } else if (hasAndroidChanges) {
+      message = 'Building Android only (mixed changes)';
+      willBuildAndroid = true;
+      willBuildIos = false;
+    } else {
+      message = 'Building iOS only (mixed changes)';
+      willBuildAndroid = false;
+      willBuildIos = true;
+    }
+    changedFiles = catchAllFiles;
+  } else {
+    // Conservative fallback: unclassified but non-ignored changes
+    message = 'Building both platforms (unclassified changes)';
+    willBuildAndroid = true;
+    willBuildIos = true;
+    changedFiles = catchAllFiles;
+  }
+
+  // On scheduled runs, do not emit changed files to avoid large payloads
+  if (githubEventName === 'schedule') {
+    changedFiles = '';
+  }
+
+  writeOutputs({
+    message,
+    willBuildAndroid,
+    willBuildIos,
+    changedFiles,
+  });
+}
+
+main().catch((error) => {
+  console.error('\n❌ Unexpected error:', error);
+  process.exit(1);
+});

.github/workflows/build-android-e2e.yml

@@ -19,7 +19,7 @@ on:
 jobs:
   build-android-apks:
     name: Build Android E2E APKs
-    runs-on: gha-mmsdk-scale-set-ubuntu-22.04-amd64-xl
+    runs-on: gha-mmsdk-scale-set-ubuntu-22.04-amd64-xxl
     env:
       GRADLE_USER_HOME: /home/runner/_work/.gradle
     outputs:
@@ -60,7 +60,29 @@ jobs:
             echo "🚀 Setting up project..."
             yarn setup:github-ci --no-build-ios
 
+      # Generate fingerprint AFTER setup but BEFORE any build modifications
+      - name: Generate current fingerprint
+        id: generate-fingerprint
+        run: |
+          FINGERPRINT=$(yarn fingerprint:generate)
+          echo "fingerprint=$FINGERPRINT" >> "$GITHUB_OUTPUT"
+          echo "Current fingerprint: ${FINGERPRINT}"
+
+      - name: Check and restore cached APKs if Fingerprint is found
+        id: cache-restore
+        uses: actions/cache@v4
+        with:
+          path: |
+            android/app/build/outputs/apk/prod/release/app-prod-release.apk
+            android/app/build/outputs/apk/androidTest/prod/release/app-prod-release-androidTest.apk
+            android/app/build/outputs/bundle/prodRelease/app-prod-release.aab
+          key: android-apk-${{ steps.generate-fingerprint.outputs.fingerprint }}
+          restore-keys: |
+            android-apk-${{ steps.generate-fingerprint.outputs.fingerprint }}
+            android-apk-
+
       - name: Build Android E2E APKs
+        if: ${{ steps.cache-restore.outputs.cache-hit != 'true' }}
         run: |
           echo "🏗 Building Android E2E APKs..."
           export NODE_OPTIONS="--max-old-space-size=8192"
@@ -103,6 +125,60 @@ jobs:
           GOOGLE_SERVICES_B64_ANDROID: ${{ secrets.GOOGLE_SERVICES_B64_ANDROID }}
           MM_INFURA_PROJECT_ID: ${{ secrets.MM_INFURA_PROJECT_ID }}
 
+      - name: Repack APK with JS updates using @expo/repack-app
+        if: ${{ steps.cache-restore.outputs.cache-hit == 'true' }}
+        run: |
+          echo "📦 Repacking APK with updated JavaScript bundle using @expo/repack-app..."
+          # Use the optimized repack script which uses @expo/repack-app
+          yarn build:repack
+          echo "📦 Final APK size: $(du -h "android/app/build/outputs/apk/prod/release/app-prod-release.apk" | cut -f1)"
+        env:
+          PLATFORM: android
+          METAMASK_ENVIRONMENT: qa
+          METAMASK_BUILD_TYPE: main
+          IS_TEST: true
+          E2E: 'true'
+          IGNORE_BOXLOGS_DEVELOPMENT: true
+          GITHUB_CI: 'true'
+          CI: 'true'
+          NODE_OPTIONS: '--max-old-space-size=8192'
+          MM_UNIFIED_SWAPS_ENABLED: 'true'
+          MM_BRIDGE_ENABLED: 'true'
+          BRIDGE_USE_DEV_APIS: 'true'
+          RAMP_INTERNAL_BUILD: 'true'
+          SEEDLESS_ONBOARDING_ENABLED: 'true'
+          MM_NOTIFICATIONS_UI_ENABLED: 'true'
+          MM_SECURITY_ALERTS_API_ENABLED: 'true'
+          MM_REMOVE_GLOBAL_NETWORK_SELECTOR: 'true'
+          BLOCKAID_FILE_CDN: 'static.cx.metamask.io/api/v1/confirmations/ppom'
+          FEATURES_ANNOUNCEMENTS_ACCESS_TOKEN: ${{ secrets.FEATURES_ANNOUNCEMENTS_ACCESS_TOKEN }}
+          FEATURES_ANNOUNCEMENTS_SPACE_ID: ${{ secrets.FEATURES_ANNOUNCEMENTS_SPACE_ID }}
+          SEGMENT_WRITE_KEY_QA: ${{ secrets.SEGMENT_WRITE_KEY_QA }}
+          SEGMENT_PROXY_URL_QA: ${{ secrets.SEGMENT_PROXY_URL_QA }}
+          SEGMENT_DELETE_API_SOURCE_ID_QA: ${{ secrets.SEGMENT_DELETE_API_SOURCE_ID_QA }}
+          SEGMENT_REGULATIONS_ENDPOINT_QA: ${{ secrets.SEGMENT_REGULATIONS_ENDPOINT_QA }}
+          MM_SENTRY_DSN_TEST: ${{ secrets.MM_SENTRY_DSN_TEST }}
+          MM_SENTRY_AUTH_TOKEN: ${{ secrets.MM_SENTRY_AUTH_TOKEN }}
+          MAIN_IOS_GOOGLE_CLIENT_ID_UAT: ${{ secrets.MAIN_IOS_GOOGLE_CLIENT_ID_UAT }}
+          MAIN_IOS_GOOGLE_REDIRECT_URI_UAT: ${{ secrets.MAIN_IOS_GOOGLE_REDIRECT_URI_UAT }}
+          MAIN_ANDROID_APPLE_CLIENT_ID_UAT: ${{ secrets.MAIN_ANDROID_APPLE_CLIENT_ID_UAT }}
+          MAIN_ANDROID_GOOGLE_CLIENT_ID_UAT: ${{ secrets.MAIN_ANDROID_GOOGLE_CLIENT_ID_UAT }}
+          MAIN_ANDROID_GOOGLE_SERVER_CLIENT_ID_UAT: ${{ secrets.MAIN_ANDROID_GOOGLE_SERVER_CLIENT_ID_UAT }}
+          GOOGLE_SERVICES_B64_IOS: ${{ secrets.GOOGLE_SERVICES_B64_IOS }}
+          GOOGLE_SERVICES_B64_ANDROID: ${{ secrets.GOOGLE_SERVICES_B64_ANDROID }}
+          MM_INFURA_PROJECT_ID: ${{ secrets.MM_INFURA_PROJECT_ID }}
+
+      # Cache build artifacts with the pre-build fingerprint
+      - name: Cache build artifacts
+        if: ${{ steps.cache-restore.outputs.cache-hit != 'true' }}
+        uses: actions/cache@v4
+        with:
+          path: |
+            android/app/build/outputs/apk/prod/release/app-prod-release.apk
+            android/app/build/outputs/apk/androidTest/prod/release/app-prod-release-androidTest.apk
+            android/app/build/outputs/bundle/prodRelease/app-prod-release.aab
+          key: android-apk-${{ steps.generate-fingerprint.outputs.fingerprint }}
+
       - name: Upload Android APK
         id: upload-apk
         uses: actions/upload-artifact@v4

.github/workflows/build-android-upload-to-browserstack.yml

@@ -71,7 +71,7 @@ jobs:
 
   build-android-dual:
     name: Build Android Dual Versions
-    runs-on: gha-mmsdk-scale-set-ubuntu-22.04-amd64-xl
+    runs-on: gha-mmsdk-scale-set-ubuntu-22.04-amd64-xxl
     needs: [check-builds-needed]
     env:
       GRADLE_USER_HOME: /home/runner/_work/.gradle