From e48d6da7d73dcfa283de4e066ef356f0bb5f004f Mon Sep 17 00:00:00 2001
From: Hjort <shj@concordium.com>
Date: Fri, 17 Nov 2023 14:55:46 +0100
Subject: [PATCH 1/2] Reword validator/delegator pages to remove use of grace
 period

---
 app/components/BakerTransactions/BakerStakeSettings.tsx  | 9 +++++----
 .../Transfers/configureBaker/RemoveBakerPage.tsx         | 7 +++----
 .../configureDelegation/DelegationAmountPage.tsx         | 8 ++++----
 .../configureDelegation/RemoveDelegationPage.tsx         | 5 +++--
 4 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/app/components/BakerTransactions/BakerStakeSettings.tsx b/app/components/BakerTransactions/BakerStakeSettings.tsx
index 5ce818817..d1749c85f 100644
--- 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
index 3782b6dc1..77809f493 100644
--- 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
index f7e54b5a2..383507398 100644
--- 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
index ef4583e30..b0b79d95c 100644
--- 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>

From 05a73cbf9b15bdf572ca4c5026106388241bed75 Mon Sep 17 00:00:00 2001
From: Hjort <shj@concordium.com>
Date: Fri, 17 Nov 2023 15:11:53 +0100
Subject: [PATCH 2/2] Bump version

---
 CHANGELOG.md     | 6 ++++++
 app/package.json | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ba79488ce..5c365d8e0 100644
--- 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/package.json b/app/package.json
index e19508fe0..12054e42f 100644
--- 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",