Fix showing 'null' decimals on token details

Show 0 instead of 'null' when a token has no decimals in the metadata.
Concordium · Sep 9, 2024 · be924c7 · be924c7
1 parent 186ee37
commit be924c7
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 18 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
@@ -67,15 +67,8 @@ object CurrencyUtil {
         return strBuilder.toString().removeSuffix(separator.toString())
     }
 
-    fun toGTUValue(stringValue: String, token: Token?): BigInteger? {
-        var decimals = 0
-        token?.let {
-            it.metadata?.decimals?.let { tokenDecimals ->
-                decimals = tokenDecimals
-            }
-        }
-        return toGTUValue(stringValue, decimals)
-    }
+    fun toGTUValue(stringValue: String, token: Token?): BigInteger? =
+        toGTUValue(stringValue, token?.decimals ?: 0)
 
     fun toGTUValue(stringValue: String, decimals: Int = 6): BigInteger? {
         var str = stringValue.replace("Ͼ", "")

diff --git a/app/src/main/java/com/concordium/wallet/ui/cis2/TokenDetailsActivity.kt b/app/src/main/java/com/concordium/wallet/ui/cis2/TokenDetailsActivity.kt
@@ -95,7 +95,7 @@ class TokenDetailsActivity : BaseActivity(R.layout.activity_token_details) {
                 setOwnership(token, tokenMetadata)
                 setDescription(tokenMetadata)
                 setTicker(tokenMetadata)
-                setDecimals(tokenMetadata)
+                setDecimals(token)
             }
             if (token.isNewlyReceived) {
                 handleNewlyReceivedToken(token)
@@ -222,10 +222,10 @@ class TokenDetailsActivity : BaseActivity(R.layout.activity_token_details) {
         }
     }
 
-    private fun setDecimals(tokenMetadata: TokenMetadata) {
-        if (tokenMetadata.unique != true) {
+    private fun setDecimals(token: Token) {
+        if (!token.isUnique) {
             binding.includeAbout.decimalsHolder.visibility = View.VISIBLE
-            binding.includeAbout.decimals.text = tokenMetadata.decimals.toString()
+            binding.includeAbout.decimals.text = token.decimals.toString()
         }
     }
 

diff --git a/app/src/main/java/com/concordium/wallet/ui/cis2/manage/ManageTokensSelectionAdapter.kt b/app/src/main/java/com/concordium/wallet/ui/cis2/manage/ManageTokensSelectionAdapter.kt
@@ -73,7 +73,7 @@ class ManageTokensSelectionAdapter(
             val tokenBalance = CurrencyUtil.formatGTU(
                 token.balance,
                 false,
-                token.metadata?.decimals ?: 0
+                token.decimals
             )
             holder.binding.subtitle.text =
                 context.getString(R.string.cis_search_balance, tokenBalance)

diff --git a/app/src/main/java/com/concordium/wallet/ui/cis2/manage/ManageTokensTokenDetailsFragment.kt b/app/src/main/java/com/concordium/wallet/ui/cis2/manage/ManageTokensTokenDetailsFragment.kt
@@ -51,7 +51,7 @@ class ManageTokensTokenDetailsFragment : Fragment() {
                 setImage(tokenMetadata)
                 setDescription(tokenMetadata)
                 setTicker(tokenMetadata)
-                setDecimals(tokenMetadata)
+                setDecimals(token)
             }
         }
     }
@@ -125,10 +125,10 @@ class ManageTokensTokenDetailsFragment : Fragment() {
         }
     }
 
-    private fun setDecimals(tokenMetadata: TokenMetadata) {
-        if (tokenMetadata.unique != true) {
+    private fun setDecimals(token: Token) {
+        if (!token.isUnique) {
             binding.details.decimalsHolder.visibility = View.VISIBLE
-            binding.details.decimals.text = tokenMetadata.decimals.toString()
+            binding.details.decimals.text = token.decimals.toString()
         }
     }
 }