From 2c7b81edb46357a300f8b4ea7f9db393b682bb64 Mon Sep 17 00:00:00 2001 From: Clement Date: Fri, 12 Jun 2026 00:26:01 +0200 Subject: [PATCH] docs(frontend): divergences doc readability polish End-to-end read-through fixes: - Intro now says "modified, added, or removed" (the Removed category was added later) and points at the Conflict-recovery procedure as the replay guide. - Reflowed the awkward `pure/{...}` brace expansion that was split across a line break into two code spans; now each trader pure-component is its own code span. No content/behavior change; structure + cross-references verified (balanced code spans, headings, SHAs valid, severance grep zero). Co-Authored-By: Claude Opus 4.8 --- apps/frontend/.ophis-divergences.md | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/apps/frontend/.ophis-divergences.md b/apps/frontend/.ophis-divergences.md index aa8adda3..4fc60c42 100644 --- a/apps/frontend/.ophis-divergences.md +++ b/apps/frontend/.ophis-divergences.md @@ -1,8 +1,9 @@ # apps/frontend — divergences from upstream cowprotocol/cowswap -Files modified or added beyond the original subtree merge. When running -`git subtree pull --prefix=apps/frontend cowswap-upstream main --squash`, -expect conflicts on these paths and re-apply the changes manually. +Files modified, added, or removed beyond the original subtree merge. When running +`git subtree pull --prefix=apps/frontend cowswap-upstream main --squash`, expect +conflicts (or re-introduced deletions) on these paths; the **Conflict-recovery +procedure** at the end of this file is the replay guide. ## Modified @@ -178,9 +179,10 @@ After `git subtree pull --prefix=apps/frontend cowswap-upstream main --squash`: subsystem). It spans `pages/Account/Affiliate{Partner,Trader}.tsx` and the CoW-only `modules/affiliate/**` files: `api/bffAffiliateApi*` + `api/api-utils.ts` + `api/checkIfTraderHasPastTrades*`, the `Affiliate{Partner,Trader}*` containers, the - trader hooks, `pure/{AffiliateTrader*,AffiliateTraderModal,RefCodeInput,shared,Donut*,` - `HowItWorks,MetricsCard,NextPayoutCard,TraderIneligible,UnsupportedNetwork}`, the - trader state atoms, `README.md`, and `misc/*.sql` (none of which the globs match). + trader hooks, the `pure/` trader components (`AffiliateTrader*`, `AffiliateTraderModal`, + `RefCodeInput`, `shared`, `Donut*`, `HowItWorks`, `MetricsCard`, `NextPayoutCard`, + `TraderIneligible`, `UnsupportedNetwork`), the trader state atoms, `README.md`, and + `misc/*.sql` (none of which the globs match). - Files to RE-EDIT (remove the dead wiring): `git show 2fb41475b 1252eb784 --diff-filter=M --name-only --format= -- apps/frontend`. The wiring set: `common/constants/routes.ts`,