Merge branch 'main' of github.com:MetaMask/metamask-mobile into chore/respect-js-env-build-variants

Author: Cal-L

.github/workflows/ci.yml

@@ -11,7 +11,7 @@ on:
     - cron: '0 2-6 * * *'
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
+  group: ${{ github.workflow }}-${{ github.ref == 'refs/heads/main' && github.sha || github.ref }}
   cancel-in-progress: ${{ !(contains(github.ref, 'refs/heads/main') || contains(github.ref, 'refs/heads/stable')) }}
 
 jobs:
@@ -108,7 +108,7 @@ jobs:
         scripts:
           - lint
           - lint:tsc
-          - format:check:changed
+          - format:check
           - audit:ci
           - test:depcheck
           - test:tgz-check
@@ -470,30 +470,9 @@ jobs:
       - name: Check workflow files
         run: ${{ steps.download-actionlint.outputs.executable }} -color -config-file .github/actionlint.yaml
         shell: bash
-  all-jobs-pass-merge-pr:
-    name: All jobs pass
-    runs-on: ubuntu-latest
-    if: ${{ github.event_name != 'merge_group' }}
-    needs:
-      [
-        check-diff,
-        dedupe,
-        scripts,
-        unit-tests,
-        check-workflows,
-        js-bundle-size-check,
-        sonar-cloud-quality-gate-status,
-      ]
-    outputs:
-      ALL_JOBS_PASSED: ${{ steps.jobs-passed-status.outputs.ALL_JOBS_PASSED }}
-    steps:
-      - name: Set jobs passed status
-        id: jobs-passed-status
-        run: echo "ALL_JOBS_PASSED=true" >> "$GITHUB_OUTPUT"
   all-jobs-pass:
-    name: All jobs pass (merge_group)
+    name: All jobs pass
     runs-on: ubuntu-latest
