Merge branch 'main' into test/temp-nightly

Author: tommasini

.cursor/rules/deeplink-handler-guidelines.mdc

@@ -12,6 +12,8 @@ This guide walks you through adding new deeplink handlers to MetaMask Mobile. Fo
 
 ## Quick Reference
 
+The **`deposit` deeplink** (`metamask://deposit`, `/deposit`) is **deprecated** and not handled; do not add handlers under Ramp Deposit `deeplink/` for it.
+
 | File | Purpose |
 |------|---------|
 | `app/constants/deeplinks.ts` | Define action constants |

.depcheckrc.yml

@@ -47,6 +47,13 @@ ignores:
   - '@metamask/perps-controller'
   # Used in scripts/repack for CI optimization
   - '@expo/repack-app'
+
+  # ESLint plugins, resolvers, parsers, configuration, etc.
+  - 'eslint-config-prettier'
+  - 'eslint-import-resolver-typescript'
+  - 'eslint-plugin-prettier'
+  - 'eslint-plugin-react-native'
+
   # Note: Everything below this line should be removed after investigation
   # TODO: Investigate each dependency to see whether it's used
 
@@ -63,9 +70,6 @@ ignores:
   - 'babel-core'
   - 'babel-loader'
   - 'chromedriver'
-  - 'eslint-config-prettier'
-  - 'eslint-plugin-prettier'
-  - 'eslint-plugin-react-native'
   - 'execa'
   - 'jetifier'
   - 'metro-react-native-babel-preset'

.eslintrc.js

@@ -1,4 +1,4 @@
-/* eslint-disable import/no-commonjs */
+/* eslint-disable import-x/no-commonjs */
 module.exports = {
   root: true,
   parser: '@typescript-eslint/parser',
@@ -9,7 +9,7 @@ module.exports = {
     '@react-native',
     'eslint:recommended',
     // '@metamask/eslint-config', // TODO: Enable when ready
-    'plugin:import/warnings',
+    'plugin:import-x/warnings',
     'plugin:react/recommended',
   ],
   // ESLint can find the plugin without the `eslint-plugin-` prefix. Ex. `eslint-plugin-react-compiler` -> `react-compiler`
@@ -51,6 +51,65 @@ module.exports = {
             allow: ['Text'],
           },
         ],
