Merge origin/main into stable-main-7.61.0

Author: metamaskbot

.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/feature-flag-guidelines.mdc

@@ -0,0 +1,91 @@
+---
+globs: "**/*"
+alwaysApply: true
+---
+
+# Feature Flag Guidelines
+
+## Core Principle
+
+**ALWAYS** use the `useFeatureFlag` hook instead of creating new feature flag selectors.
+
+## Forbidden Patterns
+
+### ❌ NEVER Create New Feature Flag Selectors
+
+**DO NOT** create new selectors using `createSelector` for feature flags:
+
+```typescript
+// ❌ FORBIDDEN - Do not create new feature flag selectors
+export const selectMyFeatureEnabledFlag = createSelector(
+  selectRemoteFeatureFlags,
+  (remoteFeatureFlags) => {
+    // ... selector logic
+  },
+);
+```
+
+**DO NOT** add new feature flag selectors in:
+- `app/selectors/featureFlagController/**/*.ts`
+- `app/components/**/selectors/featureFlags/**/*.ts`
+- Any other location that creates feature flag selectors
+
+## Required Pattern
+
+### ✅ ALWAYS Use the `useFeatureFlag` Hook
+
+**MUST** use the `useFeatureFlag` hook from `app/components/hooks/FeatureFlags/useFeatureFlag.ts`:
+
+```typescript
+// ✅ REQUIRED - Use the hook instead
+import { useFeatureFlag, FeatureFlagNames } from '../../../hooks/FeatureFlags/useFeatureFlag';
+
+const MyComponent = () => {
+  const isFeatureEnabled = useFeatureFlag(FeatureFlagNames.rewardsEnabled);
+  
+  // Use the flag value
+  if (isFeatureEnabled) {
+    // ... feature logic
+  }
+};
+```
+
+## Steps to Use Feature Flags
+
+1. **Add the flag name** to the `FeatureFlagNames` enum in `app/components/hooks/FeatureFlags/useFeatureFlag.ts`:
+   ```typescript
+   export enum FeatureFlagNames {
+     rewardsEnabled = 'rewardsEnabled',
+     myNewFeature = 'myNewFeature', // Add your new flag here
+   }
+   ```
+
+2. **Use the hook** in your component:
+   ```typescript
+   const isMyFeatureEnabled = useFeatureFlag(FeatureFlagNames.myNewFeature);
+   ```
+
+3. **Do NOT** create a selector for the feature flag
+
+## Migration Pattern
+
+If you encounter existing feature flag selectors, prefer migrating to the hook:
+
+```typescript
+// ❌ Old pattern (existing code - do not replicate)
+const isFeatureEnabled = useSelector(selectMyFeatureEnabledFlag);
+
+// ✅ New pattern (use this instead)
+const isFeatureEnabled = useFeatureFlag(FeatureFlagNames.myNewFeature);
+```
+
+## Enforcement
+
+- **REJECT** any code that creates new `createSelector` instances for feature flags
+- **REJECT** any new files in `app/selectors/featureFlagController/` directories
+- **REQUIRE** use of `useFeatureFlag` hook for all feature flag access
+- **REQUIRE** adding flag names to `FeatureFlagNames` enum before use
+
+## Exception
+
+The only exception is the base selector `selectRemoteFeatureFlags` in `app/selectors/featureFlagController/index.ts`, which is used internally by the `useFeatureFlag` hook infrastructure.

.cursor/rules/general-coding-guidelines.mdc

@@ -32,7 +32,7 @@ ComponentName/
 
 **Core**: `/docs/readme/` (architecture, testing, debugging, performance, environment, expo-environment, storybook, troubleshooting, expo-e2e-testing, reassure, release-build-profiler)
 
