Updated on 2026-08-14

common/ui/src/main/java/com/tangem/common/ui/amountScreen/converters/AmountStateConverter.kt

@@ -3,13 +3,14 @@ package com.tangem.common.ui.amountScreen.converters
 import com.tangem.common.ui.R
 import com.tangem.common.ui.amountScreen.AmountScreenClickIntents
 import com.tangem.common.ui.amountScreen.converters.field.AmountFieldConverter
-import com.tangem.common.ui.amountScreen.models.AmountState
 import com.tangem.common.ui.amountScreen.models.AmountSegmentedButtonsConfig
+import com.tangem.common.ui.amountScreen.models.AmountState
 import com.tangem.core.ui.components.currency.icon.converter.CryptoCurrencyToIconStateConverter
 import com.tangem.core.ui.extensions.resourceReference
 import com.tangem.core.ui.extensions.stringReference
 import com.tangem.core.ui.extensions.wrappedList
-import com.tangem.core.ui.utils.BigDecimalFormatter.formatCryptoAmount
+import com.tangem.core.ui.format.bigdecimal.crypto
+import com.tangem.core.ui.format.bigdecimal.format
 import com.tangem.core.ui.utils.BigDecimalFormatter.formatFiatAmount
 import com.tangem.domain.appcurrency.model.AppCurrency
 import com.tangem.domain.tokens.model.CryptoCurrencyStatus
