[pull] main from MetaMask:main

.github/workflows/flaky-test-report.yml

@@ -4,14 +4,33 @@ on:
   schedule:
     # Once every day from Monday-Friday at 08:00 UTC
     - cron: 0 8 * * 1-5
+    # 10:00 UTC (Europe morning), Monday–Friday — Playwright test health report
+    - cron: '0 10 * * 1-5'
+    # 15:00 UTC (US morning), Monday–Friday — Playwright test health report
+    - cron: '0 15 * * 1-5'
   workflow_dispatch:
+    inputs:
+      job:
+        description: Which test report to generate
+        type: choice
+        options:
+          - detox
+          - appium
+        default: detox
+      lookback_days:
+        description: Number of days of main CI runs to scan (Appium report only)
+        type: string
+        default: '1'
 
 permissions:
   contents: read
   actions: read
 
 jobs:
   flaky-test-report:
+    if: >-
+      (github.event_name == 'schedule' && github.event.schedule == '0 8 * * 1-5') ||
+      (github.event_name == 'workflow_dispatch' && inputs.job == 'detox')
     runs-on: ubuntu-latest
     steps:
       - name: Generate flaky test report
@@ -21,3 +40,19 @@ jobs:
           workflow-id: ci.yml
           github-token: ${{ secrets.GITHUB_TOKEN }}
           slack-webhook-flaky-tests: ${{ secrets.SLACK_WEBHOOK_FLAKY_TESTS }}
+
+  playwright-test-health-report:
+    if: >-
+      (github.event_name == 'schedule' && (github.event.schedule == '0 10 * * 1-5' || github.event.schedule == '0 15 * * 1-5')) ||
+      (github.event_name == 'workflow_dispatch' && inputs.job == 'appium')
+    runs-on: ubuntu-latest
+    steps:
+      - name: Generate Playwright test health report
+        uses: MetaMask/github-tools/.github/actions/playwright-test-health-report@4a2ddd75e9a8182261f0f07fbfc332cc856c89a0
+        with:
+          repository: ${{ github.event.repository.name }}
+          workflow-ids: ci.yml
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          slack-webhook: ${{ secrets.SLACK_WEBHOOK_PLAYWRIGHT_HEALTH_REPORT }}
+          lookback-days: ${{ github.event_name == 'workflow_dispatch' && inputs.lookback_days || '1' }}
+          report-title: Playwright Test Health Report (Mobile Appium)

.js.env.example

@@ -145,9 +145,11 @@ export MM_MUSD_CONVERSION_MIN_ASSET_BALANCE_REQUIRED="0.01"
 
 # Money Hub
 export MM_MONEY_HUB_ENABLED="false"
+# Money
 export MM_MONEY_PAYMENT_TOKENS_BLOCKLIST=""
 export MM_MONEY_DEPOSIT_NO_FEE_TOKENS=""
 export MM_MONEY_DEPOSIT_MIN_ASSET_BALANCE="0.01"
+export MM_MONEY_FIRST_TIME_DEPOSIT_ANIMATION_ENABLED="true"
 
 # Activates remote feature flag override mode.
 # Remote feature flag values won't be updated,

app/components/Nav/Main/MainNavigator.js

@@ -127,6 +127,7 @@ import {
 } from '../../UI/Money/routes';
 import MoneyOnboardingView from '../../UI/Money/Views/MoneyOnboardingView';
 import MoneyPotentialEarningsView from '../../UI/Money/Views/MoneyPotentialEarningsView';
+import MoneyFirstTimeDepositView from '../../UI/Money/Views/MoneyFirstTimeDepositView';
 import { selectMoneyEnableMoneyAccountFlag } from '../../UI/Money/selectors/featureFlags';
 import { selectIsMoneyAccountGeoEligible } from '../../UI/Money/selectors/eligibility';
 import { BridgeTransactionDetails } from '../../UI/Bridge/components/TransactionDetails/TransactionDetails';
