fix(stake): lock copy reads from last stake; stake form above milestones in dialog

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

Author: sktbrd

messages/en/stake.json

@@ -117,13 +117,13 @@
     "viaMorpho": "yield via Morpho · stable",
     "viaMorpheus": "yield via Morpheus · in MOR",
     "estNote": "≈{rate}% APR estimate — swings with the MOR price and pool size.",
-    "mainnetWarn": "Principal unlocks after a 7-day lock.",
+    "mainnetWarn": "Principal unlocks 7 days after your last stake.",
     "estYearLabel": "Estimated value / year",
     "estYearNote": "Paid in MOR on Arbitrum — a live estimate, not a guarantee.",
     "approving": "approving…",
     "staking": "staking on mainnet…",
     "stakedMorTitle": "Staked with {name} on Morpheus",
-    "stakedMorDesc": "Earning MOR on Arbitrum — your principal unlocks after 7 days.",
+    "stakedMorDesc": "Earning MOR on Arbitrum — your principal unlocks 7 days after your last stake.",
     "yourPosition": "Your position",
     "principal": "principal",
     "yield": "yield",
@@ -233,8 +233,8 @@
     "rateHelpLabel": "About the {asset} rate on {venue}",
     "rateHelp": {
       "morphoUsdc": "Annual rate, paid in USDC. No lock: withdraw whenever you want.",
-      "morpheusSteth": "Estimated annual rate, paid in MOR. Your stETH unlocks 7 days after you stake.",
-      "morpheusUsdc": "Estimated annual rate, paid in MOR. Your USDC unlocks 7 days after you stake."
+      "morpheusSteth": "Estimated annual rate, paid in MOR. Your stETH unlocks 7 days after your last stake.",
+      "morpheusUsdc": "Estimated annual rate, paid in MOR. Your USDC unlocks 7 days after your last stake."
     },
     "ratesLoading": "loading rates…",
     "ratesNa": "n/a",

messages/pt-br/stake.json

@@ -117,13 +117,13 @@
     "viaMorpho": "rendimento via Morpho · estável",
     "viaMorpheus": "rendimento via Morpheus · em MOR",
     "estNote": "≈{rate}% APR estimado — varia com o preço do MOR e o tamanho do pool.",
-    "mainnetWarn": "O principal destrava após um lock de 7 dias.",
+    "mainnetWarn": "O principal destrava 7 dias depois do último stake.",
     "estYearLabel": "Valor estimado / ano",
     "estYearNote": "Pago em MOR na Arbitrum — estimativa ao vivo, não é garantia.",
     "approving": "aprovando…",
     "staking": "stakeando na mainnet…",
     "stakedMorTitle": "Stake com {name} na Morpheus",
-    "stakedMorDesc": "Rendendo MOR na Arbitrum — o principal destrava após 7 dias.",
+    "stakedMorDesc": "Rendendo MOR na Arbitrum — o principal destrava 7 dias depois do último stake.",
     "yourPosition": "Sua posição",
     "principal": "principal",
     "yield": "rendimento",
@@ -233,8 +233,8 @@
     "rateHelpLabel": "Sobre a taxa de {asset} na {venue}",
     "rateHelp": {
       "morphoUsdc": "Taxa anual, paga em USDC. Sem lock: saque quando quiser.",
-      "morpheusSteth": "Taxa anual estimada, paga em MOR. Seu stETH libera 7 dias depois do stake.",
-      "morpheusUsdc": "Taxa anual estimada, paga em MOR. Seu USDC libera 7 dias depois do stake."
+      "morpheusSteth": "Taxa anual estimada, paga em MOR. Seu stETH libera 7 dias depois do último stake.",
+      "morpheusUsdc": "Taxa anual estimada, paga em MOR. Seu USDC libera 7 dias depois do último stake."
     },
     "ratesLoading": "carregando as taxas…",
     "ratesNa": "n/d",

src/components/stake/GnarsStakeDialog.tsx

