Merge pull request #355 from Concordium/remove-grace-period

Reword validator/delegator pages to remove use of grace period
Concordium · Nov 20, 2023 · e90c6d5 · e90c6d5
2 parents 5ee1645 + 05a73cb
commit e90c6d5
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 15 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## 1.7.1
+
+### Changed
+
+-   Reworded to remove usage of `grace period` term.
+
 ## 1.7.0
 
 ### Changed

diff --git a/app/components/BakerTransactions/BakerStakeSettings.tsx b/app/components/BakerTransactions/BakerStakeSettings.tsx
@@ -60,10 +60,11 @@ export default function BakerStakeSettings({
                 {existingValues !== undefined &&
                     pendingChange === undefined && (
                         <p className="mT0">
-                            Enter your new desired amount to stake. If you raise
-                            the stake it will take effect at the next payday,
-                            and if you lower the stake it will take effect after
-                            a grace period.
+                            Enter your new desired amount to stake. If you
+                            increase the stake it will take effect at the next
+                            pay day, and if you decrease the stake it will take
+                            effect at the first pay day after a cool-down
+                            period.
                         </p>
                     )}
                 {pendingChange !== undefined && (

diff --git a/app/components/Transfers/configureBaker/RemoveBakerPage.tsx b/app/components/Transfers/configureBaker/RemoveBakerPage.tsx
@@ -20,14 +20,13 @@ const RemoveBakerPage = withPendingBakerChangeGuard(
         return (
             <>
                 <p className="flexChildFill">
-                    This will remove the validator status of the account. After
-                    the grace period the full staked amount will be unlocked for
-                    disposal.
+                    This will return the staked amount to the public balance of
+                    the account at the first pay day after a cool-down period.
                     {cooldownUntil && (
                         <>
                             <br />
                             <br />
-                            The grace period lasts until
+                            The cool-down period ends at
                             <span className="block bodyEmphasized mV10">
                                 {getFormattedDateString(cooldownUntil)}.
                             </span>

diff --git a/app/components/Transfers/configureDelegation/DelegationAmountPage.tsx b/app/components/Transfers/configureDelegation/DelegationAmountPage.tsx
@@ -227,10 +227,10 @@ export default function DelegationAmountPage({
                 )}
                 {existing !== undefined && pendingChange === undefined && (
                     <p className="mT0">
-                        Enter your new desired amount to delegate. If you raise
-                        the stake it will take effect at the next payday, and if
-                        you lower the stake it will take effect after a grace
-                        period.
+                        Enter your new desired amount to stake. If you increase
+                        the stake it will take effect at the next pay day, and
+                        if you decrease the stake it will take effect at the
+                        first pay day after a cool-down period.
                     </p>
                 )}
                 {pendingChange !== undefined && (

diff --git a/app/components/Transfers/configureDelegation/RemoveDelegationPage.tsx b/app/components/Transfers/configureDelegation/RemoveDelegationPage.tsx
@@ -22,12 +22,13 @@ const RemoveDelegationPage = withPendingDelegationChangeGuard(
             <>
                 <p className="flexChildFill">
                     This will return the delegated amount to the public balance
-                    of the account after a grace period.
+                    of the account at the first pay day after a cool-down
+                    period.
                     {cooldownUntil && (
                         <>
                             <br />
                             <br />
-                            The grace period lasts until
+                            The cool-down period ends at
                             <span className="block bodyEmphasized mV10">
                                 {getFormattedDateString(cooldownUntil)}.
                             </span>

diff --git a/app/package.json b/app/package.json
@@ -2,7 +2,7 @@
     "name": "concordium-desktop-wallet",
     "productName": "concordium-desktop-wallet",
     "description": "concordium-desktop-wallet",
-    "version": "1.7.0",
+    "version": "1.7.1",
     "main": "./main.prod.js",
     "author": {
         "name": "Concordium Software",