Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions apps/frontend/.ophis-divergences.md
Original file line number Diff line number Diff line change
@@ -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

Expand Down Expand Up @@ -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`,
Expand Down
Loading