Merge branch 'main' into fix/20982-update-send-nft-flow-to-use-correct-chainid

Author: Prithpal-Sooriya

.cursor/BUGBOT.md

@@ -6,10 +6,18 @@ Automated test quality enforcement and bug detection for MetaMask Mobile React N
 
 ## Execution Protocol
 
-### 1. Initial Setup
+### 1. Initial Setup - Unit Tests
 
 - **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.
+Use the rules in the [unit testing guidelines](rules/unit-testing-guidelines.mdc) to enforce the test quality and bug detection.
+
+### 2. Initial Setup - E2E Tests
+
+- **ALWAYS** load and reference [e2e-testing-guidelines](rules/e2e-testing-guidelines.mdc)
+- Verify test file naming pattern: `e2e/specs/**/*.spec.{js,ts}`
+- Check for proper imports and framework utilities from `e2e/framework/index.ts`
+
+Use the rules in the [e2e-testing-guidelines](rules/e2e-testing-guidelines.mdc) to enforce the test quality and bug detection.

e2e/.cursor/rules/e2e-testing-guidelines.mdc renamed to .cursor/rules/e2e-testing-guidelines.mdc

@@ -23,16 +23,17 @@ alwaysApply: true
 - Include multiple behaviors with 'and' in a single test name
 - Use vague or generic names
 
-## Test Organization
+## Test Organization - MANDATORY
 
 - Organize tests into folders based on features and scenarios
 - Each feature team should own one or more folders of tests
 - Follow the same organization pattern as the extension team for consistency
 - Place tests in logical feature directories:
   ```
-  e2e/tests/tokens/import/import-erc1155.spec.js
-  e2e/tests/settings/clear-activity.spec.js
-  e2e/tests/ppom/ppom-blockaid-alert-erc20-approval.spec.js
+  e2e/specs/<feature-name>/<e2e-test-name.spec.ts>
+  e2e/specs/tokens/import/import-erc1155.spec.ts
+  e2e/specs/settings/clear-activity.spec.ts
+  e2e/specs/ppom/ppom-blockaid-alert-erc20-approval.spec.ts
   ```
 
 ## Framework Architecture
@@ -161,7 +162,7 @@ export default new LoginPage();
   });
   ```
 
-### Framework Imports
+### Framework Imports - MANDATORY
 - ALWAYS import framework utilities from `e2e/framework/index.ts`, not from individual utility files
 - Use the centralized framework exports for consistency and maintainability
 
@@ -189,7 +190,7 @@ await Gestures.tap(processingButton, {
 });
 ```
 
-### Prohibited Patterns in Test Specs
+### Prohibited Patterns in Test Specs - MANDATORY
 The following patterns are prohibited in test specs:
 
 1. **Direct Element Selection**
