Merge pull request #353 from Concordium/new-updates-labels

Update display/labels of finalization committee and timeout parameters
Concordium · Sep 27, 2023 · 4bbd3af · 4bbd3af
2 parents a47b39e + aaa6f2d
commit 4bbd3af
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 11 deletions.
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.6.0-beta.1",
+    "version": "1.6.0",
     "main": "./main.prod.js",
     "author": {
         "name": "Concordium Software",

diff --git a/...ultisig/updates/FinalizationCommitteeParameters/UpdateFinalizationCommitteeParameters.tsx b/...ultisig/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
@@ -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
@@ -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
@@ -55,15 +55,15 @@ 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
                 )}
             />
             <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