+
+        // These rule modifications are removing changes to our shared ESLint config made after
+        // version v9. This is a temporary measure to get us to ESLint v9 compatible versions,
+        // at which point we can restore the intended rules and use error suppression instead.
+        //
+        // TODO: Remove these modifications after the ESLint v9 update
+        '@typescript-eslint/await-thenable': 'off',
+        '@typescript-eslint/consistent-type-imports': 'off',
+        '@typescript-eslint/consistent-type-exports': 'off',
+        '@typescript-eslint/explicit-function-return-type': 'off',
+        '@typescript-eslint/naming-convention': 'off',
+        '@typescript-eslint/no-base-to-string': 'off',
+        '@typescript-eslint/no-duplicate-type-constituents': 'off',
+        '@typescript-eslint/no-empty-object-type': 'off',
+        '@typescript-eslint/no-floating-promises': 'off',
+        '@typescript-eslint/no-implied-eval': 'off',
+        '@typescript-eslint/no-misused-promises': 'off',
+        '@typescript-eslint/no-redundant-type-constituents': 'off',
+        '@typescript-eslint/no-throw-literal': 'off',
+        '@typescript-eslint/no-unnecessary-type-assertion': 'off',
+        '@typescript-eslint/no-unnecessary-type-arguments': 'off',
+        '@typescript-eslint/no-unsafe-enum-comparison': 'off',
+        '@typescript-eslint/no-unnecessary-boolean-literal-compare': 'off',
+        '@typescript-eslint/no-unused-vars': 'off',
+        '@typescript-eslint/no-wrapper-object-types': 'off',
+        '@typescript-eslint/only-throw-error': 'off',
+        '@typescript-eslint/prefer-enum-initializers': 'off',
+        '@typescript-eslint/prefer-includes': 'off',
+        '@typescript-eslint/prefer-nullish-coalescing': 'off',
+        '@typescript-eslint/prefer-optional-chain': 'off',
+        '@typescript-eslint/prefer-promise-reject-errors': 'off',
+        '@typescript-eslint/prefer-readonly': 'off',
+        '@typescript-eslint/prefer-reduce-type-parameter': 'off',
+        '@typescript-eslint/prefer-string-starts-ends-with': 'off',
+        '@typescript-eslint/promise-function-async': 'off',
+        '@typescript-eslint/restrict-plus-operands': 'off',
+        '@typescript-eslint/restrict-template-expressions': 'off',
+        '@typescript-eslint/switch-exhaustiveness-check': 'off',
+        '@typescript-eslint/unbound-method': 'off',
+        'no-restricted-syntax': [
+          'error',
+          {
+            selector: 'WithStatement',
+            message: 'With statements are not allowed',
+          },
+          {
+            selector: 'SequenceExpression',
+            message: 'Sequence expressions are not allowed',
+          },
+          // {
+          //   selector: "BinaryExpression[operator='in']",
+          //   message: 'The "in" operator is not allowed',
+          // },
+          // {
+          //   selector:
+          //     "PropertyDefinition[accessibility='private'], MethodDefinition[accessibility='private'], TSParameterProperty[accessibility='private']",
+          //   message: 'Use a hash name instead.',
+          // },
+        ],
       },
     },
     {
@@ -86,8 +145,8 @@ module.exports = {
       },
       rules: {
         'no-console': 'off',
-        'import/no-commonjs': 'off',
-        'import/no-nodejs-modules': 'off',
+        'import-x/no-commonjs': 'off',
+        'import-x/no-nodejs-modules': 'off',
       },
     },
     {
@@ -98,8 +157,8 @@ module.exports = {
       ],
       rules: {
         'no-console': 'off',
-        'import/no-commonjs': 'off',
-        'import/no-nodejs-modules': 'off',
+        'import-x/no-commonjs': 'off',
+        'import-x/no-nodejs-modules': 'off',
       },
     },
     {
@@ -361,10 +420,13 @@ module.exports = {
         '@typescript-eslint/no-floating-promises': 'error',
         '@typescript-eslint/restrict-template-expressions': 'error',
 
-        // === Import rules (using 'import' plugin, not 'import-x') ===
-        'import/consistent-type-specifier-style': ['error', 'prefer-top-level'],
-        'import/no-named-as-default': 'error',
-        'import/order': [
+        // === Import rules ===
+        'import-x/consistent-type-specifier-style': [
+          'error',
+          'prefer-top-level',
+        ],
+        'import-x/no-named-as-default': 'error',
+        'import-x/order': [
           'error',
           {
             groups: [
@@ -441,10 +503,10 @@ module.exports = {
   },
 
   settings: {
-    'import/resolver': {
+    'import-x/resolver': {
       typescript: {}, // this loads <rootdir>/tsconfig.json to eslint
     },
-    'import/internal-regex': '^@metamask/perps-controller',
+    'import-x/internal-regex': '^@metamask/perps-controller',
   },
 
   rules: {
@@ -466,7 +528,7 @@ module.exports = {
     'no-bitwise': 'off',
     'class-methods-use-this': 'off',
     'eol-last': 'warn',
-    'import/no-named-as-default': 'off',
+    'import-x/no-named-as-default': 'off',
     'no-invalid-this': 'off',
     'no-new': 'off',
     'react/jsx-handler-names': 'off',
@@ -477,14 +539,14 @@ module.exports = {
     'arrow-body-style': 'error',
     'dot-notation': 'error',
     eqeqeq: 'error',
-    'import/no-amd': 'error',
-    'import/no-commonjs': 'error',
-    'import/no-duplicates': 'error',
-    'import/no-extraneous-dependencies': ['error', { packageDir: ['./'] }],
-    'import/no-mutable-exports': 'error',
-    'import/no-namespace': 'error',
-    'import/no-nodejs-modules': 'error',
-    'import/prefer-default-export': 'off',
+    'import-x/no-amd': 'error',
+    'import-x/no-commonjs': 'error',
+    'import-x/no-duplicates': 'error',
+    'import-x/no-extraneous-dependencies': ['error', { packageDir: ['./'] }],
+    'import-x/no-mutable-exports': 'error',
+    'import-x/no-namespace': 'error',
+    'import-x/no-nodejs-modules': 'error',
+    'import-x/prefer-default-export': 'off',
     'no-alert': 'error',
     'no-constant-condition': [
       'error',
@@ -532,7 +594,7 @@ module.exports = {
     'prefer-const': 'error',
     'prefer-rest-params': 'error',
     'prefer-spread': 'error',
-    'import/no-unresolved': 'error',
+    'import-x/no-unresolved': 'error',
     'eslint-comments/no-unlimited-disable': 'off',
     'eslint-comments/no-unused-disable': 'off',
     'react-native/no-color-literals': 'error',
@@ -559,6 +621,14 @@ module.exports = {
     'react/prefer-es6-class': 'error',
     '@metamask/design-tokens/color-no-hex': 'warn',
     radix: 'off',
+
+    // These rule modifications are removing changes to our shared ESLint config made after
+    // version v9. This is a temporary measure to get us to ESLint v9 compatible versions,
+    // at which point we can restore the intended rules and use error suppression instead.
+    //
+    // TODO: Remove these modifications after the ESLint v9 update
+    'react-hooks/rules-of-hooks': 'off',
+    'no-loss-of-precision': 'off',
   },
 
   ignorePatterns: ['wdio.conf.js', 'app/util/termsOfUse/termsOfUseContent.ts'],

.github/CODEOWNERS

@@ -47,6 +47,7 @@ scripts/build.sh                                            @MetaMask/mobile-pla
 fingerprint.config.js                                       @MetaMask/mobile-platform
 builds.yml                                                  @MetaMask/mobile-platform
 .github/workflows/push-eas-update.yml                       @MetaMask/mobile-admins
+.github/workflows/upload-to-testflight.yml                  @MetaMask/mobile-admins
 scripts/update-expo-channel.js                              @MetaMask/mobile-admins
 certs/certificate.pem                                       @MetaMask/mobile-admins
 ios/fastlane/                                               @MetaMask/mobile-admins

.github/workflows/build.yml

@@ -13,6 +13,11 @@ on:
         required: false
         type: boolean
         default: false
+      source_branch:
+        description: 'Branch, tag, or SHA to build'
+        required: false
+        type: string
+        default: ''
       ref:
         description: 'Git ref to checkout when skip_version_bump is true. Defaults to the triggering event ref.'
         required: false
@@ -60,7 +65,7 @@ jobs:
       contents: write
       id-token: write
     with:
-      base-branch: ${{ github.ref_name }}
+      base-branch: ${{ inputs.source_branch != '' && inputs.source_branch || github.ref_name }}
     secrets:
       PR_TOKEN: ${{ secrets.PR_TOKEN }}
 
@@ -75,8 +80,12 @@ jobs:
       signing_aws_role: ${{ steps.config.outputs.signing_aws_role }}
       signing_aws_secret: ${{ steps.config.outputs.signing_aws_secret }}
       signing_android_keystore_path: ${{ steps.config.outputs.signing_android_keystore_path }}
+      checkout_ref_for_setup: ${{ !inputs.skip_version_bump && needs.update-build-version.outputs.commit-hash || (inputs.source_branch != '' && inputs.source_branch || github.ref_name) }}
     steps:
       - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          ref: ${{ !inputs.skip_version_bump && needs.update-build-version.outputs.commit-hash || (inputs.source_branch != '' && inputs.source_branch || github.ref_name) }}
       - name: Setup Node.js
         uses: actions/setup-node@v4
         with:
@@ -110,6 +119,8 @@ jobs:
         platform: ${{ inputs.platform == 'both' && fromJSON('["android", "ios"]') || fromJSON(format('["{0}"]', inputs.platform)) }}
     uses: ./.github/workflows/setup-node-modules.yml
     with:
+      ref: ${{ needs.prepare.outputs.checkout_ref_for_setup }}
+      fetch-depth: 0
       checkout-submodules: true
       platform: ${{ matrix.platform }}
       build_name: ${{ inputs.build_name }}

.github/workflows/expo-dev-build.yml

@@ -0,0 +1,34 @@
+##############################################################################################
+#
+# Expo Dev Build — replaces the Bitrise expo_dev_pipeline.
+#
+# Triggered on every push to main. Builds the main-dev configuration (Debug, simulator)
+# for both iOS and Android using the reusable build.yml workflow.
+#
+# No version bump or TestFlight upload — this is a dev/simulator build only.
+# Artifacts (iOS .app zip + Android APK) are uploaded as GitHub Actions artifacts.
+#
+# [skip ci] commits (e.g. version bumps) are automatically skipped by GitHub Actions.
+#
+##############################################################################################
+name: Expo Dev Build
+
+on:
+  push:
+    branches:
+      - main
+  workflow_dispatch:
+
+permissions:
+  contents: read
+  id-token: write
+
+jobs:
+  build-dev:
+    name: Expo dev build (main-dev)
+    uses: ./.github/workflows/build.yml
+    with:
+      build_name: main-dev
+      platform: both
+      skip_version_bump: true
+    secrets: inherit