Fixed incorrect value when updating delegation and validation state (#…

…226) * Fix incorrect value when user is updating the stakes as a delegator and validator * Update imports
Concordium · Dec 10, 2024 · 6c78b30 · 6c78b30
1 parent 29edfba
commit 6c78b30
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 6 deletions.
diff --git a/app/src/main/java/com/concordium/wallet/data/util/CurrencyUtil.kt b/app/src/main/java/com/concordium/wallet/data/util/CurrencyUtil.kt
@@ -34,7 +34,12 @@ object CurrencyUtil {
         return formatGTU(value, withGStroke, decimals)
     }
 
-    fun formatGTU(value: BigInteger, withGStroke: Boolean = false, decimals: Int = 6): String {
+    fun formatGTU(
+        value: BigInteger,
+        withGStroke: Boolean = false,
+        decimals: Int = 6,
+        withCommas: Boolean = true
+    ): String {
         if (value == BigInteger.ZERO) return ZERO_AMOUNT
         if (decimals <= 0) return value.toString()
 
@@ -70,7 +75,9 @@ object CurrencyUtil {
             strBuilder.insert(0, "-")
         }
 
-        return formatGTUWithCommas(strBuilder.toString().removeSuffix(separator.toString()))
+        val formattedString = strBuilder.toString().removeSuffix(separator.toString())
+
+        return if (withCommas) formatGTUWithCommas(formattedString) else formattedString
     }
 
     fun formatAndRoundGTU(value: BigInteger, roundDecimals: Int): String {

diff --git a/...c/main/java/com/concordium/wallet/ui/bakerdelegation/baker/BakerRegisterAmountActivity.kt b/...c/main/java/com/concordium/wallet/ui/bakerdelegation/baker/BakerRegisterAmountActivity.kt
@@ -51,9 +51,10 @@ class BakerRegisterAmountActivity : BaseDelegationBakerRegisterAmountActivity(
                 viewModel.bakerDelegationData.account?.baker?.restakeEarnings
             binding.amount.setText(
                 CurrencyUtil.formatGTU(
-                    viewModel.bakerDelegationData.account?.baker?.stakedAmount
+                    value = viewModel.bakerDelegationData.account?.baker?.stakedAmount
                         ?: BigInteger.ZERO,
-                    true
+                    withGStroke = true,
+                    withCommas = false
                 )
             )
             binding.amountDesc.text = getString(R.string.baker_update_enter_new_stake)

diff --git a/...a/com/concordium/wallet/ui/bakerdelegation/delegation/DelegationRegisterAmountActivity.kt b/...a/com/concordium/wallet/ui/bakerdelegation/delegation/DelegationRegisterAmountActivity.kt
@@ -187,8 +187,9 @@ class DelegationRegisterAmountActivity : BaseDelegationBakerRegisterAmountActivi
                 getString(R.string.delegation_update_delegation_amount_enter_amount)
             binding.amount.setText(viewModel.bakerDelegationData.account?.delegation?.stakedAmount?.let {
                 CurrencyUtil.formatGTU(
-                    it,
-                    false
+                    value = it,
+                    withGStroke = false,
+                    withCommas = false
                 )
             })
         }