MetaMask · ieow · Mar 24, 2025 · Mar 26, 2025 · Mar 26, 2025 · Mar 28, 2025
diff --git a/.depcheckrc.yml b/.depcheckrc.yml
@@ -8,6 +8,8 @@ ignores:
   - '@lavamoat/allow-scripts'
   - '@lavamoat/git-safe-dependencies'
   - 'babel-plugin-inline-import'
+  # This is used in index.d.ts
+  - '@sentry/react'
   # This is used on the patch for TokenRatesController of Assets controllers, for we to be able to use the last version of it
   - cockatiel
 
@@ -79,16 +81,26 @@ ignores:
   - 'url'
   - 'vm-browserify'
   - 'react-native-cli'
+  - 'babel-plugin-module-resolver'
 
   ## Missing dependencies to investigate
   - '@react-navigation/core'
   - 'app'
   - 'i18n-js'
   - 'images'
-  
+
   ## Expo
   - '@config-plugins/detox'
   - 'cross-spawn'
   - 'expo-build-properties'
   - 'expo-dev-client'
-
+
+  ## react native
+  - '@react-native-community/cli'
+  - '@react-native-community/cli-platform-android'
+  - '@react-native-community/cli-platform-ios'
+  - '@react-native-community/cli-server-api'
+  - '@react-native/typescript-config'
+  - 'react-native-pager-view'
+  # this dependency can probably be removed, needs investigation
+  - '@types/react-test-renderer'
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -37,6 +37,7 @@ module.exports = {
         '@typescript-eslint/no-explicit-any': 'error',
         // Under discussion
         '@typescript-eslint/no-duplicate-enum-values': 'off',
+        '@typescript-eslint/no-parameter-properties': 'off',
       },
     },
     {

diff --git a/.github/workflows/create-release-pr-v2.yml b/.github/workflows/create-release-pr-v2.yml
@@ -20,7 +20,7 @@ jobs:
 
   create-release-pr:
     needs: generate-build-version
-    uses: MetaMask/github-tools/.github/workflows/create-release-pr.yml@3e0b0204e41b576263b9060945de3b3b9b8c5448
+    uses: MetaMask/github-tools/.github/workflows/create-release-pr.yml@d1ba843333b920fc9b0e1823fd519b7a64d07f5f
     with:
       platform: mobile
       base-branch: ${{ inputs.base-branch }}

diff --git a/.github/workflows/create-release-pr.yml b/.github/workflows/create-release-pr.yml
diff --git a/.gitignore b/.gitignore
@@ -38,6 +38,7 @@ android/app/.project
 android/app/bin/
 android/app/gradle*
 android/app/_build*
+.cxx/
 
 # if we ever want to add google services
 android/app/google-services.json
@@ -134,6 +135,7 @@ android/app/src/main/assets/modules.json
 .expo
 dist/
 web-build/
+expo-env.d.ts
 
 # CICD
 github-tools/

diff --git a/.iyarc b/.iyarc
@@ -0,0 +1,2 @@
+# https://github.com/advisories/GHSA-c76h-2ccp-4975 This is temporarily ignored, will be fixed by updating yarn to v3 in this PR: https://github.com/MetaMask/metamask-mobile/pull/14477
+GHSA-c76h-2ccp-4975
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+- fix(bridge): show "Auto" slippage for Solana swaps
 
 ### Added
 
@@ -26,6 +27,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - feat(bridge): use `BridgeStatusController` for EVM and Solana Bridge transaction submission ([#14708](https://github.com/MetaMask/metamask-mobile/pull/14708))
 - feat(multi-srp): add discover accounts to MultichainWalletSnapClient ([#14727](https://github.com/MetaMask/metamask-mobile/pull/14727))
 - feat: real time dapp scanning BrowserTab ([#14515](https://github.com/MetaMask/metamask-mobile/pull/14515))
+- feat(multi-srp): add new srp pills labels ([#14829](https://github.com/MetaMask/metamask-mobile/pull/14829))
 - feat(earn): add pooled-staking and stablecoin lending remote feature flags ([#14660](https://github.com/MetaMask/metamask-mobile/pull/14660))
 - feat: feat: AccountConnect and AccountApproval use dapp scanning ([#14514](https://github.com/MetaMask/metamask-mobile/pull/14514/))
 
@@ -38,11 +40,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - fix(multi-srp): display errors only after all the words are have been entered ([#14607](https://github.com/MetaMask/metamask-mobile/pull/14607))
 - fix(wallet-ux): increased touchable area for account picker so it is easier to select ([#14762](https://github.com/MetaMask/metamask-mobile/pull/14762))
 - fix(multi-srp): display alternative text color when in dark mode([#14718](https://github.com/MetaMask/metamask-mobile/pull/14718))
+- fix(confirmations): remove transaction simulations from wallet initiated send flow ([#14994](https://github.com/MetaMask/metamask-mobile/pull/14994))
 
 ### Fixed
 
 - fix(bridge): keyboard not appearing when error banner is displayed ([#14862](https://github.com/MetaMask/metamask-mobile/pull/14862))
 - fix(bridge): fix not switching networks when selecting source token ([#14712](https://github.com/MetaMask/metamask-mobile/pull/14712))
+- fix: update confirmation font sizes ([#14715](https://github.com/MetaMask/metamask-mobile/pull/14715))
 - fix: updates a padding style specifically for Android devices ([#14725](https://github.com/MetaMask/metamask-mobile/pull/14725))
 - fix(bridge): enhance UI/UX with improved input handling and layout adjustments ([#14781](https://github.com/MetaMask/metamask-mobile/pull/14781))
 - fix(swaps): set default slippage when source or destination token is not stablecoin ([#14730](https://github.com/MetaMask/metamask-mobile/pull/14730))

diff --git a/README.md b/README.md
@@ -23,6 +23,7 @@ To learn how to contribute to the MetaMask codebase, visit our [Contributor Docs
 - [API Call Logging for Debugging](./docs/readme/api-logging.md)
 - [Storybook](./docs/readme/storybook.md)
 - [Miscellaneous](./docs/readme/miscellaneous.md)
+- [E2E Testing Segment Events](./docs/testing/e2e/segment-events.md)
 
 ## Getting started
 

diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -1,7 +1,9 @@
 apply plugin: "com.android.application"
+apply plugin: "org.jetbrains.kotlin.android"
 apply plugin: "com.facebook.react"
 apply plugin: "io.sentry.android.gradle"
 apply plugin: 'com.google.gms.google-services'
+def projectRoot = rootDir.getAbsoluteFile().getParentFile().getAbsolutePath()
 
 /**
  * This is the configuration block to customize your React Native Android app.
@@ -49,9 +51,15 @@ react {
     // hermesFlags = ["-O", "-output-source-map"]
     //
     // Added by install-expo-modules
-    entryFile = file(["node", "-e", "require('expo/scripts/resolveAppEntry')", rootDir.getAbsoluteFile().getParentFile().getAbsolutePath(), "android", "absolute"].execute(null, rootDir).text.trim())
-    cliFile = new File(["node", "--print", "require.resolve('@expo/cli')"].execute(null, rootDir).text.trim())
+    entryFile = file(["node", "-e", "require('expo/scripts/resolveAppEntry')", projectRoot, "android", "absolute"].execute(null, rootDir).text.trim())
+    reactNativeDir = new File(["node", "--print", "require.resolve('react-native/package.json')"].execute(null, rootDir).text.trim()).getParentFile().getAbsoluteFile()
+    hermesCommand = new File(["node", "--print", "require.resolve('react-native/package.json')"].execute(null, rootDir).text.trim()).getParentFile().getAbsolutePath() + "/sdks/hermesc/%OS-BIN%/hermesc"
+    codegenDir = new File(["node", "--print", "require.resolve('@react-native/codegen/package.json', { paths: [require.resolve('react-native/package.json')] })"].execute(null, rootDir).text.trim()).getParentFile().getAbsoluteFile()
+    cliFile = new File(["node", "--print", "require.resolve('@expo/cli', { paths: [require.resolve('expo/package.json')] })"].execute(null, rootDir).text.trim())
     bundleCommand = "export:embed"
+
+    /* Autolinking */
+    autolinkLibrariesWithApp()
 }
 
 // Override default React Native to generate source maps for Hermes
@@ -170,7 +178,8 @@ def ndkPath() {
 android {
     ndkVersion rootProject.ext.ndkVersion
 
-    compileSdkVersion rootProject.ext.compileSdkVersion
+    buildToolsVersion rootProject.ext.buildToolsVersion
+    compileSdk rootProject.ext.compileSdkVersion
 
     namespace"io.metamask"
 
@@ -179,7 +188,7 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionName "7.44.0"
-        versionCode 1707
+        versionCode 1773
         testBuildType System.getProperty('testBuildType', 'debug')
         missingDimensionStrategy 'react-native-camera', 'general'
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -197,8 +206,18 @@ android {
       pickFirst 'lib/armeabi-v7a/libcrypto.so'
       pickFirst 'lib/x86/libcrypto.so'
       pickFirst 'lib/x86_64/libcrypto.so'
+      jniLibs {
+        useLegacyPackaging (findProperty('expo.useLegacyPackaging')?.toBoolean() ?: false)
+      }
+      exclude 'META-INF/AL2.0'
+      exclude 'META-INF/LGPL2.1'
+      exclude 'mockito-extensions/org.mockito.plugins.MockMaker'
 	  }
 
+    androidResources {
+      ignoreAssetsPattern '!.svn:!.git:!.ds_store:!*.scc:!CVS:!thumbs.db:!picasa.ini:!*~'
+    }
+
 	  signingConfigs {
       release {
         storeFile file('../keystores/release.keystore')
@@ -235,6 +254,8 @@ android {
             manifestPlaceholders.isDebug = false
             minifyEnabled enableProguardInReleaseBuilds
             proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro", "${rootProject.projectDir}/../node_modules/detox/android/detox/proguard-rules-app.pro", "${rootProject.projectDir}/../node_modules/detox/android/detox/proguard-rules.pro"
+            crunchPngs (findProperty('android.enablePngCrunchInReleaseBuilds')?.toBoolean() ?: true)
+            testProguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro", "${rootProject.projectDir}/../node_modules/detox/android/detox/proguard-rules-app.pro", "${rootProject.projectDir}/../node_modules/detox/android/detox/proguard-rules.pro"
         }
     }
 
@@ -271,6 +292,10 @@ android {
       // Used to point to dev environment API for ramp
       it.buildConfigField 'String', 'IS_RAMP_DEV', "\"$System.env.RAMP_DEV_BUILD\""
     }
+
+    buildFeatures {
+        buildConfig = true
+    }
 }
 
 dependencies {
@@ -282,12 +307,7 @@ dependencies {
     androidTestImplementation 'org.mockito:mockito-android:4.2.0'
     androidTestImplementation 'androidx.test:core:1.5.0'
     androidTestImplementation 'androidx.test:core-ktx:1.5.0'
-    debugImplementation("com.facebook.flipper:flipper:${FLIPPER_VERSION}")
-    debugImplementation("com.facebook.flipper:flipper-network-plugin:${FLIPPER_VERSION}") {
-        exclude group:'com.squareup.okhttp3', module:'okhttp'
-    }
 
-    debugImplementation("com.facebook.flipper:flipper-fresco-plugin:${FLIPPER_VERSION}")
     if (hermesEnabled.toBoolean()) {
         implementation("com.facebook.react:hermes-android")
     } else {
@@ -297,6 +317,15 @@ dependencies {
          exclude module: "protobuf-lite"
      }
     androidTestImplementation ('androidx.test.espresso:espresso-contrib:3.4.0')
-}
 
-apply from: file("../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project)
+    // Add these dependencies for androidTest
+    androidTestImplementation "com.google.guava:guava:31.1-android"
+    androidTestImplementation "org.ow2.asm:asm:9.4"
+    androidTestImplementation "net.java.dev.jna:jna:5.12.1"
+    androidTestImplementation "net.java.dev.jna:jna-platform:5.12.1"
+    androidTestImplementation "org.opentest4j:opentest4j:1.2.0"
+
+    // Make sure you have the proper Mockito dependencies
+    androidTestImplementation "org.mockito:mockito-core:4.8.0"
+    androidTestImplementation "org.mockito:mockito-inline:4.8.0"
+}
diff --git a/android/app/proguard-rules.pro b/android/app/proguard-rules.pro
@@ -48,3 +48,18 @@
   -keep class kotlin.** { *; }
 
   -keep class kotlin.Metadata { *; }
+
+-dontwarn kotlinx.serialization.SerialName
+-dontwarn kotlinx.serialization.Serializable
+
+# Ignore missing Java desktop classes referenced by JNA
+-dontwarn java.awt.**
+-dontwarn javax.swing.**
+-dontwarn java.lang.instrument.**
+-dontwarn sun.misc.**
+-dontwarn org.mockito.**
+-dontwarn edu.umd.cs.findbugs.**
+-dontwarn com.huawei.hms.ads.**
+-dontwarn com.google.common.util.concurrent.**
+-dontwarn org.objectweb.asm.**
+-dontwarn net.bytebuddy.**
diff --git a/android/app/src/androidTest/java/com/metamask/nativeModules/RNTarTest/RNTarTest.java b/android/app/src/androidTest/java/com/metamask/nativeModules/RNTarTest/RNTarTest.java
@@ -36,7 +36,7 @@ public class RNTarTest {
 
   @Before
   public void setUp() {
-    reactContext = new ReactApplicationContext(ApplicationProvider.getApplicationContext());
+    reactContext = mock(ReactApplicationContext.class);
     tar = new RNTar(reactContext);
     promise = mock(Promise.class);
   }

diff --git a/android/app/src/debug/java/io/metamask/ReactNativeFlipper.java b/android/app/src/debug/java/io/metamask/ReactNativeFlipper.java
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		# https://github.com/advisories/GHSA-c76h-2ccp-4975 This is temporarily ignored, will be fixed by updating yarn to v3 in this PR: https://github.com/MetaMask/metamask-mobile/pull/14477
		GHSA-c76h-2ccp-4975