From 6aa5cf4ff0e78d47bb0cee65df6004766e49da93 Mon Sep 17 00:00:00 2001
From: Hjort <shj@concordium.com>
Date: Wed, 27 Sep 2023 14:50:50 +0200
Subject: [PATCH 1/2] Update display/labels of finalization committee and
 timeout parameters

---
 .../UpdateFinalizationCommitteeParameters.tsx          |  4 ++--
 .../updates/FinalizationCommitteeParameters/util.ts    |  2 +-
 .../TimeoutParameters/TimeoutParametersShow.tsx        | 10 ++++++----
 .../TimeoutParameters/UpdateTimeoutParameters.tsx      |  6 +++---
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/app/pages/multisig/updates/FinalizationCommitteeParameters/UpdateFinalizationCommitteeParameters.tsx b/app/pages/multisig/updates/FinalizationCommitteeParameters/UpdateFinalizationCommitteeParameters.tsx
index e8a394cea..c5b43e704 100644
--- a/app/pages/multisig/updates/FinalizationCommitteeParameters/UpdateFinalizationCommitteeParameters.tsx
+++ b/app/pages/multisig/updates/FinalizationCommitteeParameters/UpdateFinalizationCommitteeParameters.tsx
@@ -58,7 +58,7 @@ export default function UpdateFinalizationCommitteeParametersFields({
                 defaultValue={
                     defaults.minFinalizers || current.minFinalizers.toString()
                 }
-                label={`New ${fieldDisplays.minFinalizers}`}
+                label={fieldDisplays.minFinalizers}
                 placeholder={enterHere(fieldDisplays.minFinalizers)}
                 rules={validationRules(fieldDisplays.minFinalizers)}
             />
@@ -68,7 +68,7 @@ export default function UpdateFinalizationCommitteeParametersFields({
                 defaultValue={
                     defaults.maxFinalizers || current.maxFinalizers.toString()
                 }
-                label={`New ${fieldDisplays.maxFinalizers}`}
+                label={fieldDisplays.maxFinalizers}
                 placeholder={enterHere(fieldDisplays.maxFinalizers)}
                 rules={validationRules(fieldDisplays.maxFinalizers)}
             />
diff --git a/app/pages/multisig/updates/FinalizationCommitteeParameters/util.ts b/app/pages/multisig/updates/FinalizationCommitteeParameters/util.ts
index 08edf6c8f..4cbc01ca5 100644
--- a/app/pages/multisig/updates/FinalizationCommitteeParameters/util.ts
+++ b/app/pages/multisig/updates/FinalizationCommitteeParameters/util.ts
@@ -10,7 +10,7 @@ export interface FinalizationCommitteeParametersFields {
 export const fieldDisplays = {
     minFinalizers: 'Minimum number of finalizers',
     maxFinalizers: 'Maximum number of finalizers',
-    relativeStakeThresholdFraction: 'Relative stake threshold fraction',
+    relativeStakeThresholdFraction: 'Relative stake threshold',
 };
 
 export function getCurrentFinalizationCommitteeParameters(
diff --git a/app/pages/multisig/updates/TimeoutParameters/TimeoutParametersShow.tsx b/app/pages/multisig/updates/TimeoutParameters/TimeoutParametersShow.tsx
index fdf3eedae..bead2746c 100644
--- a/app/pages/multisig/updates/TimeoutParameters/TimeoutParametersShow.tsx
+++ b/app/pages/multisig/updates/TimeoutParameters/TimeoutParametersShow.tsx
@@ -16,17 +16,19 @@ export default function ShowFinalizationCommitteeParameters({
         <section className="mB40">
             <h3>{title}</h3>
             <div>
-                <Label className="mB5">{fieldDisplays.timeoutBase}:</Label>
-                <div className="body3 mono mB10">{timeoutBase.toString()}</div>
+                <Label className="mB5">{fieldDisplays.timeoutBase}</Label>
+                <div className="body3 mono mB10">
+                    {timeoutBase.toString()} ms
+                </div>
                 <RelativeRateField
                     className="mB10"
-                    label={`New ${fieldDisplays.timeoutIncrease}:`}
+                    label={fieldDisplays.timeoutIncrease}
                     value={timeoutIncrease}
                     splitSymbol="/"
                     display
                 />
                 <RelativeRateField
-                    label={`New ${fieldDisplays.timeoutDecrease}:`}
+                    label={fieldDisplays.timeoutDecrease}
                     value={timeoutDecrease}
                     splitSymbol="/"
                     display
diff --git a/app/pages/multisig/updates/TimeoutParameters/UpdateTimeoutParameters.tsx b/app/pages/multisig/updates/TimeoutParameters/UpdateTimeoutParameters.tsx
index 218839da2..4300257de 100644
--- a/app/pages/multisig/updates/TimeoutParameters/UpdateTimeoutParameters.tsx
+++ b/app/pages/multisig/updates/TimeoutParameters/UpdateTimeoutParameters.tsx
@@ -55,7 +55,7 @@ export default function UpdateTimeoutParametersFields({
                 defaultValue={
                     defaults.timeoutBase || current.timeoutBase.toString()
                 }
-                label={`New ${fieldDisplays.timeoutBase} (ms)`}
+                label={`${fieldDisplays.timeoutBase} (ms)`}
                 placeholder={enterHere(fieldDisplays.timeoutBase)}
                 rules={validationRulesForPositiveWord64(
                     fieldDisplays.timeoutBase
@@ -63,7 +63,7 @@ export default function UpdateTimeoutParametersFields({
             />
             <FormRelativeRateField
                 name={fieldNames.timeoutIncrease}
-                label="New timeout increase"
+                label={fieldDisplays.timeoutIncrease}
                 className="mB10"
                 defaultValue={
                     defaults.timeoutIncrease || current.timeoutIncrease
@@ -79,7 +79,7 @@ export default function UpdateTimeoutParametersFields({
             />
             <FormRelativeRateField
                 name={fieldNames.timeoutDecrease}
-                label="New timeout decrease"
+                label={fieldDisplays.timeoutDecrease}
                 className="mB10"
                 defaultValue={
                     defaults.timeoutDecrease || current.timeoutDecrease

From aaa6f2df4998fcf59b1de1eccc02900ae6c503fe Mon Sep 17 00:00:00 2001
From: Hjort <shj@concordium.com>
Date: Wed, 27 Sep 2023 15:39:15 +0200
Subject: [PATCH 2/2] Bump version out of beta

---
 app/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/package.json b/app/package.json
index dcbc9242c..6d403ec22 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.6.0-beta.1",
+    "version": "1.6.0",
     "main": "./main.prod.js",
     "author": {
         "name": "Concordium Software",