@@ -1221,6 +1222,15 @@ const MainNavigator = () => {
             component={MoneyOnboardingView}
             options={{ headerShown: false, ...fadeNativeOptions }}
           />
+          <NativeStack.Screen
+            name={Routes.MONEY.FIRST_TIME_DEPOSIT}
+            component={MoneyFirstTimeDepositView}
+            options={{
+              ...clearNativeStackNavigatorOptions,
+              ...transparentModalScreenOptions,
+              gestureEnabled: false,
+            }}
+          />
           <NativeStack.Screen
             name={Routes.MONEY.POTENTIAL_EARNINGS}
             component={MoneyPotentialEarningsView}

app/components/Nav/Main/MainNavigator.test.tsx

@@ -80,6 +80,11 @@ jest.mock('../../../selectors/featureFlagController/marketInsights', () => ({
     mockSelectMarketInsightsPerpsEnabled(state),
 }));
 
+jest.mock('../../UI/Money/Views/MoneyFirstTimeDepositView', () => ({
+  __esModule: true,
+  default: () => null,
+}));
+
 jest.mock('../../hooks/useAnalytics/useAnalytics');
 
 jest.mock('../../UI/Money/components/MoneyTabPressTracker', () => ({

app/components/UI/Bridge/_mocks_/initialState.ts

@@ -15,12 +15,9 @@ import { ethers } from 'ethers';
 import { formatChainIdToCaip, StatusTypes } from '@metamask/bridge-controller';
 import { AccountTreeControllerState } from '@metamask/account-tree-controller';
 
-jest.mock(
-  '../../../../core/redux/slices/bridge/utils/hasMinimumRequiredVersion',
-  () => ({
-    hasMinimumRequiredVersion: jest.fn().mockReturnValue(true),
-  }),
-);
+jest.mock('../../../../util/remoteFeatureFlag', () => ({
+  hasMinimumRequiredVersion: jest.fn().mockReturnValue(true),
+}));
 
 export const ethChainId = '0x1' as Hex;
 export const optimismChainId = '0xa' as Hex;

app/components/UI/Bridge/components/SwapsConfirmButton/SwapsConfirmButton.test.tsx

@@ -84,12 +84,9 @@ jest.mock('../../../../../hooks', () => ({
 
 // Mock hasMinimumRequiredVersion so that selectBridgeFeatureFlags does not call
 // compareVersions (which requires a real app version string unavailable in tests).
-jest.mock(
-  '../../../../../core/redux/slices/bridge/utils/hasMinimumRequiredVersion',
-  () => ({
-    hasMinimumRequiredVersion: jest.fn().mockReturnValue(true),
-  }),
-);
+jest.mock('../../../../../util/remoteFeatureFlag', () => ({
+  hasMinimumRequiredVersion: jest.fn().mockReturnValue(true),
+}));
 
 // Mock navigation
 const mockNavigate = jest.fn();

app/components/UI/Bridge/components/TokenWarningModal/TokenWarningModal.test.tsx

@@ -51,12 +51,9 @@ jest.mock('@react-navigation/native', () => ({
   useNavigation: () => ({ replace: mockReplace }),
 }));
 
-jest.mock(
-  '../../../../../core/redux/slices/bridge/utils/hasMinimumRequiredVersion',
-  () => ({
-    hasMinimumRequiredVersion: jest.fn().mockReturnValue(true),
-  }),
-);
+jest.mock('../../../../../util/remoteFeatureFlag', () => ({
+  hasMinimumRequiredVersion: jest.fn().mockReturnValue(true),
+}));
 
 import { useParams } from '../../../../../util/navigation/navUtils';
 import { useLatestBalance } from '../../hooks/useLatestBalance';

app/components/UI/Bridge/hooks/useBridgeQuoteData/BridgeQuoteDataContext.test.tsx

@@ -25,12 +25,9 @@ jest.mock('../../utils/quoteUtils', () => ({
   shouldRefreshQuote: jest.fn(),
 }));
 
-jest.mock(
-  '../../../../../core/redux/slices/bridge/utils/hasMinimumRequiredVersion',
-  () => ({
-    hasMinimumRequiredVersion: jest.fn(() => true),
-  }),
-);
+jest.mock('../../../../../util/remoteFeatureFlag', () => ({
+  hasMinimumRequiredVersion: jest.fn(() => true),
+}));
 
 jest.mock('@metamask/bridge-controller', () => {
   const actual = jest.requireActual('@metamask/bridge-controller');

app/components/UI/Bridge/hooks/useBridgeQuoteEvents/useBridgeQuoteEvents.test.tsx

@@ -14,12 +14,9 @@ jest.mock('../../../../../core/Engine', () => ({
   },
 }));
 
-jest.mock(
-  '../../../../../core/redux/slices/bridge/utils/hasMinimumRequiredVersion',
-  () => ({
-    hasMinimumRequiredVersion: jest.fn().mockReturnValue(true),
-  }),
-);
+jest.mock('../../../../../util/remoteFeatureFlag', () => ({
+  hasMinimumRequiredVersion: jest.fn().mockReturnValue(true),
+}));
 
 describe('useBridgeQuoteEvents', () => {
   beforeEach(() => {

app/components/UI/Bridge/hooks/useInitialBridgeTokens.test.ts

@@ -19,12 +19,9 @@ jest.mock('../../../../core/Engine', () => ({
 }));
 
 const mockHasMinimumRequiredVersion = jest.fn();
-jest.mock(
-  '../../../../core/redux/slices/bridge/utils/hasMinimumRequiredVersion',
-  () => ({
-    hasMinimumRequiredVersion: () => mockHasMinimumRequiredVersion(),
-  }),
-);
+jest.mock('../../../../util/remoteFeatureFlag', () => ({
+  hasMinimumRequiredVersion: () => mockHasMinimumRequiredVersion(),
+}));
 
 const mockPopularTokens = [
   createMockPopularToken({