-**Features**: `/docs/` (deeplinks, animations, tailwind, confirmations, confirmation-refactoring) • `app/component-library/README.md` • `e2e/MOCKING.md` • `CHANGELOG.md` • `app/core/{Analytics,Engine}/README.md` • `ppom/README.md`
+**Features**: `/docs/` (deeplinks, animations, tailwind, confirmations, confirmation-refactoring) • `app/component-library/README.md` • `e2e/MOCKING.md` • `CHANGELOG.md` • `app/core/{Analytics,Engine}/README.md`
 
 **External**: [MetaMask Contributor Docs](https://github.com/MetaMask/contributor-docs) • [TypeScript Guidelines](https://github.com/MetaMask/contributor-docs/blob/main/docs/typescript.md) • [Unit Testing](https://github.com/MetaMask/contributor-docs/blob/main/docs/testing/unit-testing.md)
 
@@ -44,4 +44,4 @@ ComponentName/
 
 **Testing**: see .claude/commands/unit-test.md
 
-**Forbidden**: ❌ npm/npx commands
+**Forbidden**: ❌ npm/npx commands

.cursor/rules/unit-testing-guidelines.mdc

@@ -185,6 +185,92 @@ jest.setSystemTime(new Date('2024-01-01'));
 
 - Avoid relying on global state or hardcoded values (e.g., dates) or mock it.
 
+## Async Testing and act() - CRITICAL
+
+**ALWAYS use `act()` when testing async operations that trigger React state updates.**
+
+### When to Use act()
+
+Use `act()` when you:
+- Call async functions via component props (e.g., `onRefresh`, `onPress` with async handlers)
+- Invoke functions that perform state updates asynchronously
+- Test pull-to-refresh or other async interactions
+
+### Symptoms of Missing act()
+
+Tests fail intermittently with:
+- `TypeError: terminated`
+- `SocketError: other side closed`
+- Warnings about state updates not being wrapped in act()
+
+### Examples
+
+```ts
+// ❌ WRONG - Causes flaky tests
+it('calls Logger.error when handleOnRefresh fails', async () => {
+  const mockLoggerError = jest.spyOn(Logger, 'error');
+  render(BankDetails);
+
+  // Async function called without act() - causes race condition
+  screen
+    .getByTestId('refresh-control-scrollview')
+    .props.refreshControl.props.onRefresh();
+
+  await waitFor(() => {
+    expect(mockLoggerError).toHaveBeenCalled();
+  });
+});
+
+// ✅ CORRECT - Properly handles async state updates
+it('calls Logger.error when handleOnRefresh fails', async () => {
+  const mockLoggerError = jest.spyOn(Logger, 'error');
+  render(BankDetails);
+
+  // Wrap async operation in act()
+  await act(async () => {
+    await screen
+      .getByTestId('refresh-control-scrollview')
+      .props.refreshControl.props.onRefresh();
+  });
+
+  await waitFor(() => {
+    expect(mockLoggerError).toHaveBeenCalled();
+  });
+});
+```
+
+### Common Patterns Requiring act()
+
+```ts
+// RefreshControl callbacks
+await act(async () => {
+  await refreshControl.props.onRefresh();
+});
+
+// Async button press handlers
+await act(async () => {
+  await button.props.onPress();
+});
+
+// Any async callback that updates state
+await act(async () => {
+  await component.props.onSomeAsyncAction();
+});
+```
+
+### Why This Matters
+
+Without `act()`:
+1. Async function starts executing
+2. Test continues and waits only for specific assertion
+3. Jest cleanup/termination happens while promises are still pending
+4. Results in "terminated" or "other side closed" errors
+
+With `act()`:
+1. React Testing Library waits for all state updates
+2. All promises resolve before test proceeds
+3. Clean, deterministic test execution
+
 # Reviewer Responsibilities
 
 - Validate that tests fail when the code is broken (test the test).
@@ -215,6 +301,7 @@ Before submitting any test file, verify:
 - [ ] **Assertions are specific**
 - [ ] **Test names are descriptive**
 - [ ] **No test duplication**
+- [ ] **Async operations wrapped in act()** when they trigger state updates
 
 # Common Mistakes to AVOID - CRITICAL
 
@@ -226,6 +313,7 @@ Before submitting any test file, verify:
 - ❌ **Not following AAA pattern** - Always Arrange, Act, Assert
 - ❌ **Not testing edge cases** - Test null, undefined, empty values
 - ❌ **Using weak matchers** - Use specific assertions like `toBe()`, `toEqual()`
+- ❌ **Not wrapping async state updates in act()** - Causes flaky "terminated" errors
 
 # Anti-patterns to Avoid
 

.depcheckrc.yml

@@ -22,6 +22,8 @@ ignores:
   - 'reflect-metadata'
   # Husky is used for pre-commit hooks
   - 'husky'
+  # Auto changelog tooling used in release scripts
+  - '@metamask/auto-changelog'
   # Remove this once it's used in the project
   - 'rive-react-native'
   # Appwright will be used in a follow up PR. We will remove once PR is ready
@@ -68,6 +70,7 @@ ignores:
   - 'prettier-plugin-gherkin'
   - 'react-native-svg-asset-plugin'
   - 'regenerator-runtime'
+  - 'prettier-2'
 
   ## Unused devDependencies to investigate
   - '@metamask/swappable-obj-proxy'

.detoxrc.js

@@ -22,7 +22,7 @@ module.exports = {
       $0: 'jest',
       config: 'e2e/jest.e2e.config.js',
     },
-    detached: true,
+    detached: process.env.CI ? true : false,
     jest: {
       setupTimeout: 220000,
       teardownTimeout: 60000, // Increase teardown timeout from default 30s to 60s
@@ -65,8 +65,12 @@ module.exports = {
     },
     'ios.sim.main.ci': {
       device: 'ios.simulator',
-      app: 'ios.debug',
-    }
+      app: 'ios.main.release',
+    },
+    'ios.sim.flask.ci': {
+      device: 'ios.simulator',
+      app: 'ios.flask.release',
+    },
   },
   devices: {
     'ios.simulator': {
@@ -110,42 +114,44 @@ module.exports = {
     'ios.main.release': {
       type: 'ios.app',
       binaryPath:
-        'ios/build/Build/Products/Release-iphonesimulator/MetaMask.app',
-      build: `yarn build:ios:main:e2e`,
+        process.env.PREBUILT_IOS_APP_PATH || 'ios/build/Build/Products/Release-iphonesimulator/MetaMask.app',
+      build: `export CONFIGURATION="Release" && yarn build:ios:main:e2e`,
     },
     'ios.flask.debug': {
       type: 'ios.app',
       binaryPath:
-        'ios/build/Build/Products/Debug-iphonesimulator/MetaMask-Flask.app',
-      build: 'yarn start:ios:e2e:flask',
+        process.env.PREBUILT_IOS_APP_PATH || 'ios/build/Build/Products/Debug-iphonesimulator/MetaMask-Flask.app',
+        build: 'export CONFIGURATION="Debug" && yarn build:ios:flask:e2e',
     },
     'ios.flask.release': {
       type: 'ios.app',
       binaryPath:
-        'ios/build/Build/Products/Release-iphonesimulator/MetaMask-Flask.app',
-      build: `yarn build:ios:flask:e2e`,
+        process.env.PREBUILT_IOS_APP_PATH || 'ios/build/Build/Products/Release-iphonesimulator/MetaMask-Flask.app',
+      build: `export CONFIGURATION="Release" && yarn build:ios:flask:e2e`,
     },
     'android.debug': {
       type: 'android.apk',
       binaryPath: process.env.PREBUILT_ANDROID_APK_PATH || 'android/app/build/outputs/apk/prod/debug/app-prod-debug.apk',
-      testBinaryPath: process.env.PREBUILT_ANDROID_TEST_APK_PATH,
-      build: 'yarn start:android:e2e',
+      testBinaryPath: process.env.PREBUILT_ANDROID_TEST_APK_PATH || 'android/app/build/outputs/apk/androidTest/prod/debug/app-prod-debug-androidTest.apk',
+      build: 'export CONFIGURATION="Debug" && yarn build:android:main:e2e',
     },
-    'android.flask.debug': {
+    'android.release': {
       type: 'android.apk',
-      binaryPath: 'android/app/build/outputs/apk/flask/debug/app-flask-debug.apk',
-      testBinaryPath: 'android/app/build/outputs/apk/androidTest/flask/debug/app-flask-debug-androidTest.apk',
-      build: 'yarn start:android:e2e:flask',
+      binaryPath: process.env.PREBUILT_ANDROID_APK_PATH || 'android/app/build/outputs/apk/prod/release/app-prod-release.apk',
+      testBinaryPath: process.env.PREBUILT_ANDROID_TEST_APK_PATH || 'android/app/build/outputs/apk/androidTest/prod/release/app-prod-release-androidTest.apk',
+      build: `export CONFIGURATION="Release" && yarn build:android:main:e2e`,
     },
-    'android.release': {
+    'android.flask.debug': {
       type: 'android.apk',
-      binaryPath: 'android/app/build/outputs/apk/prod/release/app-prod-release.apk',
-      build: `yarn build:android:main:e2e`,
+      binaryPath: process.env.PREBUILT_ANDROID_APK_PATH || 'android/app/build/outputs/apk/flask/debug/app-flask-debug.apk',
+      testBinaryPath: process.env.PREBUILT_ANDROID_TEST_APK_PATH || 'android/app/build/outputs/apk/androidTest/flask/debug/app-flask-debug-androidTest.apk',
+      build: 'export CONFIGURATION="Debug" && yarn build:android:flask:e2e',
     },
     'android.flask.release': {
       type: 'android.apk',
-      binaryPath: 'android/app/build/outputs/apk/flask/release/app-flask-release.apk',
-      build: `yarn build:android:flask:e2e`,
+      binaryPath: process.env.PREBUILT_ANDROID_APK_PATH || 'android/app/build/outputs/apk/flask/release/app-flask-release.apk',
+      testBinaryPath: process.env.PREBUILT_ANDROID_TEST_APK_PATH || 'android/app/build/outputs/apk/androidTest/flask/release/app-flask-release-androidTest.apk',
+      build: `export CONFIGURATION="Release" && yarn build:android:flask:e2e`,
     },
   },
 };

.eslintignore

@@ -10,9 +10,6 @@ node_modules
 CHANGELOG.md
 wdio
 /app/util/test/testSetup.js
-/app/lib/ppom/ppom.html.js
-/app/lib/ppom/blockaid-version.js
-/ppom
 junitProperties.js
 /e2e/scripts/ai-e2e-tags-selector.ts
-scripts/aggregate-performance-reports.mjs
+scripts/aggregate-performance-reports.mjs

.eslintrc.js

@@ -77,7 +77,7 @@ module.exports = {
       },
     },
     {
-      files: ['scripts/**/*.js', 'app.config.js'],
+      files: ['scripts/**/*.js', 'e2e/tools/**/*.{js,ts}', 'app.config.js'],
       rules: {
         'no-console': 0,
         'import/no-commonjs': 0,