@@ -273,7 +274,7 @@ async tapOpenAllTabsButton(): Promise<void> {
 }
 ```
 
-## Code Review Checklist
+## Code Review Checklist - MANDATORY
 
 Before submitting E2E tests, ensure:
 

.github/guidelines/LABELING_GUIDELINES.md

@@ -19,10 +19,6 @@ The check can be bypassed when necessary, either by setting the changelog entry
 
 Any label can be manually added on demand depending on the PR's content. For instance, the label **QA passed** will indicate that a thorough manual testing has been performed and the PR is ready to be merged. In addition, following labels have some specific use cases.
 
-### Run Flask Android E2E tests
-
-- **run-android-flask-e2e-smoke**: The Android Flask E2E smoke tests jobs will run in the given PR. They also run on schedule on main branch.
-
 ### Bypass Quality Gates
 
 Using any of these labels should be exceptional in case of CI friction and urgencies. Please use them reasonably and verify new changes and regressions manually.

.github/workflows/ci.yml

@@ -257,6 +257,8 @@ jobs:
           repository: ${{ github.repository }}
           post-comment: 'true'
 
+  # Main E2E tests
+  
   build-android-apks:
     name: 'Build Android APKs'
     if: ${{ github.event_name != 'merge_group' && needs.needs_e2e_build.outputs.android_changed == 'true' }}
@@ -314,6 +316,34 @@ jobs:
       changed_files: ${{ needs.needs_e2e_build.outputs.changed_files }}
     secrets: inherit
 
+  # Flask E2E tests
+
+  build-android-flask-apks:
+    name: 'Build Android Flask APKs'
+    if: ${{ github.event_name != 'merge_group' && needs.needs_e2e_build.outputs.android_changed == 'true' }}
+    permissions:
+      contents: read
+      id-token: write
+    needs: [needs_e2e_build]
+    uses: ./.github/workflows/build-android-e2e.yml
+    with:
+      build_type: 'flask'
+      metamask_environment: 'e2e'
+      keystore_target: 'flask'
+    secrets: inherit
+
+  e2e-smoke-tests-android-flask:
+    name: 'Android Flask E2E Smoke Tests'
+    if: ${{ github.event_name != 'merge_group' && needs.needs_e2e_build.outputs.android_changed == 'true' }}
+    permissions:
+      contents: read
+      id-token: write
+    needs: [needs_e2e_build, build-android-flask-apks]
+    uses: ./.github/workflows/run-e2e-smoke-tests-android-flask.yml
+    with:
+      changed_files: ${{ needs.needs_e2e_build.outputs.changed_files }}
+    secrets: inherit
+
   js-bundle-size-check:
     runs-on: ubuntu-latest
     steps:
@@ -334,6 +364,8 @@ jobs:
 
       - name: Generate iOS bundle
         run: yarn gen-bundle:ios
+        env:
+          NODE_OPTIONS: --max_old_space_size=8192
 
       - name: Check bundle size
         run: ./scripts/js-bundle-stats.sh ios/main.jsbundle 52
@@ -499,6 +531,7 @@ jobs:
       - needs_e2e_build
       - e2e-smoke-tests-android
       - e2e-smoke-tests-ios
+      - e2e-smoke-tests-android-flask
     steps:
       - run: |
           # Check if all non-E2E jobs passed
@@ -517,6 +550,10 @@ jobs:
               echo "iOS E2E tests failed"
               exit 1
             fi
+            if [[ "${{ needs.e2e-smoke-tests-android-flask.result }}" == "failure" ]]; then
+              echo "Android Flask E2E tests failed"
+              exit 1
+            fi
           fi
 
           echo "All required jobs passed"

.github/workflows/run-e2e-smoke-tests-android-flask.yml

@@ -1,69 +1,41 @@
 name: Android Flask E2E Smoke Tests
 
 on:
-  pull_request:
-    types: [labeled, opened, synchronize]
-  schedule:
-    # Run the full suite every 3 hours
-    # This helps to identy the flaky and failed tests on main branch
-    - cron: '0 */3 * * *'
+  workflow_call:
+    inputs:
+      changed_files:
+        description: 'Changed files'
+        required: false
+        type: string
+        default: ''
 
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: ${{ !(contains(github.ref, 'refs/heads/main') || contains(github.ref, 'refs/heads/stable')) }}
+permissions:
+  contents: read
+  id-token: write
 
 jobs:
-  needs_e2e_build:
-    name: 'Detect Mobile Build Changes'
-    # Execution rules:
-    # - schedule: always run
-    # - merge_group: never run
-    # - pull_request: run only if PR has 'run-android-flask-e2e-smoke' label
-    if: ${{ github.event_name != 'merge_group' && (github.event_name == 'schedule' || (github.event_name == 'pull_request' && contains(github.event.pull_request.labels.*.name, 'run-android-flask-e2e-smoke') && github.event.pull_request.merged == false)) }}
-    uses: ./.github/workflows/needs-e2e-build.yml
-
-  build-android-flask-apps:
-    name: 'Build Android Flask Apps'
-    # Execution rules:
-    # - schedule: always run
-    # - merge_group: never run
-    # - pull_request: run only if PR has 'run-android-flask-e2e-smoke' label AND android_changed == 'true'
-    if: ${{ github.event_name != 'merge_group' && ( github.event_name == 'schedule' || ( github.event_name == 'pull_request' && needs.needs_e2e_build.outputs.android_changed == 'true' && contains(github.event.pull_request.labels.*.name, 'run-android-flask-e2e-smoke') ) ) }}
-    permissions:
-      contents: read
-      id-token: write
-    needs: [needs_e2e_build]
-    uses: ./.github/workflows/build-android-e2e.yml
-    with:
-      build_type: 'flask'
-      metamask_environment: 'e2e'
-      keystore_target: 'flask'
-    secrets: inherit
-
   flask-android-smoke:
     strategy:
       matrix:
         split: [1, 2, 3]
       fail-fast: false
-    needs: [build-android-flask-apps]
     uses: ./.github/workflows/run-e2e-workflow.yml
     with:
       test-suite-name: flask-android-smoke-${{ matrix.split }}
       platform: android
       test_suite_tag: 'FlaskBuildTests'
       split_number: ${{ matrix.split }}
       total_splits: 3
+      changed_files: ${{ inputs.changed_files }}
       build_type: 'flask'
-      metamask_environment: 'e2e'
     secrets: inherit
 
   report-android-smoke-tests:
     name: Report Android Smoke Tests
     runs-on: ubuntu-latest
-    if: ${{ !cancelled() && needs.flask-android-smoke.result != 'skipped'  }}
+    if: ${{ !cancelled() }}
     needs:
       - flask-android-smoke
-
     steps:
       - name: Checkout
         uses: actions/checkout@v4

app/component-library/components-temp/MultichainAccounts/MultichainAddWalletActions/MultichainAddWalletActions.tsx

@@ -4,7 +4,6 @@ import { SafeAreaView } from 'react-native';
 import { useNavigation } from '@react-navigation/native';
 
 // External dependencies.
-import BottomSheetHeader from '../../../../component-library/components/BottomSheets/BottomSheetHeader';
 import { IconName } from '@metamask/design-system-react-native';
 import ActionListItem from '../../ActionListItem';
 import { strings } from '../../../../../locales/i18n';
@@ -88,9 +87,6 @@ const MultichainAddWalletActions = ({
   return (
     <SafeAreaView>
       <Fragment>
-        <BottomSheetHeader>
-          {strings('multichain_accounts.add_wallet')}
-        </BottomSheetHeader>
         {actionConfigs.map(
           (config) =>
             config.isVisible && (

app/component-library/components-temp/MultichainAccounts/MultichainAddWalletActions/__snapshots__/MultichainAddWalletActions.test.tsx.snap

@@ -313,46 +313,6 @@ exports[`MultichainAddWalletActions renders correctly 1`] = `
                     }
                   >
                     <RCTSafeAreaView>
