Merge branch 'main' into fix/mm-card-delegation-refresh-issue

Author: Brunonascdev

.cursor/BUGBOT.md

@@ -0,0 +1,15 @@
+# BUGBOT Rules
+
+## Core Mission
+
+Automated test quality enforcement and bug detection for MetaMask Mobile React Native codebase
+
+## Execution Protocol
+
+### 1. Initial Setup
+
+- **ALWAYS** load and reference [unit testing guidelines](rules/unit-testing-guidelines.mdc)
+- Verify test file naming pattern: `*.test.{ts,tsx,js,jsx}`
+- Check for proper Jest/React Native Testing Library imports
+
+Use the rules in the[unit testing guidelines](rules/unit-testing-guidelines.mdc) to enforce the test quality and bug detection.

.cursor/rules/BUGBOT.md

@@ -42,6 +42,7 @@ app/core/Engine/types.ts                                    @MetaMask/mobile-pla
 app/core/Engine/controllers/remote-feature-flag-controller/ @MetaMask/mobile-platform
 app/core/DeeplinkManager                                    @MetaMask/mobile-platform
 scripts/build.sh                                            @MetaMask/mobile-platform
+scripts/update-expo-channel.js                              @MetaMask/mobile-admins
 
 # Platform & Snaps Code Fencing File
 metro.transform.js @MetaMask/mobile-platform @MetaMask/core-platform

.github/CODEOWNERS

@@ -44,6 +44,9 @@ export WALLET_CONNECT_PROJECT_ID=""
 # Default PORT for metro
 export WATCHER_PORT=8081
 
+# Expo Project ID for OTA updates
+export EXPO_PROJECT_ID=""
+
 # Environment: "production", "pre-release" or "dev"
 export METAMASK_ENVIRONMENT="dev"
 
@@ -164,5 +167,8 @@ export MM_PERPS_HIP3_ENABLED="true"
 export MM_PERPS_HIP3_ALLOWLIST_MARKETS=""  # Allowlist: Empty = enable all markets. Examples: "xyz:XYZ100,xyz:TSLA" or "xyz:*,abc:TSLA"
 export MM_PERPS_HIP3_BLOCKLIST_MARKETS=""  # Blocklist: Empty = no blocking. Examples: "BTC,ETH" or "xyz:*"
 
+## Predict
+export MM_PREDICT_ENABLED="true"
+
 ## Card
 export MM_CARD_BAANX_API_CLIENT_KEY_DEV=""

.js.env.example