-    if: ${{ github.event_name == 'merge_group' }}
     needs:
       [
         check-diff,
@@ -510,19 +489,19 @@ jobs:
       - name: Set jobs passed status
         id: jobs-passed-status
         run: echo "ALL_JOBS_PASSED=true" >> "$GITHUB_OUTPUT"
-  check-all-jobs-pass-merge-pr:
+  check-all-jobs-pass:
     name: Check all jobs pass
-    if: ${{ github.event_name != 'merge_group' && always() }}
+    if: ${{ always() }}
     runs-on: ubuntu-latest
     needs:
-      - all-jobs-pass-merge-pr
+      - all-jobs-pass
       - needs_e2e_build
       - e2e-smoke-tests-android
       - e2e-smoke-tests-ios
     steps:
       - run: |
           # Check if all non-E2E jobs passed
-          if [[ "${{ needs.all-jobs-pass-merge-pr.outputs.ALL_JOBS_PASSED }}" != "true" ]]; then
+          if [[ "${{ needs.all-jobs-pass.outputs.ALL_JOBS_PASSED }}" != "true" ]]; then
             echo "Non-E2E jobs failed"
             exit 1
           fi
@@ -540,19 +519,6 @@ jobs:
           fi
 
           echo "All required jobs passed"
-  check-all-jobs-pass:
-    name: Check all jobs pass (merge_group)
-    runs-on: ubuntu-latest
-    needs: all-jobs-pass
-    if: ${{ github.event_name == 'merge_group' && always() }}
-    steps:
-      - run: |
-          if [[ "${{ needs.all-jobs-pass.outputs.ALL_JOBS_PASSED }}" == "true" ]]; then
-            echo "All jobs passed. Unblock PR."
-          else
-            echo "All jobs passed step skipped. Block PR."
-            exit 1
-          fi
 
   log-merge-group-failure:
     name: Log merge group failure

.github/workflows/run-e2e-regression-tests-android.yml

@@ -23,6 +23,10 @@ jobs:
       contents: read
       id-token: write
     uses: ./.github/workflows/build-android-e2e.yml
+    with:
+      build_type: 'main'
+      metamask_environment: 'e2e'
+      keystore_target: 'qa'
     secrets: inherit
 
   regression-confirmations-android:

.github/workflows/run-e2e-smoke-tests-android.yml

@@ -119,6 +119,21 @@ jobs:
       changed_files: ${{ inputs.changed_files }}
     secrets: inherit
 
+  prediction-market-android-smoke:
+    strategy:
+      matrix:
+        split: [1]
+      fail-fast: false
+    uses: ./.github/workflows/run-e2e-workflow.yml
+    with:
+      test-suite-name: prediction_market_android_smoke-${{ matrix.split }}
+      platform: android
+      test_suite_tag: 'SmokePredictions'
+      split_number: ${{ matrix.split }}
+      total_splits: 1
+      changed_files: ${{ inputs.changed_files }}
+    secrets: inherit
+
   rewards-android-smoke:
     strategy:
       matrix:
@@ -146,6 +161,7 @@ jobs:
       - network-abstraction-android-smoke
       - network-expansion-android-smoke
       - confirmations-redesigned-android-smoke
+      - prediction-market-android-smoke
       - rewards-android-smoke
     steps:
       - name: Checkout

.github/workflows/run-e2e-smoke-tests-ios.yml

@@ -119,6 +119,21 @@ jobs:
       changed_files: ${{ inputs.changed_files }}
     secrets: inherit
 
+  prediction-market-ios-smoke:
+    strategy:
+      matrix:
+        split: [1]
+      fail-fast: false
+    uses: ./.github/workflows/run-e2e-workflow.yml
+    with:
+      test-suite-name: prediction_market_ios_smoke-${{ matrix.split }}
+      platform: ios
+      test_suite_tag: 'SmokePredictions'
+      split_number: ${{ matrix.split }}
+      total_splits: 1
+      changed_files: ${{ inputs.changed_files }}
+    secrets: inherit
+
   rewards-ios-smoke:
     strategy:
       matrix:
@@ -146,6 +161,7 @@ jobs:
       - accounts-ios-smoke
       - network-abstraction-ios-smoke
       - network-expansion-ios-smoke
+      - prediction-market-ios-smoke
       - rewards-ios-smoke
     steps:
       - name: Checkout

.husky/pre-push

@@ -1,21 +1,15 @@
-# Sign up and generate your own keys at pubnub.com
-# Then rename this file to ".js.env" and rebuild the app
-#
-# In order for this feature to work properly, you need to
-# build metamask-extension from source (https://github.com/MetaMask/metamask-extension)
-# and set your the same values there.
-#
-# For more info take a look at https://github.com/MetaMask/metamask-extension/pull/5955
-
-export MM_PUBNUB_SUB_KEY=""
-export MM_PUBNUB_PUB_KEY=""
-export MM_FOX_CODE="EXAMPLE_FOX_CODE"
-
-# NOTE: Non-MetaMask only, will need to create an account and generate
-# API key at https://infura.io in order to connect to main and test nets.
-# More info: https://github.com/MetaMask/metamask-mobile/issues/1984
+# NOTE: External contributors only - create account at https://developer.metamask.io,
+# generate API key, add API key to MM_INFURA_PROJECT_ID below, then rename this file to ".js.env" and rebuild the app.
+# Internal contributors: get .js.env file from 1Password.
 
 export MM_INFURA_PROJECT_ID="null"
+
+# MetaMask Fox Code
+# Used as cryptographic salt automatically by app for encryption and transaction identification
+# Internal contributors: get real value from 1Password and add to .js.env if needed
+# External contributors: leave as "EXAMPLE_FOX_CODE"
+export MM_FOX_CODE="EXAMPLE_FOX_CODE"
+
 export IGNORE_BOXLOGS_DEVELOPMENT="false"
 
 # Sentry.init dsn value

.js.env.example

@@ -0,0 +1,22 @@
+diff --git a/dist/constants.cjs b/dist/constants.cjs
+index 394aca551c114318741b7b54b04ea357de636f88..b35ea08439b898cfba2ca4d9a5005856d7ac77b3 100644
+--- a/dist/constants.cjs
++++ b/dist/constants.cjs
+@@ -14,5 +14,6 @@ exports.POPULAR_NETWORKS = [
+     '0x144',
+     '0x2a15c308d',
+     '0x3e7', // HyperEVM (999)
++    '0x8f', // Monad
+ ];
+ //# sourceMappingURL=constants.cjs.map
+diff --git a/dist/constants.mjs b/dist/constants.mjs
+index abc923ddd7f6611ccb5353ded80fcf87e1ad969e..68a6f478a5d804ec15c5bfa4897d0aa52245246c 100644
+--- a/dist/constants.mjs
++++ b/dist/constants.mjs
+@@ -11,5 +11,6 @@ export const POPULAR_NETWORKS = [
+     '0x144',
+     '0x2a15c308d',
+     '0x3e7', // HyperEVM (999)
++    '0x8f', // Monad
+ ];
+ //# sourceMappingURL=constants.mjs.map

.yarn/patches/@metamask-network-enablement-controller-npm-2.1.0-722019727d.patch

@@ -0,0 +1,34 @@
+diff --git a/dist/TransactionController.cjs b/dist/TransactionController.cjs
+index 64d41f16b495a364eeeab7d014758355f9a1a879..9648bde2c018274e6ae082dafef6878a64281776 100644
+--- a/dist/TransactionController.cjs
++++ b/dist/TransactionController.cjs
+@@ -97,6 +97,12 @@ const metadata = {
+         includeInDebugSnapshot: false,
+         usedInUi: false,
+     },
++   swapsTransactions: {
++        includeInStateLogs: true,
++        persist: true,
++        includeInDebugSnapshot: false,
++        usedInUi: true,
++    },
+ };
+ const SUBMIT_HISTORY_LIMIT = 100;
+ /**
+diff --git a/dist/TransactionController.mjs b/dist/TransactionController.mjs
+index b74920b6fb915b6cae7e074d80c1f307618238c7..05aaef45926e813c76809b442cd27b481db2fd74 100644
+--- a/dist/TransactionController.mjs
++++ b/dist/TransactionController.mjs
+@@ -99,6 +99,12 @@ const metadata = {
+         includeInDebugSnapshot: false,
+         usedInUi: false,
+     },
++   swapsTransactions: {
++        includeInStateLogs: true,
++        persist: true,
++        includeInDebugSnapshot: false,
++        usedInUi: true,
++    },
+ };
+ const SUBMIT_HISTORY_LIMIT = 100;
+ /**

.yarn/patches/@metamask-transaction-controller-npm-61.0.0-cccac388c7.patch

@@ -25,3 +25,5 @@ npmPreapprovedPackages:
   - "@metamask/*"
   - "@metamask-previews/*"
   - "@lavamoat/*"
+  - "@consensys/*"
+  

.yarnrc.yml

@@ -29,6 +29,26 @@ To learn how to contribute to the MetaMask codebase, visit our [Contributor Docs
 
 ## Getting started
 
+### Infura Project Setup
+
+MetaMask Mobile requires an Infura project ID to connect to blockchain networks.
+
+#### Internal Contributors
+
+1. Grab the `.js.env` file from 1Password, ask around for the correct vault. This file contains the `MM_INFURA_PROJECT_ID`.
+
+#### External Contributors
+
+1. Go to [https://developer.metamask.io](https://developer.metamask.io) and create an account
+2. Generate an API key
+3. Add API key to `MM_INFURA_PROJECT_ID` in `.js.env.example`
+4. Rename `.js.env.example` to `.js.env`
+5. Rebuild the app
+
+[!CAUTION]
+
+> Without an Infura project ID, the app cannot connect to blockchain networks.
+
 ### Using Expo (recommended)
 
 Expo is the fastest way to start developing. With the Expo framework, developers don't need to compile the native side of the application as before, hence no need for any native environment setup, developers only need to download a precompiled development build and run the javascript bundler. The development build will then connect with the bundler to load the javascript code.