Skip to content

Commit 0090626

Browse files
authored
Merge pull request #8961 from ethereum/withdrawal-faq
Add withdrawal FAQ item to staking page
2 parents 287936a + 83ba9b0 commit 0090626

File tree

2 files changed

+18
-1
lines changed

2 files changed

+18
-1
lines changed

src/intl/en/page-staking.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,11 @@
171171
"page-staking-faq-3-answer-p2": "There are derivative tokens/tickers that may represent staked ETH (ie. rETH from Rocket Pool, stETH from Lido, ETH2 from Coinbase). Learn more about <a href=\"/staking/pools/\">staking pools</a>",
172172
"page-staking-faq-4-question": "Is staking already live?",
173173
"page-staking-faq-4-answer-p1": "Yes. Staking has been live since December 1, 2020",
174-
"page-staking-faq-4-answer-p2": "This means that staking is currently live for users to deposit their ETH, run a validator client, and start earning rewards. After the Shanghai update, stakers will then be able to withdraw rewards and funds from their validator balance.",
174+
"page-staking-faq-4-answer-p2": "This means that staking is currently live for users to deposit their ETH, run a validator client, and start earning rewards.",
175+
"page-staking-faq-4-answer-p3": "The Merge also took place on September 15, 2022, and Ethereum has been fully secured by staked ETH ever since.",
176+
"page-staking-faq-5-question": "When can I withdraw my staked ETH?",
177+
"page-staking-faq-5-answer-p1": "Withdraw functionality is expected to be included in the next network upgrade, named Shanghai. This network upgrade is estimated for the first half of 2023, subject to change until completed. After the Shanghai update, stakers will then be able to withdraw their rewards and/or principle deposit from their validator balance if they choose.",
178+
"page-staking-faq-5-answer-p2": "In the meantime, stakers will still earn rewards in the form of fees and MEV when proposing blocks, which are made available immediately via the set fee recipient address.",
175179
"page-staking-further-reading-1-link": "Why Proof of Stake (Nov 2020)",
176180
"page-staking-further-reading-author-vitalik-buterin": "Vitalik Buterin",
177181
"page-staking-further-reading-2-link": "Serenity Design Rationale",

src/pages/staking/index.tsx

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -620,10 +620,23 @@ const StakingPage = ({
620620
<p>
621621
<Translation id="page-staking-faq-4-answer-p2" />
622622
</p>
623+
<p>
624+
<Translation id="page-staking-faq-4-answer-p3" />
625+
</p>
623626
<ButtonLink to="/upgrades/merge/">
624627
<Translation id="page-upgrades-merge-btn" />
625628
</ButtonLink>
626629
</ExpandableCard>
630+
<ExpandableCard
631+
title={translateMessageId("page-staking-faq-5-question", intl)}
632+
>
633+
<p>
634+
<Translation id="page-staking-faq-5-answer-p1" />
635+
</p>
636+
<p>
637+
<Translation id="page-staking-faq-5-answer-p2" />
638+
</p>
639+
</ExpandableCard>
627640
<ExpandableCard
628641
title={translateMessageId("page-staking-faq-1-question", intl)}
629642
>

0 commit comments

Comments
 (0)