Fix validator setup failure

Use max range value as a rate instead of null if the validator is closed
for delegation. Null value caused failure of the transaction.

CHANGELOG.md

@@ -10,6 +10,10 @@
   having no ability to reveal the seed phrase
 - Ability to use Wallet private key to restore a wallet
 
+### Fixed
+
+- Inability to configure a validator closed for delegation
+
 ## [1.2.0] - 2024-08-27
 
 ### Added

app/src/main/java/com/concordium/wallet/data/model/BakerDelegationData.kt

@@ -30,7 +30,16 @@ data class BakerDelegationData(
     var energy: Long? = null
     var accountNonce: AccountNonce? = null
     var amount: BigInteger? = null
+    var finalizationCommissionRate: Double? = null
+    var bakingCommissionRate: Double? = null
+    var transactionCommissionRate: Double? = null
     var chainParameters: ChainParameters? = null
+        set(value) {
+            field = value
+            finalizationCommissionRate = value?.finalizationCommissionRange?.max
+            bakingCommissionRate = value?.bakingCommissionRange?.max
+            transactionCommissionRate = value?.transactionCommissionRange?.max
+        }
     var bakerPoolStatus: BakerPoolStatus? = null
     var passiveDelegation: PassiveDelegation? = null
     var cost: BigInteger? = null

app/src/main/java/com/concordium/wallet/data/model/ChainParameters.kt

@@ -17,9 +17,7 @@ data class ChainParameters(
     val accountCreationLimit: Int,
     val minimumEquityCapital: BigInteger,
     val bakingCommissionRange: BakingCommissionRange,
-    val bakingCommissionRate: Double? = null,
     val transactionCommissionRange: TransactionCommissionRange,
-    val transactionCommissionRate: Double? = null,
     val finalizationCommissionRange: FinalizationCommissionRange,
     val euroPerEnergy: SimpleFraction,
     @SerializedName("microGTUPerEuro")

app/src/main/java/com/concordium/wallet/ui/bakerdelegation/baker/BakerRegistrationConfirmationActivity.kt

@@ -216,21 +216,21 @@ class BakerRegistrationConfirmationActivity : BaseDelegationBakerActivity(
         }
 
         binding.apply {
-            if (viewModel.bakerDelegationData.chainParameters?.transactionCommissionRate != null) {
+            if (viewModel.bakerDelegationData.transactionCommissionRate != null) {
                 transactionFeeTitle.visibility = View.VISIBLE
                 transactionFeeStatus.visibility = View.VISIBLE
                 transactionFeeStatus.text =
-                    percentFormat.format(viewModel.bakerDelegationData.chainParameters?.transactionCommissionRate)
+                    percentFormat.format(viewModel.bakerDelegationData.transactionCommissionRate)
             } else {
                 transactionFeeTitle.visibility = View.GONE
                 transactionFeeStatus.visibility = View.GONE
             }
 
-            if (viewModel.bakerDelegationData.chainParameters?.bakingCommissionRate != null) {
+            if (viewModel.bakerDelegationData.bakingCommissionRate != null) {
                 bakingTitle.visibility = View.VISIBLE
                 bakingStatus.visibility = View.VISIBLE
                 bakingStatus.text =
-                    percentFormat.format(viewModel.bakerDelegationData.chainParameters?.bakingCommissionRate)
+                    percentFormat.format(viewModel.bakerDelegationData.bakingCommissionRate)
             } else {
                 bakingTitle.visibility = View.GONE
                 bakingStatus.visibility = View.GONE

app/src/main/java/com/concordium/wallet/ui/bakerdelegation/baker/BakerRegistrationOpenActivity.kt

@@ -62,8 +62,8 @@ class BakerRegistrationOpenActivity : BaseDelegationBakerActivity(
             ) {
                 true
             } else {
-                viewModel.bakerDelegationData.oldCommissionRates?.transactionCommission != viewModel.bakerDelegationData.chainParameters?.transactionCommissionRate ||
-                        viewModel.bakerDelegationData.oldCommissionRates?.bakingCommission != viewModel.bakerDelegationData.chainParameters?.bakingCommissionRate
+                viewModel.bakerDelegationData.oldCommissionRates?.transactionCommission != viewModel.bakerDelegationData.transactionCommissionRate ||
+                        viewModel.bakerDelegationData.oldCommissionRates?.bakingCommission != viewModel.bakerDelegationData.bakingCommissionRate
             }
         if (gotoNextPage) gotoNextPage()
         else showNoChange()

app/src/main/java/com/concordium/wallet/ui/bakerdelegation/common/DelegationBakerViewModel.kt

@@ -140,9 +140,8 @@ class DelegationBakerViewModel(application: Application) : AndroidViewModel(appl
     }
 
     fun commissionRatesHasChanged(): Boolean =
-        bakerDelegationData.oldCommissionRates?.bakingCommission != bakerDelegationData.chainParameters?.bakingCommissionRate ||
-                bakerDelegationData.oldCommissionRates?.transactionCommission != bakerDelegationData.chainParameters?.transactionCommissionRate
-
+        bakerDelegationData.oldCommissionRates?.bakingCommission != bakerDelegationData.bakingCommissionRate ||
+                bakerDelegationData.oldCommissionRates?.transactionCommission != bakerDelegationData.transactionCommissionRate
 
     fun openStatusHasChanged(): Boolean {
         return bakerDelegationData.bakerPoolInfo?.openStatus != bakerDelegationData.oldOpenStatus
@@ -529,11 +528,11 @@ class DelegationBakerViewModel(application: Application) : AndroidViewModel(appl
             if (bakerDelegationData.type == REMOVE_BAKER) null else bakerDelegationData.bakerKeys
 
         val transactionFeeCommission =
-            if (bakerDelegationData.type == REGISTER_BAKER || bakerDelegationData.type == CONFIGURE_BAKER || bakerDelegationData.type == UPDATE_BAKER_POOL) bakerDelegationData.chainParameters?.transactionCommissionRate else null
+            if (bakerDelegationData.type == REGISTER_BAKER || bakerDelegationData.type == CONFIGURE_BAKER || bakerDelegationData.type == UPDATE_BAKER_POOL) bakerDelegationData.transactionCommissionRate else null
         val bakingRewardCommission =
-            if (bakerDelegationData.type == REGISTER_BAKER || bakerDelegationData.type == CONFIGURE_BAKER || bakerDelegationData.type == UPDATE_BAKER_POOL) bakerDelegationData.chainParameters?.bakingCommissionRate else null
+            if (bakerDelegationData.type == REGISTER_BAKER || bakerDelegationData.type == CONFIGURE_BAKER || bakerDelegationData.type == UPDATE_BAKER_POOL) bakerDelegationData.bakingCommissionRate else null
         val finalizationRewardCommission =
-            if (bakerDelegationData.type == REGISTER_BAKER || bakerDelegationData.type == CONFIGURE_BAKER || bakerDelegationData.type == UPDATE_BAKER_POOL) bakerDelegationData.chainParameters?.finalizationCommissionRange?.max else null
+            if (bakerDelegationData.type == REGISTER_BAKER || bakerDelegationData.type == CONFIGURE_BAKER || bakerDelegationData.type == UPDATE_BAKER_POOL) bakerDelegationData.finalizationCommissionRate else null
         val transferInput = CreateTransferInput(
             from,
             keys,
@@ -777,9 +776,7 @@ class DelegationBakerViewModel(application: Application) : AndroidViewModel(appl
         transactionRate: Double?,
         bakingRate: Double?,
     ) {
-        bakerDelegationData.chainParameters = bakerDelegationData.chainParameters?.copy(
-            bakingCommissionRate = bakingRate,
-            transactionCommissionRate = transactionRate,
-        )
+        bakerDelegationData.transactionCommissionRate = transactionRate
+        bakerDelegationData.bakingCommissionRate = bakingRate
     }
 }