-                      <View
-                        style={
-                          [
-                            {
-                              "backgroundColor": "#ffffff",
-                              "flexDirection": "row",
-                              "gap": 16,
-                              "padding": 16,
-                            },
-                            false,
-                          ]
-                        }
-                        testID="header"
-                      >
-                        <View
-                          style={
-                            {
-                              "alignItems": "center",
-                              "flex": 1,
-                            }
-                          }
-                        >
-                          <Text
-                            accessibilityRole="text"
-                            style={
-                              {
-                                "color": "#121314",
-                                "fontFamily": "Geist Bold",
-                                "fontSize": 16,
-                                "letterSpacing": 0,
-                                "lineHeight": 24,
-                                "textAlign": "center",
-                              }
-                            }
-                            testID="header-title"
-                          >
-                            Add wallet
-                          </Text>
-                        </View>
-                      </View>
                       <View
                         accessibilityState={
                           {

app/components/Nav/App/App.tsx

@@ -416,6 +416,15 @@ const RootModalFlow = (props: RootModalFlowProps) => (
     <Stack.Screen
       name={Routes.SHEET.ACCOUNT_SELECTOR}
       component={AccountSelector}
+      options={{
+        cardStyle: { backgroundColor: importedColors.transparent },
+        cardStyleInterpolator: () => ({
+          overlayStyle: {
+            opacity: 0,
+          },
+        }),
+        detachPreviousScreen: false,
+      }}
     />
     <Stack.Screen
       name={Routes.SHEET.ADDRESS_SELECTOR}

app/components/Nav/Main/MainNavigator.js

@@ -100,13 +100,9 @@ import {
   PerpsScreenStack,
   PerpsModalStack,
   PerpsTutorialCarousel,
-  selectPerpsEnabledFlag,
 } from '../../UI/Perps';
-import {
-  PredictScreenStack,
-  PredictModalStack,
-  selectPredictEnabledFlag,
-} from '../../UI/Predict';
+import { PredictScreenStack, PredictModalStack } from '../../UI/Predict';
+import { useFeatureFlag, FeatureFlagNames } from '../../hooks/useFeatureFlag';
 import { selectAssetsTrendingTokensEnabled } from '../../../selectors/featureFlagController/assetsTrendingTokens';
 import PerpsPositionTransactionView from '../../UI/Perps/Views/PerpsTransactionsView/PerpsPositionTransactionView';
 import PerpsOrderTransactionView from '../../UI/Perps/Views/PerpsTransactionsView/PerpsOrderTransactionView';
@@ -921,11 +917,15 @@ const SampleFeatureFlow = () => (
 
 const MainNavigator = () => {
   // Get feature flag state for conditional Perps screen registration
-  const perpsEnabledFlag = useSelector(selectPerpsEnabledFlag);
+  const perpsEnabledFlag = useFeatureFlag(
+    FeatureFlagNames.perpsPerpTradingEnabled,
+  );
   const isEvmSelected = useSelector(selectIsEvmNetworkSelected);
   const isPerpsEnabled = useMemo(() => perpsEnabledFlag, [perpsEnabledFlag]);
   // Get feature flag state for conditional Predict screen registration
-  const predictEnabledFlag = useSelector(selectPredictEnabledFlag);
+  const predictEnabledFlag = useFeatureFlag(
+    FeatureFlagNames.predictTradingEnabled,
+  );
   const isPredictEnabled = useMemo(
     () => predictEnabledFlag,
     [predictEnabledFlag],

app/components/UI/AssetOverview/AssetOverview.tsx

@@ -62,8 +62,7 @@ import {
 } from '../../../util/analytics/actionButtonTracking';
 import { selectSelectedAccountGroup } from '../../../selectors/multichainAccounts/accountTreeController';
 import { selectSelectedInternalAccountByScope } from '../../../selectors/multichainAccounts/accounts';
-import { useRampNavigation, RampMode } from '../Ramp/hooks/useRampNavigation';
-import { RampType as AggregatorRampType } from '../Ramp/Aggregator/types';
+import { useRampNavigation } from '../Ramp/hooks/useRampNavigation';
 import { TokenI } from '../Tokens/types';
 import AssetDetailsActions from '../../../components/Views/AssetDetails/AssetDetailsActions';
 import {
@@ -87,7 +86,7 @@ import { formatChainIdToCaip } from '@metamask/bridge-controller';
 import { InitSendLocation } from '../../Views/confirmations/constants/send';
 import { useSendNavigation } from '../../Views/confirmations/hooks/useSendNavigation';
 import { selectMultichainAccountsState2Enabled } from '../../../selectors/featureFlagController/multichainAccounts';
-import parseRampIntent from '../Ramp/Aggregator/utils/parseRampIntent';
+import parseRampIntent from '../Ramp/utils/parseRampIntent';
 ///: BEGIN:ONLY_INCLUDE_IF(tron)
 import TronEnergyBandwidthDetail from './TronEnergyBandwidthDetail/TronEnergyBandwidthDetail';
 ///: END:ONLY_INCLUDE_IF
@@ -169,7 +168,7 @@ const AssetOverview: React.FC<AssetOverviewProps> = ({
   ///: END:ONLY_INCLUDE_IF
 
   const currentAddress = asset.address as Hex;
-  const { goToRamps } = useRampNavigation();
+  const { goToBuy } = useRampNavigation();
 
   const { data: prices = [], isLoading } = useTokenHistoricalPrices({
     asset,
@@ -339,13 +338,7 @@ const AssetOverview: React.FC<AssetOverviewProps> = ({
       assetId = undefined;
     }
 
-    goToRamps({
-      mode: RampMode.AGGREGATOR,
-      params: {
-        rampType: AggregatorRampType.BUY,
-        intent: assetId ? { assetId } : undefined,
-      },
-    });
+    goToBuy({ assetId });
 
     trackEvent(
       createEventBuilder(MetaMetricsEvents.BUY_BUTTON_CLICKED)