@@ -147,104 +147,6 @@ export function GnarsStakeDialog({ open, onOpenChange }: Props) {
             <p className="mt-2 text-sm text-muted-foreground">{t("dialog.desc")}</p>
           </div>
 
-          {/* Milestones hero */}
-          <section className="rounded-2xl border border-emerald-500/25 bg-gradient-to-br from-emerald-500/[0.08] via-emerald-500/[0.02] to-transparent p-5 sm:p-6">
-            <div className="flex flex-wrap items-end justify-between gap-3">
-              <div>
-                <div className="text-[11px] font-bold uppercase tracking-wider text-emerald-600 dark:text-emerald-400">
-                  {t("dialog.milestonesLabel")}
-                </div>
-                <div className="mt-1 flex items-baseline gap-1.5">
-                  <CountUp
-                    value={totalStaked}
-                    decimals={0}
-                    className="text-4xl font-black tabular-nums"
-                  />
-                  <span className="text-sm font-medium text-muted-foreground">
-                    / {fmt(SUBNET_GOAL_MOR, locale, 0)} MOR
-                  </span>
-                </div>
-              </div>
-              <span className="rounded-full bg-emerald-500/15 px-3 py-1 text-xs font-semibold text-emerald-600 dark:text-emerald-300">
-                {t("dialog.progressToEvent", { pct: pctLabel, n: SUBNET_GOAL_MOR })}
-              </span>
-            </div>
-
-            {/* Progress bar with milestone ticks */}
-            <div className="relative mt-5 pb-1 sm:pb-7">
-              <div className="h-4 w-full rounded-full bg-emerald-500/10 ring-1 ring-emerald-500/20">
-                <div
-                  className="h-4 rounded-full bg-gradient-to-r from-emerald-600 via-emerald-400 to-[#2be58b] shadow-[0_0_16px_rgba(43,229,139,.6)] transition-all duration-700"
-                  style={{ width: `${pct}%` }}
-                />
-              </div>
-              {MOR_TICKS.map((m) => {
-                const left = Math.min(100, (m.amountMor / SUBNET_GOAL_MOR) * 100);
-                const done = totalStaked >= m.amountMor;
-                return (
-                  <div
-                    key={m.id}
-                    className="pointer-events-none absolute top-0 flex -translate-x-1/2 flex-col items-center"
-                    style={{ left: `${left}%` }}
-                  >
-                    <span
-                      className={cn(
-                        "h-4 w-1 rounded-full",
-                        done
-                          ? "bg-emerald-600 shadow-[0_0_6px_rgba(43,229,139,.8)] dark:bg-[#2be58b]"
-                          : "bg-emerald-500/25",
-                      )}
-                      aria-hidden
-                    />
-                    <span
-                      className={cn(
-                        "mt-1.5 hidden text-[10px] font-semibold tabular-nums sm:block",
-                        done ? "text-foreground" : "text-muted-foreground",
-                      )}
-                    >
-                      {shortMor(m.amountMor)}
-                    </span>
-                  </div>
-                );
-              })}
-            </div>
-
-            {/* Milestone checklist */}
-            <ol className="mt-5 grid gap-2 sm:grid-cols-2">
-              {SUBNET_MILESTONES.map((m) => {
-                const done = isMilestoneDone(m, totalStaked);
-                return (
-                  <li key={m.id} className="flex items-start gap-2.5">
-                    <span
-                      className={cn(
-                        "mt-0.5 flex h-6 w-6 shrink-0 items-center justify-center rounded-full",
-                        done
-                          ? "bg-emerald-500 text-white"
-                          : "border border-border text-muted-foreground",
-                      )}
-                    >
-                      {done ? <Check className="h-3.5 w-3.5" /> : <Lock className="h-3 w-3" />}
-                    </span>
-                    <span
-                      className={cn(
-                        "text-sm leading-snug",
-                        done ? "font-semibold text-foreground" : "text-muted-foreground",
-                      )}
-                    >
-                      {t("milestoneRow", { n: m.amountMor, what: t("milestones." + m.id) })}{" "}
-                      {/* Same committed/proposed label the page ladder carries.
-                          Dropping it here would make the dialog read as six firm
-                          promises while the section behind it says five are not. */}
-                      <span className="text-[10px] font-semibold tracking-wide whitespace-nowrap text-muted-foreground uppercase">
-                        · {t("firmness." + m.firmness)}
-                      </span>
-                    </span>
-                  </li>
-                );
-              })}
-            </ol>
-          </section>
-
           {/* Stake form */}
           <section className="rounded-2xl border border-border/60 bg-muted/20 p-5 sm:p-6">
             <div className="grid grid-cols-2 gap-3">
@@ -343,6 +245,104 @@ export function GnarsStakeDialog({ open, onOpenChange }: Props) {
             </p>
           </section>
 
+          {/* Milestones hero */}
+          <section className="rounded-2xl border border-emerald-500/25 bg-gradient-to-br from-emerald-500/[0.08] via-emerald-500/[0.02] to-transparent p-5 sm:p-6">
+            <div className="flex flex-wrap items-end justify-between gap-3">
+              <div>
+                <div className="text-[11px] font-bold uppercase tracking-wider text-emerald-600 dark:text-emerald-400">
+                  {t("dialog.milestonesLabel")}
+                </div>
+                <div className="mt-1 flex items-baseline gap-1.5">
+                  <CountUp
+                    value={totalStaked}
+                    decimals={0}
+                    className="text-4xl font-black tabular-nums"
+                  />
+                  <span className="text-sm font-medium text-muted-foreground">
+                    / {fmt(SUBNET_GOAL_MOR, locale, 0)} MOR
+                  </span>
+                </div>
+              </div>
+              <span className="rounded-full bg-emerald-500/15 px-3 py-1 text-xs font-semibold text-emerald-600 dark:text-emerald-300">
+                {t("dialog.progressToEvent", { pct: pctLabel, n: SUBNET_GOAL_MOR })}
+              </span>
+            </div>
+
+            {/* Progress bar with milestone ticks */}
+            <div className="relative mt-5 pb-1 sm:pb-7">
+              <div className="h-4 w-full rounded-full bg-emerald-500/10 ring-1 ring-emerald-500/20">
+                <div
+                  className="h-4 rounded-full bg-gradient-to-r from-emerald-600 via-emerald-400 to-[#2be58b] shadow-[0_0_16px_rgba(43,229,139,.6)] transition-all duration-700"
+                  style={{ width: `${pct}%` }}
+                />
+              </div>
+              {MOR_TICKS.map((m) => {
+                const left = Math.min(100, (m.amountMor / SUBNET_GOAL_MOR) * 100);
+                const done = totalStaked >= m.amountMor;
+                return (
+                  <div
+                    key={m.id}
+                    className="pointer-events-none absolute top-0 flex -translate-x-1/2 flex-col items-center"
+                    style={{ left: `${left}%` }}
+                  >
+                    <span
+                      className={cn(
+                        "h-4 w-1 rounded-full",
+                        done
+                          ? "bg-emerald-600 shadow-[0_0_6px_rgba(43,229,139,.8)] dark:bg-[#2be58b]"
+                          : "bg-emerald-500/25",
+                      )}
+                      aria-hidden
+                    />
+                    <span
+                      className={cn(
+                        "mt-1.5 hidden text-[10px] font-semibold tabular-nums sm:block",
+                        done ? "text-foreground" : "text-muted-foreground",
+                      )}
+                    >
+                      {shortMor(m.amountMor)}
+                    </span>
+                  </div>
+                );
+              })}
+            </div>
+
+            {/* Milestone checklist */}
+            <ol className="mt-5 grid gap-2 sm:grid-cols-2">
+              {SUBNET_MILESTONES.map((m) => {
+                const done = isMilestoneDone(m, totalStaked);
+                return (
+                  <li key={m.id} className="flex items-start gap-2.5">
+                    <span
+                      className={cn(
+                        "mt-0.5 flex h-6 w-6 shrink-0 items-center justify-center rounded-full",
+                        done
+                          ? "bg-emerald-500 text-white"
+                          : "border border-border text-muted-foreground",
+                      )}
+                    >
+                      {done ? <Check className="h-3.5 w-3.5" /> : <Lock className="h-3 w-3" />}
+                    </span>
+                    <span
+                      className={cn(
+                        "text-sm leading-snug",
+                        done ? "font-semibold text-foreground" : "text-muted-foreground",
+                      )}
+                    >
+                      {t("milestoneRow", { n: m.amountMor, what: t("milestones." + m.id) })}{" "}
+                      {/* Same committed/proposed label the page ladder carries.
+                          Dropping it here would make the dialog read as six firm
+                          promises while the section behind it says five are not. */}
+                      <span className="text-[10px] font-semibold tracking-wide whitespace-nowrap text-muted-foreground uppercase">
+                        · {t("firmness." + m.firmness)}
+                      </span>
+                    </span>
+                  </li>
+                );
+              })}
+            </ol>
+          </section>
+
           {/* Position / withdraw */}
           {position && position.staked > 0 && (
             <section className="flex flex-wrap items-center justify-between gap-3 rounded-2xl border border-border/60 bg-background/40 p-4 sm:p-5">