@@ -49,7 +50,7 @@ class AmountStateConverter(
         val appCurrency = appCurrencyProvider()
         val status = cryptoCurrencyStatusProvider()
         val fiat = formatFiatAmount(status.value.fiatAmount, appCurrency.code, appCurrency.symbol)
-        val crypto = formatCryptoAmount(status.value.amount, status.currency.symbol, status.currency.decimals)
+        val crypto = status.value.amount.format { crypto(status.currency) }
         val noFeeRate = status.value.fiatRate.isNullOrZero()
 
         return AmountState.Data(

common/ui/src/main/java/com/tangem/common/ui/amountScreen/ui/AmountBlock.kt

@@ -19,16 +19,20 @@ import com.tangem.common.ui.amountScreen.models.AmountState
 import com.tangem.common.ui.amountScreen.preview.AmountStatePreviewData
 import com.tangem.core.ui.components.ResizableText
 import com.tangem.core.ui.components.currency.icon.CurrencyIcon
-import com.tangem.core.ui.res.TangemThemePreview
+import com.tangem.core.ui.format.bigdecimal.anyDecimals
+import com.tangem.core.ui.format.bigdecimal.crypto
+import com.tangem.core.ui.format.bigdecimal.format
 import com.tangem.core.ui.res.TangemTheme
+import com.tangem.core.ui.res.TangemThemePreview
 import com.tangem.core.ui.utils.BigDecimalFormatter
+import java.math.BigDecimal
 
 @Composable
 fun AmountBlock(amountState: AmountState, isClickDisabled: Boolean, isEditingDisabled: Boolean, onClick: () -> Unit) {
     if (amountState !is AmountState.Data) return
     val amount = amountState.amountTextField
 
-    val cryptoAmount = BigDecimalFormatter.formatWithSymbol(amount.value, amount.cryptoAmount.currencySymbol)
+    val cryptoAmount = formatWithSymbol(amount.value, amount.cryptoAmount.currencySymbol)
     val fiatAmount = BigDecimalFormatter.formatFiatAmount(
         fiatAmount = amount.fiatAmount.value,
         fiatCurrencySymbol = amount.fiatAmount.currencySymbol,
@@ -77,6 +81,9 @@ fun AmountBlock(amountState: AmountState, isClickDisabled: Boolean, isEditingDis
     }
 }
 
+fun formatWithSymbol(amount: String, symbol: String) =
+    BigDecimal.ZERO.format { crypto(symbol, 0).anyDecimals() }.replace("0", amount)
+
 // region Preview
 @Preview
 @Preview(uiMode = Configuration.UI_MODE_NIGHT_YES)

common/ui/src/main/java/com/tangem/common/ui/amountScreen/ui/AmountField.kt

@@ -24,6 +24,8 @@ import com.tangem.core.ui.components.fields.AmountTextField
 import com.tangem.core.ui.components.fields.visualtransformations.AmountVisualTransformation
 import com.tangem.core.ui.extensions.TextReference
 import com.tangem.core.ui.extensions.resolveReference
+import com.tangem.core.ui.format.bigdecimal.crypto
+import com.tangem.core.ui.format.bigdecimal.format
 import com.tangem.core.ui.res.TangemTheme
 import com.tangem.core.ui.utils.BigDecimalFormatter
 import com.tangem.core.ui.utils.rememberDecimalFormat
@@ -92,11 +94,7 @@ private fun AmountSecondary(amountField: AmountFieldModel, appCurrencyCode: Stri
             ),
     ) {
         val text = if (amountField.isFiatValue) {
-            BigDecimalFormatter.formatCryptoAmount(
-                cryptoAmount = secondaryAmount.value,
-                cryptoCurrency = secondaryAmount.currencySymbol,
-                decimals = secondaryAmount.decimals,
-            )
+            secondaryAmount.value.format { crypto(secondaryAmount.currencySymbol, secondaryAmount.decimals) }
         } else {
             BigDecimalFormatter.formatFiatAmount(
                 fiatAmount = secondaryAmount.value,

common/ui/src/main/java/com/tangem/common/ui/notifications/NotificationUM.kt

@@ -6,7 +6,9 @@ import com.tangem.core.ui.components.notifications.NotificationConfig
 import com.tangem.core.ui.extensions.TextReference
 import com.tangem.core.ui.extensions.resourceReference
 import com.tangem.core.ui.extensions.wrappedList
-import com.tangem.core.ui.utils.BigDecimalFormatter
+import com.tangem.core.ui.format.bigdecimal.crypto
+import com.tangem.core.ui.format.bigdecimal.format
+import com.tangem.core.ui.format.bigdecimal.shorted
 import java.math.BigDecimal
 
 sealed class NotificationUM(val config: NotificationConfig) {
@@ -267,8 +269,8 @@ sealed class NotificationUM(val config: NotificationConfig) {
             subtitle = resourceReference(
                 R.string.koinos_insufficient_mana_to_send_koin_description,
                 formatArgs = wrappedList(
-                    BigDecimalFormatter.formatCryptoAmountShorted(mana, "", Blockchain.Koinos.decimals()),
-                    BigDecimalFormatter.formatCryptoAmountShorted(maxMana, "", Blockchain.Koinos.decimals()),
+                    mana.format { crypto("", Blockchain.Koinos.decimals()).shorted() },
+                    maxMana.format { crypto("", Blockchain.Koinos.decimals()).shorted() },
                 ),
             ),
         )
@@ -286,11 +288,9 @@ sealed class NotificationUM(val config: NotificationConfig) {
             subtitle = resourceReference(
                 R.string.koinos_mana_exceeds_koin_balance_description,
                 formatArgs = wrappedList(
-                    BigDecimalFormatter.formatCryptoAmount(
-                        availableKoinForTransfer,
-                        Blockchain.Koinos.currency,
-                        Blockchain.Koinos.decimals(),
-                    ),
+                    availableKoinForTransfer.format {
+                        crypto(Blockchain.Koinos.currency, Blockchain.Koinos.decimals())
+                    },
                 ),
             ),
             buttonState = NotificationConfig.ButtonsState.PrimaryButtonConfig(

common/ui/src/main/java/com/tangem/common/ui/notifications/NotificationsFactory.kt

@@ -6,7 +6,9 @@ import com.tangem.common.ui.R
 import com.tangem.common.ui.amountScreen.models.AmountFieldModel
 import com.tangem.common.ui.amountScreen.utils.getFiatString
 import com.tangem.core.ui.extensions.networkIconResId
-import com.tangem.core.ui.utils.BigDecimalFormatter
+import com.tangem.core.ui.format.bigdecimal.crypto
+import com.tangem.core.ui.format.bigdecimal.format
+import com.tangem.core.ui.format.bigdecimal.uncapped
 import com.tangem.core.ui.utils.parseBigDecimal
 import com.tangem.domain.appcurrency.model.AppCurrency
 import com.tangem.domain.tokens.model.CryptoCurrency
@@ -65,10 +67,9 @@ object NotificationsFactory {
         if (!isAccountFunded && reserveAmount != null && reserveAmount > sendingAmount) {
             add(
                 NotificationUM.Error.ReserveAmount(
-                    BigDecimalFormatter.formatCryptoAmount(
-                        cryptoAmount = sendingAmount,
-                        cryptoCurrency = cryptoCurrency,
-                    ),
+                    sendingAmount.format {
+                        crypto(cryptoCurrency)
+                    },
                 ),
             )
         }
@@ -87,10 +88,7 @@ object NotificationsFactory {
                 NotificationUM.Error.TransactionLimitError(
                     cryptoCurrency = cryptoCurrency.name,
                     utxoLimit = utxoLimit.maxLimit.toPlainString(),
-                    amountLimit = BigDecimalFormatter.formatCryptoAmount(
-                        cryptoAmount = utxoLimit.maxAmount,
-                        cryptoCurrency = cryptoCurrency,
-                    ),
+                    amountLimit = utxoLimit.maxAmount.format { crypto(cryptoCurrency) },
                     onConfirmClick = {
                         onReduceClick(
                             utxoLimit.maxAmount,
@@ -124,10 +122,7 @@ object NotificationsFactory {
         if (existentialDeposit != null && diff >= BigDecimal.ZERO && existentialDeposit > diff) {
             add(
                 NotificationUM.Error.ExistentialDeposit(
-                    deposit = BigDecimalFormatter.formatCryptoAmountUncapped(
-                        cryptoAmount = existentialDeposit,
-                        cryptoCurrency = cryptoCurrency,
-                    ),
+                    deposit = existentialDeposit.format { crypto(cryptoCurrency).uncapped() },
                     onConfirmClick = {
                         onReduceClick(
                             existentialDeposit,
@@ -155,10 +150,7 @@ object NotificationsFactory {
         if (isFeeCoverage) {
             add(
                 NotificationUM.Warning.FeeCoverageNotification(
-                    cryptoAmount = BigDecimalFormatter.formatCryptoAmountUncapped(
-                        cryptoAmount = cryptoDiff,
-                        cryptoCurrency = cryptoCurrency,
-                    ),
+                    cryptoAmount = cryptoDiff.format { crypto(cryptoCurrency).uncapped() },
                     fiatAmount = getFiatString(
                         value = cryptoDiff,
                         rate = fiatRate,

common/ui/src/main/java/com/tangem/common/ui/tokens/TokenItemStateConverter.kt

@@ -4,6 +4,9 @@ import com.tangem.core.ui.components.currency.icon.converter.CryptoCurrencyToIco
 import com.tangem.core.ui.components.marketprice.PriceChangeType
 import com.tangem.core.ui.components.marketprice.utils.PriceChangeConverter
 import com.tangem.core.ui.components.token.state.TokenItemState
+import com.tangem.core.ui.format.bigdecimal.crypto
+import com.tangem.core.ui.format.bigdecimal.format
+import com.tangem.core.ui.format.bigdecimal.percent
 import com.tangem.core.ui.utils.BigDecimalFormatter
 import com.tangem.domain.appcurrency.model.AppCurrency
 import com.tangem.domain.staking.model.stakekit.YieldBalance
@@ -80,7 +83,7 @@ class TokenItemStateConverter(
     private fun CryptoCurrencyStatus.getFormattedAmount(): String {
         val amount = value.amount?.plus(getStakedBalance()) ?: return DASH_SIGN
 
-        return BigDecimalFormatter.formatCryptoAmount(amount, currency.symbol, currency.decimals)
+        return amount.format { crypto(currency) }
     }
 
     private fun CryptoCurrencyStatus.getFormattedFiatAmount(): String {
@@ -167,10 +170,7 @@ class TokenItemStateConverter(
             return if (fiatRate != null && priceChange != null) {
                 TokenItemState.SubtitleState.CryptoPriceContent(
                     price = fiatRate.getFormattedCryptoPrice(appCurrency),
-                    priceChangePercent = BigDecimalFormatter.formatPercent(
-                        percent = priceChange,
-                        useAbsoluteValue = true,
-                    ),
+                    priceChangePercent = priceChange.format { percent() },
                     type = priceChange.getPriceChangeType(),
                 )
             } else {