@@ -0,0 +1,16 @@
+diff --git a/dist/NetworkEnablementController.cjs b/dist/NetworkEnablementController.cjs
+index d4a40bea9e4ed3c28e347d96e309efe1ff889e81..fab280760de6bd5cdfdbecf01495c2d5616b2e16 100644
+--- a/dist/NetworkEnablementController.cjs
++++ b/dist/NetworkEnablementController.cjs
+@@ -25,6 +25,11 @@ const getDefaultNetworkEnablementControllerState = () => ({
+             [controller_utils_1.ChainId[controller_utils_1.BuiltInNetworkName.Mainnet]]: true,
+             [controller_utils_1.ChainId[controller_utils_1.BuiltInNetworkName.LineaMainnet]]: true,
+             [controller_utils_1.ChainId[controller_utils_1.BuiltInNetworkName.BaseMainnet]]: true,
++            [controller_utils_1.ChainId[controller_utils_1.BuiltInNetworkName.ArbitrumOne]]: true,
++            [controller_utils_1.ChainId[controller_utils_1.BuiltInNetworkName.BscMainnet]]: true,
++            [controller_utils_1.ChainId[controller_utils_1.BuiltInNetworkName.OptimismMainnet]]: true,
++            [controller_utils_1.ChainId[controller_utils_1.BuiltInNetworkName.PolygonMainnet]]: true,
++            [controller_utils_1.ChainId[controller_utils_1.BuiltInNetworkName.SeiMainnet]]: true,
+         },
+         [utils_1.KnownCaipNamespace.Solana]: {
+             [keyring_api_1.SolScope.Mainnet]: true,

.yarn/patches/@metamask-network-enablement-controller-npm-3.1.0-1c0cfefdc3.patch

@@ -0,0 +1,50 @@
+diff --git a/android/src/main/java/expo/modules/updates/UpdatesPackage.kt b/android/src/main/java/expo/modules/updates/UpdatesPackage.kt
+index f697c9822c32544ddfcd62e218c09555bcb2915d..2c29988517b294b26714bccd371f5e836dd3b834 100644
+--- a/android/src/main/java/expo/modules/updates/UpdatesPackage.kt
++++ b/android/src/main/java/expo/modules/updates/UpdatesPackage.kt
+@@ -1,6 +1,5 @@
+ package expo.modules.updates
+ 
+-import android.app.Application
+ import android.content.Context
+ import androidx.annotation.UiThread
+ import androidx.annotation.WorkerThread
+@@ -8,7 +7,6 @@ import com.facebook.react.ReactActivity
+ import com.facebook.react.ReactNativeHost
+ import com.facebook.react.bridge.ReactContext
+ import com.facebook.react.devsupport.interfaces.DevSupportManager
+-import expo.modules.core.interfaces.ApplicationLifecycleListener
+ import expo.modules.core.interfaces.Package
+ import expo.modules.core.interfaces.ReactActivityHandler
+ import expo.modules.core.interfaces.ReactNativeHostHandler
+@@ -94,30 +92,6 @@ class UpdatesPackage : Package {
+     return listOf(handler)
+   }
+ 
+-  override fun createApplicationLifecycleListeners(context: Context): List<ApplicationLifecycleListener> {
+-    val handler = object : ApplicationLifecycleListener {
+-      override fun onCreate(application: Application) {
+-        super.onCreate(application)
+-        if (isRunningAndroidTest()) {
+-          // Preload updates to prevent Detox ANR
+-          UpdatesController.initialize(context)
+-          UpdatesController.instance.launchAssetFile
+-        }
+-      }
+-    }
+-
+-    return listOf(handler)
+-  }
+-
+-  private fun isRunningAndroidTest(): Boolean {
+-    try {
+-      Class.forName("androidx.test.espresso.Espresso")
+-      return true
+-    } catch (_: ClassNotFoundException) {
+-    }
+-    return false
+-  }
+-
+   companion object {
+     private val TAG = UpdatesPackage::class.java.simpleName
+     val isUsingNativeDebug = BuildConfig.EX_UPDATES_NATIVE_DEBUG

.yarn/patches/expo-updates-npm-0.27.4-2a215516d7.patch

@@ -188,7 +188,7 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionName "7.60.0"
-        versionCode 2818
+        versionCode 2993
         testBuildType System.getProperty('testBuildType', 'debug')
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         manifestPlaceholders.MM_BRANCH_KEY_TEST = "$System.env.MM_BRANCH_KEY_TEST"

android/app/build.gradle

@@ -1,3 +1,5 @@
+const { RUNTIME_VERSION, PROJECT_ID, UPDATE_URL } = require('./ota.config.js');
+
 module.exports = {
   name: 'MetaMask',
   displayName: 'MetaMask',
@@ -15,7 +17,9 @@ module.exports = {
             '../../node_modules/@notifee/react-native/android/libs',
           ],
         },
-        ios: {},
+        ios: {
+          jsEngine: 'hermes',
+        },
       },
     ],
     [
@@ -36,5 +40,28 @@ module.exports = {
   ios: {
     bundleIdentifier: 'io.metamask.MetaMask',
     usesAppleSignIn: true,
+    jsEngine: 'hermes',
+  },
+  expo: {
+    owner: 'metamask-test',
+    runtimeVersion: RUNTIME_VERSION,
+    updates: {
+      url: UPDATE_URL,
+      // Channel is set by requestHeaders, will be overridden with build script
+      requestHeaders: {
+        'expo-channel-name': 'preview',
+      },
+    },
+    extra: {
+      eas: {
+        projectId: PROJECT_ID,
+      },
+    },
+    android: {
+      package: 'io.metamask',
+    },
+    ios: {
+      bundleIdentifier: 'io.metamask.MetaMask',
+    },
   },
 };

app.config.js

@@ -0,0 +1,36 @@
+// Mock for expo-updates module
+export const channel = 'test-channel';
+export const runtimeVersion = '1.0.0';
+export const isEmbeddedLaunch = true;
+export const isEnabled = true;
+export const updateId = 'mock-update-id';
+
+export const checkForUpdateAsync = jest.fn();
+export const fetchUpdateAsync = jest.fn();
+export const reloadAsync = jest.fn();
+export const useUpdates = jest.fn();
+
+export const UpdateEventType = {
+  ERROR: 'error',
+  NO_UPDATE_AVAILABLE: 'noUpdateAvailable',
+  UPDATE_AVAILABLE: 'updateAvailable',
+};
+
+export const UpdateCheckResult = {
+  isAvailable: false,
+  manifest: null,
+};
+
+export default {
+  channel,
+  runtimeVersion,
+  isEmbeddedLaunch,
+  isEnabled,
+  updateId,
+  checkForUpdateAsync,
+  fetchUpdateAsync,
+  reloadAsync,
+  useUpdates,
+  UpdateEventType,
+  UpdateCheckResult,
+};

app/__mocks__/expo-updates.ts

@@ -30,10 +30,7 @@ const MyComponent = () => {
   const [filter, setFilter] = useState('all');
 
   return (
-    <ButtonFilter
-      isActive={filter === 'all'}
-      onPress={() => setFilter('all')}
-    >
+    <ButtonFilter isActive={filter === 'all'} onPress={() => setFilter('all')}>
       All
     </ButtonFilter>
   );
@@ -69,4 +66,3 @@ The component uses Tailwind CSS via the `useTailwind` hook and follows the MetaM
   />
 </Box>
 ```
-