Merge branch 'main' into test/temp-nightly

Author: tommasini

.github/CODEOWNERS

@@ -121,8 +121,10 @@ app/components/Views/AccountSelector                        @MetaMask/accounts-e
 **/multichainAccounts/**                                    @MetaMask/accounts-engineers
 
 # Swaps Team
-app/components/UI/Swaps              @MetaMask/swaps-engineers
-app/components/UI/Bridge             @MetaMask/swaps-engineers
+app/components/UI/Swaps                                  @MetaMask/swaps-engineers
+app/components/UI/Bridge                                 @MetaMask/swaps-engineers
+app/core/Engine/controllers/bridge-controller            @MetaMask/swaps-engineers
+app/core/Engine/controllers/bridge-status-controller     @MetaMask/swaps-engineers
 
 # Notifications Team
 app/components/Views/Notifications @MetaMask/notifications

.github/scripts/collect-qa-stats.mjs

@@ -190,6 +190,7 @@ jobs:
         with:
           name: ios-bundle
           path: ios/main.jsbundle
+          retention-days: 7
 
   ship-js-bundle-size-check:
     runs-on: ubuntu-latest
@@ -262,6 +263,7 @@ jobs:
           name: coverage-unit-${{ matrix.shard }}
           path: ./tests/coverage/
           if-no-files-found: error
+          retention-days: 7
       - name: Require clean working directory
         shell: bash
         run: |
@@ -272,6 +274,8 @@ jobs:
             echo "No changes detected"
           fi
 
+  # We need to merge both unit and component view tests into a single coverage report so the PR coverage
+  # threshold calculation is accurate.
   merge-unit-and-component-view-tests:
     runs-on: ubuntu-latest
     needs: [unit-tests, component-view-tests]
@@ -321,6 +325,11 @@ jobs:
             [ -f "$file" ] && cp "$file" ./tests/coverage-cv-merged/
           done
 
+          mkdir -p tests/coverage-unit-merged
+          for file in ./tests/coverage/coverage-unit-*/coverage-unit-*.json; do
+            [ -f "$file" ] && cp "$file" ./tests/coverage-unit-merged/
+          done
+
           find ./tests/coverage/coverage-* -name 'coverage-*.json' -exec mv {} ./tests/coverage/ \;
       - run: yarn test:merge-coverage
       - run: yarn test:validate-coverage
@@ -329,23 +338,41 @@ jobs:
           name: lcov.info
           path: ./tests/merged-coverage/lcov.info
           if-no-files-found: error
+          retention-days: 7
       - uses: actions/upload-artifact@v4
         with:
           name: cv-test-stats
           path: ./cv-test-stats.json
           if-no-files-found: error
+          retention-days: 7
       - uses: actions/upload-artifact@v4
         with:
           name: unit-test-stats
           path: ./unit-test-stats.json
           if-no-files-found: error
-      - name: Generate CV test HTML coverage report
-        run: yarn nyc report --temp-dir ./tests/coverage-cv-merged --report-dir ./tests/coverage-cv-lcov --reporter html
+          retention-days: 7
+      - name: Generate CV test coverage report
+        run: yarn nyc report --temp-dir ./tests/coverage-cv-merged --report-dir ./tests/coverage-cv-lcov --reporter html --reporter json-summary
       - uses: actions/upload-artifact@v4
         with:
           name: cv-test-coverage-html
           path: ./tests/coverage-cv-lcov/
           if-no-files-found: error
+          retention-days: 7
+      - uses: actions/upload-artifact@v4
+        with:
+          name: cv-test-coverage-summary
+          path: ./tests/coverage-cv-lcov/coverage-summary.json
+          if-no-files-found: error
+          retention-days: 7
+      - name: Generate unit test coverage summary
+        run: yarn nyc report --temp-dir ./tests/coverage-unit-merged --report-dir ./tests/coverage-unit-lcov --reporter json-summary
+      - uses: actions/upload-artifact@v4
+        with:
+          name: unit-test-coverage-summary
+          path: ./tests/coverage-unit-lcov/coverage-summary.json
+          if-no-files-found: error
+          retention-days: 7
       - name: Require clean working directory
         shell: bash
         run: |
@@ -397,6 +424,7 @@ jobs:
           name: coverage-cv-${{ matrix.shard }}
           path: ./tests/coverage/
           if-no-files-found: error
+          retention-days: 7
 
   needs_e2e_build:
     uses: ./.github/workflows/needs-e2e-build.yml

