Commit 9abd753
Merge main into refactor/central-prices
Brings in #224 (orbit counts only official stakes) and #225 (lock step),
which landed after this branch was cut. Two conflicts, both composed
rather than picked:
- `services/stake-graph.ts`: kept #224's `etherscanClaimReceiver` filter
verbatim, with this branch's `morBackersByRider(ethUsd: UsdPrice)`
signature so the receiver check runs against the centralized price
service.
- `components/stake/StakeDialog.tsx`: kept #225's `claimLockEnd` /
`LOCK_OPTIONS` lock step and its new import, plus this branch's switch
from a private `["eth-price"]` query to the shared `useEthPrice` hook.
Git had placed the `if (!rider?.vault)` guard inside the HEAD side of
the hunk, so taking theirs wholesale would have silently dropped it —
reconstructed explicitly from main and re-verified.
Verified at runtime: the Morpheus option still advances to "Next: lock",
its USD figures resolve through the centralized price, and the stake
graph returns with its stETH row intact.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>6 files changed
Lines changed: 462 additions & 150 deletions
File tree
- messages
- en
- pt-br
- src
- components/stake
- hooks
- lib
- services
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
139 | 139 | | |
140 | 140 | | |
141 | 141 | | |
| 142 | + | |
| 143 | + | |
| 144 | + | |
| 145 | + | |
| 146 | + | |
| 147 | + | |
| 148 | + | |
| 149 | + | |
| 150 | + | |
| 151 | + | |
| 152 | + | |
| 153 | + | |
| 154 | + | |
| 155 | + | |
| 156 | + | |
| 157 | + | |
142 | 158 | | |
143 | 159 | | |
144 | 160 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
139 | 139 | | |
140 | 140 | | |
141 | 141 | | |
| 142 | + | |
| 143 | + | |
| 144 | + | |
| 145 | + | |
| 146 | + | |
| 147 | + | |
| 148 | + | |
| 149 | + | |
| 150 | + | |
| 151 | + | |
| 152 | + | |
| 153 | + | |
| 154 | + | |
| 155 | + | |
| 156 | + | |
| 157 | + | |
142 | 158 | | |
143 | 159 | | |
144 | 160 | | |
| |||
0 commit comments