Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix showing 'null' decimals on token details #116

Merged
merged 1 commit into from
Sep 9, 2024
Merged

Fix showing 'null' decimals on token details #116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 2 additions & 9 deletions app/src/main/java/com/concordium/wallet/data/util/CurrencyUtil.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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("Ͼ", "")
Expand Down
8 changes: 4 additions & 4 deletions app/src/main/java/com/concordium/wallet/ui/cis2/TokenDetailsActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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()
}
}

Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/concordium/wallet/ui/cis2/manage/ManageTokensSelectionAdapter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
8 changes: 4 additions & 4 deletions app/src/main/java/com/concordium/wallet/ui/cis2/manage/ManageTokensTokenDetailsFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ class ManageTokensTokenDetailsFragment : Fragment() {
setImage(tokenMetadata)
setDescription(tokenMetadata)
setTicker(tokenMetadata)
setDecimals(tokenMetadata)
setDecimals(token)
}
}
}
Expand Down Expand Up @@ -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()
}
}
}