.github/workflows/ci.yml

@@ -1,19 +1,13 @@
 name: QA Stats
 
 on:
-  workflow_run:
-    workflows:
-      - ci
-    types:
-      - completed
-    branches:
-      - main
+  schedule:
+    - cron: '0 4 * * *'
 
 jobs:
   collect-qa-stats:
     name: Collect QA Stats
     runs-on: ubuntu-latest
-    if: ${{ github.event.workflow_run.conclusion == 'success' && github.event.workflow_run.event == 'push' && github.event.workflow_run.head_repository.full_name == github.repository }}
 
     steps:
       - uses: actions/checkout@v6
@@ -26,7 +20,7 @@ jobs:
         run: node .github/scripts/collect-qa-stats.mjs
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          WORKFLOW_RUN_ID: ${{ github.event.workflow_run.id }}
+          GITHUB_REPOSITORY: ${{ github.repository }}
 
       - name: Upload QA stats artifact
         uses: actions/upload-artifact@v6

.github/workflows/qa-stats.yml

@@ -205,3 +205,4 @@ jobs:
         with:
           name: e2e-smoke-android-flask-all-test-artifacts
           path: all-test-artifacts/
+          retention-days: 7

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

@@ -259,6 +259,7 @@ jobs:
         with:
           name: e2e-smoke-android-all-test-artifacts
           path: all-test-artifacts/
+          retention-days: 7
 
       - name: Create mobile JSON test report
         id: create-json-report
@@ -290,3 +291,4 @@ jobs:
         with:
           name: test-e2e-android-json-report
           path: test/test-results/test-runs-android.json
+          retention-days: 7

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

@@ -181,3 +181,4 @@ jobs:
         with:
           name: e2e-smoke-ios-flask-all-test-artifacts
           path: all-test-artifacts/
+          retention-days: 7

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

@@ -283,6 +283,7 @@ jobs:
         with:
           name: e2e-smoke-ios-all-test-artifacts
           path: all-test-artifacts/
+          retention-days: 7
 
       - name: Create mobile JSON test report
         id: create-json-report
@@ -314,3 +315,4 @@ jobs:
         with:
           name: test-e2e-ios-json-report
           path: test/test-results/test-runs-ios.json
+          retention-days: 7

.github/workflows/run-e2e-smoke-tests-ios.yml

@@ -208,4 +208,7 @@ export MM_PREDICT_ENABLED="true"
 export MM_CARD_BAANX_API_CLIENT_KEY_DEV=""
 
 ## PNA25 (Privacy Notice)
-export MM_EXTENSION_UX_PNA25=""
+export MM_EXTENSION_UX_PNA25=""
+
+## Metro
+export METRO_RESET_CACHE="true"

.js.env.example

@@ -47,8 +47,6 @@ import AccountBackupStep1B from '../../Views/AccountBackupStep1B';
 import ManualBackupStep1 from '../../Views/ManualBackupStep1';
 import ManualBackupStep2 from '../../Views/ManualBackupStep2';
 import ManualBackupStep3 from '../../Views/ManualBackupStep3';
-import PaymentRequest from '../../UI/PaymentRequest';
-import PaymentRequestSuccess from '../../UI/PaymentRequestSuccess';
 import ContactForm from '../../Views/Settings/Contacts/ContactForm';
 import ActivityView from '../../Views/ActivityView';
 import RewardsNavigator from '../../UI/Rewards/RewardsNavigator';
@@ -849,21 +847,6 @@ const OfflineModeView = () => (
   </Stack.Navigator>
 );
 
-const PaymentRequestView = () => (
-  <Stack.Navigator>
-    <Stack.Screen
-      name="PaymentRequest"
-      component={PaymentRequest}
-      options={PaymentRequest.navigationOptions}
-    />
-    <Stack.Screen
-      name="PaymentRequestSuccess"
-      component={PaymentRequestSuccess}
-      options={PaymentRequestSuccess.navigationOptions}
-    />
-  </Stack.Navigator>
-);
-
 /* eslint-disable react/prop-types */
 const NotificationsModeView = (props) => (
   <Stack.Navigator>
@@ -1067,7 +1050,6 @@ const MainNavigator = () => {
         component={NftFullView}
         options={{ headerShown: false, ...slideFromRightAnimation }}
       />
-      <Stack.Screen name="PaymentRequestView" component={PaymentRequestView} />
       <Stack.Screen
         name={Routes.RAMP.TOKEN_SELECTION}
         component={TokenListRoutes}