Skip to content

Commit 9abd753

Browse files
r4topunkclaude
andcommitted
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>
2 parents 4e7e94a + e74ade1 commit 9abd753

6 files changed

Lines changed: 462 additions & 150 deletions

File tree

messages/en/stake.json

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,22 @@
139139
"lineStable": "Steady wins. {you} {asset} a year back to you — I'll take my cut in grip tape.",
140140
"lineVar": "~{rate}% APR is a big air. Could land clean, could slam. You in?"
141141
},
142+
"lock": {
143+
"step": "Step 2 · boost (optional)",
144+
"title": "Lock your MOR claim to earn more",
145+
"explain": "Your stETH stays liquid — withdraw after the 7-day window, whenever you want. You only defer WHEN you can claim the MOR you earn; in exchange your reward multiplier goes up.",
146+
"continue": "Next: lock →",
147+
"none": "No lock",
148+
"noneNote": "Claim your MOR anytime",
149+
"years": "{n, plural, one {# year} other {# years}}",
150+
"mult": "{mult}× more MOR",
151+
"oneway": "A lock can only be extended later, never shortened.",
152+
"back": "Back",
153+
"summaryTitle": "What you're choosing",
154+
"summaryNone": "No lock — base rate, and you can claim your MOR whenever you like.",
155+
"summaryLocked": "Locking {label} → {mult}× the MOR share, in exchange for not claiming it until then.",
156+
"stethNote": "Either way your stETH principal is never locked by this — only the 7-day withdraw rule applies."
157+
},
142158
"lootbox": {
143159
"title": "Rewards ready",
144160
"claim": "Claim",

messages/pt-br/stake.json

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,22 @@
139139
"lineStable": "Devagar e sempre. {you} {asset} por ano de volta pra você — meu corte eu pego em fita.",
140140
"lineVar": "~{rate}% APR é um baita air. Pode cair limpo ou levar tombo. Tá dentro?"
141141
},
142+
"lock": {
143+
"step": "Passo 2 · turbinar (opcional)",
144+
"title": "Trave o claim do MOR pra render mais",
145+
"explain": "Seu stETH continua líquido — saca depois dos 7 dias, quando quiser. Você só adia QUANDO pode sacar o MOR que acumula; em troca, seu multiplicador de recompensa sobe.",
146+
"continue": "Próximo: lock →",
147+
"none": "Sem lock",
148+
"noneNote": "Saca seu MOR quando quiser",
149+
"years": "{n, plural, one {# ano} other {# anos}}",
150+
"mult": "{mult}× mais MOR",
151+
"oneway": "O lock só pode ser estendido depois, nunca encurtado.",
152+
"back": "Voltar",
153+
"summaryTitle": "O que você está escolhendo",
154+
"summaryNone": "Sem lock — taxa base, e você saca seu MOR quando quiser.",
155+
"summaryLocked": "Travar {label} → {mult}× a fatia de MOR, em troca de não poder sacar até lá.",
156+
"stethNote": "De qualquer forma seu stETH nunca fica preso por isso — vale só a regra de saque de 7 dias."
157+
},
142158
"lootbox": {
143159
"title": "Recompensas prontas",
144160
"claim": "Sacar",

0 commit comments

Comments
 (0)