Skip to content

Commit a9423c3

Browse files
committed
Merge origin/main into stable-main-13.56.0
2 parents 6c77160 + 1809248 commit a9423c3

718 files changed

Lines changed: 27195 additions & 13124 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.cursor/BUGBOT.md‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ Use `mms-extension-testing` unit reference for unit-test quality and bug detecti
3939
- Check for proper imports from the E2E framework
4040
- Verify Page Object Model pattern is used
4141
- Ensure tests are written in TypeScript (.spec.ts)
42-
- **ALWAYS** apply the Page Object Model rules in sections **3.3–3.9** to every changed file under `test/e2e/`. These sections are written for **local review** (CODEBOT / `/review` / local Bugbot run) and for agent self-check while writing tests — see `mms-extension-testing` → `references/e2e/pom-antipatterns.md`.
42+
- **ALWAYS** apply the Page Object Model rules in sections **3.3–3.10** to every changed file under `test/e2e/`. These sections are written for **local review** (CODEBOT / `/review` / local Bugbot run) and for agent self-check while writing tests — see `mms-extension-testing` → `references/e2e/pom-antipatterns.md`.
4343

4444
Use `mms-extension-testing` E2E references for test quality and POM enforcement.
4545

@@ -157,6 +157,13 @@ When both conditions hold, inspect the fixture builder chain in the same `withFi
157157
- Do not report `try`/`catch` inside a `driver.wait` polling callback that returns `false`, or framework helpers under `test/e2e/webdriver/`.
158158
- Severity: **MEDIUM**. Comment: "Do not swallow failures in page objects or flows. Let the error surface, and use driver wait helpers and `check*` methods with clear error messages."
159159

160+
#### 3.10 New page object and the route registry (Non-Blocking)
161+
162+
- Scope: new files under `test/e2e/page-objects/pages/**/*.{ts,js}`.
163+
- Detect: the diff adds a page object class and does not change `test/e2e/route-registry/route-registry.ts`.
164+
- Do not report page objects for modals, components, navbars, headers or any other part of a screen that no route renders on its own. Only full screens with their own route belong in the registry.
165+
- Severity: **LOW** (suggestion), non-blocking. Comment: "Does this page object cover a full screen with its own route? If so, consider mapping it in `test/e2e/route-registry/route-registry.ts` (replacing `null`) so route coverage and `mm describe-screen` pick it up. Ignore this if it is a modal or component."
166+
160167
### 4. Controller Guidelines
161168

162169
- **ALWAYS** load and reference [controller-guidelines](rules/controller-guidelines/RULE.md)

‎.depcheckrc.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ ignores:
5151
- '@metamask/snap-account-abstraction-keyring-site'
5252
- '@metamask/test-snaps'
5353
- '@metamask/design-tokens' # Only imported in index.css
54-
- '@tsconfig/node22' # required dynamically by TS, used in tsconfig.json
5554
- '@sentry/cli' # invoked as `sentry-cli`
5655
- 'chromedriver'
5756
- 'depcheck' # ooo meta

‎.github/CODEOWNERS‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,12 +153,12 @@ ui/components/app/import-token @MetaMask/core-ex
153153
ui/components/app/toast-listener @MetaMask/core-extension-ux
154154
ui/components/ui/toast @MetaMask/core-extension-ux
155155
ui/css @MetaMask/core-extension-ux
156+
ui/hooks/activity/ @MetaMask/core-extension-ux
156157
shared/lib/activity @MetaMask/core-extension-ux
157158
ui/pages/home @MetaMask/core-extension-ux
158159
ui/pages/activity @MetaMask/core-extension-ux
159160
ui/pages/core @MetaMask/core-extension-ux
160161
ui/pages/details @MetaMask/core-extension-ux
161-
ui/pages/details/templates/ramps/ @MetaMask/money-movement
162162
ui/pages/permissions-connect/ @MetaMask/core-extension-ux
163163
ui/pages/settings @MetaMask/core-extension-ux
164164
ui/pages/settings/mfa-settings @MetaMask/accounts-engineers
@@ -281,6 +281,17 @@ shared/lib/deep-links/routes/musd.ts @MetaMask/earn
281281
ui/selectors/money/ @MetaMask/earn
282282
ui/components/app/money/ @MetaMask/earn
283283

284+
# Activity
285+
ui/selectors/activity.ts @MetaMask/core-extension-ux
286+
ui/selectors/activity/ @MetaMask/core-extension-ux
287+
ui/components/app/activity-list-item-avatar/ @MetaMask/core-extension-ux
288+
ui/components/app/transaction-activity-empty-state/ @MetaMask/core-extension-ux
289+
ui/pages/details/templates/ramps/ @MetaMask/core-extension-ux @MetaMask/money-movement
290+
ui/pages/details/templates/perps/ @MetaMask/core-extension-ux @MetaMask/perps
291+
ui/pages/details/templates/money/ @MetaMask/core-extension-ux @MetaMask/earn
292+
ui/pages/details/templates/bridge/ @MetaMask/swaps-engineers @MetaMask/core-extension-ux
293+
ui/selectors/activity/musd/ @MetaMask/core-extension-ux @MetaMask/earn
294+
284295

285296
# Extension Platform owns build, development tooling,
286297
# CI, background process, and platform infrastructure. Changes to

‎.github/scripts/collect-qa-stats.mts‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -960,6 +960,39 @@ async function collectFeatureFlagCoverage(): Promise<Record<string, number>> {
960960
};
961961
}
962962

963+
// ---------------------------------------------------------------------------
964+
// Route page object coverage collector
965+
// ---------------------------------------------------------------------------
966+
967+
/**
968+
* Reports how many extension routes have an E2E page object, using the
969+
* shared report generator in test/e2e/scripts/route-coverage-report.ts.
970+
*
971+
* No artifact download required — the analysis compares `ROUTES` with the
972+
* route page object registry in test/e2e/route-registry.
973+
*/
974+
async function collectRouteCoverage(): Promise<Record<string, number>> {
975+
console.log('[e2e_routes] running static route coverage analysis...');
976+
977+
const { generateReport } =
978+
await import('../../test/e2e/scripts/route-coverage-report');
979+
980+
const { summary } = generateReport();
981+
982+
console.log(
983+
`[e2e_routes] total: ${summary.totalRoutes}, with page object: ${summary.withPageObject}, coverage: ${summary.coveragePercentage}%`,
984+
);
985+
986+
return {
987+
total_routes: summary.totalRoutes,
988+
routes_with_page_object: summary.withPageObject,
989+
routes_without_page_object: summary.withoutPageObject,
990+
unregistered_routes: summary.unregistered,
991+
stale_registry_entries: summary.staleEntries,
992+
coverage_percentage: summary.coveragePercentage,
993+
};
994+
}
995+
963996
// ---------------------------------------------------------------------------
964997
// Main
965998
// ---------------------------------------------------------------------------
@@ -974,6 +1007,7 @@ async function main(): Promise<void> {
9741007
{ namespace: 'benchmark', collect: collectBenchmarkScenarioCount },
9751008
{ namespace: 'metametrics', collect: collectMetametricsQaStats },
9761009
{ namespace: 'e2e_feature_flags', collect: collectFeatureFlagCoverage },
1010+
{ namespace: 'e2e_routes', collect: collectRouteCoverage },
9771011
];
9781012

9791013
for (const { namespace, collect } of collectors) {

‎.github/workflows/qa-stats.yml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,9 @@ jobs:
2727
- name: Generate feature flag coverage report
2828
run: yarn test:e2e:feature-flag:coverage
2929

30+
- name: Generate route coverage report
31+
run: yarn test:e2e:route-coverage
32+
3033
- name: Collect QA stats
3134
run: yarn tsx .github/scripts/collect-qa-stats.mts
3235
env:
@@ -46,3 +49,10 @@ jobs:
4649
name: feature-flag-coverage-report
4750
path: ./test/test-results/e2e/feature-flag-coverage-report.json
4851
if-no-files-found: warn
52+
53+
- name: Upload route coverage report
54+
uses: actions/upload-artifact@v7
55+
with:
56+
name: route-coverage-report
57+
path: ./test/test-results/e2e/route-coverage-report.json
58+
if-no-files-found: warn

‎AGENTS.md‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1022,11 +1022,10 @@ When the user explicitly asks for visual verification of UI behavior (e.g., "ver
10221022
**Workflow:**
10231023

10241024
0. Build if needed (`yarn build:test`), then `mm launch` (this auto-starts the daemon)
1025-
1. **Query prior knowledge:** Run `mm knowledge-search "<flow>"` and `mm knowledge-sessions` to reuse previously discovered flows and avoid wasting tokens rediscovering known sequences.
1026-
2. Always call `mm describe-screen` before acting to discover targets
1027-
3. Use `mm click`/`mm type`/`mm wait-for` to drive the flow
1028-
4. Provide evidence via `mm screenshot` and/or final `mm describe-screen` output
1029-
5. Always end with `mm cleanup` (even on failure)
1025+
1. Always call `mm describe-screen` before acting to discover targets
1026+
2. Use `mm click`/`mm type`/`mm wait-for` to drive the flow
1027+
3. Provide evidence via `mm screenshot` and/or final `mm describe-screen` output
1028+
4. Always end with `mm cleanup` (even on failure)
10301029

10311030
**If CLI is unavailable or denied:** Say so explicitly and explain what's missing. Do not claim you verified without actual tool output as evidence.
10321031

‎app/_locales/de/messages.json‎

Lines changed: 3 additions & 22 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎app/_locales/el/messages.json‎

Lines changed: 3 additions & 22 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)