Updated on 2026-08-14

common/ui/src/main/java/com/tangem/common/ui/amountScreen/utils/FormatterUtils.kt

@@ -2,9 +2,11 @@ package com.tangem.common.ui.amountScreen.utils
 
 import com.tangem.core.ui.extensions.TextReference
 import com.tangem.core.ui.extensions.stringReference
-import com.tangem.core.ui.utils.BigDecimalFormatter
-import com.tangem.core.ui.utils.BigDecimalFormatter.EMPTY_BALANCE_SIGN
+import com.tangem.core.ui.format.bigdecimal.approximateAmount
+import com.tangem.core.ui.format.bigdecimal.fiat
+import com.tangem.core.ui.format.bigdecimal.format
 import com.tangem.domain.appcurrency.model.AppCurrency
+import com.tangem.utils.StringsSigns.DASH_SIGN
 import java.math.BigDecimal
 
 fun getFiatReference(value: BigDecimal?, rate: BigDecimal?, appCurrency: AppCurrency): TextReference? {
@@ -19,12 +21,19 @@ fun getFiatString(
     appCurrency: AppCurrency,
     approximate: Boolean = false,
 ): String {
-    if (value == null || rate == null) return EMPTY_BALANCE_SIGN
+    if (value == null || rate == null) return DASH_SIGN
     val feeValue = value.multiply(rate)
-    return BigDecimalFormatter.formatFiatAmount(
-        fiatAmount = feeValue,
-        fiatCurrencyCode = appCurrency.code,
-        fiatCurrencySymbol = appCurrency.symbol,
-        withApproximateSign = approximate,
-    )
+    return feeValue.format {
+        if (approximate) {
+            fiat(
+                fiatCurrencyCode = appCurrency.code,
+                fiatCurrencySymbol = appCurrency.symbol,
+            ).approximateAmount()
+        } else {
+            fiat(
+                fiatCurrencyCode = appCurrency.code,
+                fiatCurrencySymbol = appCurrency.symbol,
+            )
+        }
+    }
 }

core/ui/src/main/java/com/tangem/core/ui/components/marketprice/MarketPriceBlock.kt

@@ -20,7 +20,7 @@ import com.tangem.core.ui.components.RectangleShimmer
 import com.tangem.core.ui.extensions.stringResourceSafe
 import com.tangem.core.ui.res.TangemTheme
 import com.tangem.core.ui.res.TangemThemePreview
-import com.tangem.core.ui.utils.BigDecimalFormatter
+import com.tangem.utils.StringsSigns.DASH_SIGN
 
 /**
  * Market price block
@@ -120,7 +120,7 @@ private fun PriceBlock(state: MarketPriceBlockState, priceWidthDp: Dp) {
                 )
             }
         } else {
-            Price(price = BigDecimalFormatter.EMPTY_BALANCE_SIGN, modifier = priceModifier)
+            Price(price = DASH_SIGN, modifier = priceModifier)
         }
     }
 }

core/ui/src/main/java/com/tangem/core/ui/format/bigdecimal/BigDecimalFiatFormat.kt

@@ -121,7 +121,10 @@ fun BigDecimalFiatFormat.price(): BigDecimalFormat = BigDecimalFormat { value ->
 
 private fun BigDecimal.isLessThanThreshold() = this > BigDecimal.ZERO && this < FIAT_FORMAT_THRESHOLD
 
-private fun getFiatPriceAmountWithScale(value: BigDecimal): Pair<BigDecimal, Int> {
+/**
+ * Returns amount with correct scale
+ */
+fun getFiatPriceAmountWithScale(value: BigDecimal): Pair<BigDecimal, Int> {
     return if (value < BigDecimal.ONE) {
         val leadingZeroes = value.scale() - value.precision()
         val scale = leadingZeroes + FRACTIONAL_PART_LENGTH_AFTER_LEADING_ZEROES

core/ui/src/main/java/com/tangem/core/ui/utils/BigDecimalFormatter.kt

@@ -1,147 +0,0 @@
-package com.tangem.core.ui.utils
-
-import com.tangem.utils.StringsSigns.DASH_SIGN
-import com.tangem.utils.StringsSigns.LOWER_SIGN
-import com.tangem.utils.StringsSigns.TILDE_SIGN
-import java.math.BigDecimal
-import java.math.RoundingMode
-import java.text.NumberFormat
-import java.util.Currency
-import java.util.Locale
-
-@Suppress("LargeClass")
-@Deprecated("Use BigDecimal.format")
-object BigDecimalFormatter {
-
-    const val EMPTY_BALANCE_SIGN = DASH_SIGN
-    private const val CAN_BE_LOWER_SIGN = LOWER_SIGN
-
-    private val FIAT_FORMAT_THRESHOLD = BigDecimal("0.01")
-
-    private const val FIAT_MARKET_DEFAULT_DIGITS = 2
-    private const val FIAT_MARKET_EXTENDED_DIGITS = 6
-    private const val FRACTIONAL_PART_LENGTH_AFTER_LEADING_ZEROES = 4
-
-    private val usdCurrency = Currency.getInstance("USD")
-
-    @Deprecated("Use BigDecimal.format")
-    fun formatFiatAmount(
-        fiatAmount: BigDecimal?,
-        fiatCurrencyCode: String,
-        fiatCurrencySymbol: String,
-        decimals: Int = FIAT_MARKET_DEFAULT_DIGITS,
-        locale: Locale = Locale.getDefault(),
-        withApproximateSign: Boolean = false,
-    ): String {
-        if (fiatAmount == null) return EMPTY_BALANCE_SIGN
-
-        val formatterCurrency = getCurrency(fiatCurrencyCode)
-        val formatter = NumberFormat.getCurrencyInstance(locale).apply {
-            currency = formatterCurrency
-            maximumFractionDigits = decimals
-            minimumFractionDigits = decimals
-            roundingMode = RoundingMode.HALF_UP
-        }
-
-        return if (fiatAmount.checkFiatThreshold()) {
-            buildString {
-                append(CAN_BE_LOWER_SIGN)
-                append(
-                    formatter.format(FIAT_FORMAT_THRESHOLD)
-                        .replace(formatterCurrency.getSymbol(locale), fiatCurrencySymbol),
-                )
-            }
-        } else {
-            val formattedAmount = formatter.format(fiatAmount)
-                .replace(formatterCurrency.getSymbol(locale), fiatCurrencySymbol)
-
-            if (withApproximateSign) {
-                buildString {
-                    append(TILDE_SIGN)
-                    append(formattedAmount)
-                }
-            } else {
-                formattedAmount
-            }
-        }
-    }
-
-    @Deprecated("Use BigDecimal.format")
-    fun formatFiatAmountUncapped(
-        fiatAmount: BigDecimal?,
-        fiatCurrencyCode: String,
-        fiatCurrencySymbol: String,
-        locale: Locale = Locale.getDefault(),
-    ): String {
-        if (fiatAmount == null) return EMPTY_BALANCE_SIGN
-        val formatterCurrency = getCurrency(fiatCurrencyCode)
-
-        val digits = if (fiatAmount.checkFiatThreshold()) {
-            FIAT_MARKET_EXTENDED_DIGITS
-        } else {
-            FIAT_MARKET_DEFAULT_DIGITS
-        }
-        val formatter = NumberFormat.getCurrencyInstance(locale).apply {
-            currency = formatterCurrency
-            maximumFractionDigits = digits
-            minimumFractionDigits = FIAT_MARKET_DEFAULT_DIGITS
-            roundingMode = RoundingMode.HALF_UP
-        }
-
-        return formatter.format(fiatAmount)
-            .replace(formatterCurrency.getSymbol(locale), fiatCurrencySymbol)
-    }
-
-    @Deprecated("Use BigDecimal.format")
-    fun formatFiatPriceUncapped(
-        fiatAmount: BigDecimal?,
-        fiatCurrencyCode: String,
-        fiatCurrencySymbol: String,
-        locale: Locale = Locale.getDefault(),
-    ): String {
-        if (fiatAmount == null) return EMPTY_BALANCE_SIGN
-        val formatterCurrency = getCurrency(fiatCurrencyCode)
-
-        val (formattedAmount, finalScale) = getFiatPriceUncappedWithScale(value = fiatAmount)
-
-        val formatter = NumberFormat.getCurrencyInstance(locale).apply {
-            currency = formatterCurrency
-            maximumFractionDigits = finalScale
-            minimumFractionDigits = FIAT_MARKET_DEFAULT_DIGITS
-            roundingMode = RoundingMode.HALF_UP
-        }
-
-        return formatter.format(formattedAmount)
-            .replace(formatterCurrency.getSymbol(locale), fiatCurrencySymbol)
-    }
-
-    @Deprecated("Use BigDecimal.format")
-    fun getFiatPriceUncappedWithScale(value: BigDecimal): Pair<BigDecimal, Int> {
-        return if (value < BigDecimal.ONE) {
-            val leadingZeroes = value.scale() - value.precision()
-            val scale = leadingZeroes + FRACTIONAL_PART_LENGTH_AFTER_LEADING_ZEROES
-
-            val amount = value
-                .setScale(scale, RoundingMode.HALF_UP)
-                .stripTrailingZeros()
-
-            amount to amount.scale()
-        } else {
-            value to FIAT_MARKET_DEFAULT_DIGITS
-        }
-    }
-
-    private fun getCurrency(code: String): Currency {
-        return runCatching { Currency.getInstance(code) }
-            .getOrElse { e ->
-                // Currency code is not valid ISO 4217 code
-                if (e is IllegalArgumentException) {
-                    usdCurrency
-                } else {
-                    throw e
-                }
-            }
-    }
-
-    private fun BigDecimal.checkFiatThreshold() = this > BigDecimal.ZERO && this < FIAT_FORMAT_THRESHOLD
-}

features/markets/impl/src/main/kotlin/com/tangem/features/markets/details/impl/model/MarketsTokenDetailsModel.kt

@@ -18,9 +18,10 @@ import com.tangem.core.ui.components.marketprice.PriceChangeType
 import com.tangem.core.ui.event.consumedEvent
 import com.tangem.core.ui.extensions.TextReference
 import com.tangem.core.ui.extensions.resourceReference
+import com.tangem.core.ui.format.bigdecimal.fiat
 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.core.ui.format.bigdecimal.price
 import com.tangem.domain.appcurrency.GetSelectedAppCurrencyUseCase
 import com.tangem.domain.appcurrency.model.AppCurrency
 import com.tangem.domain.feedback.SendFeedbackEmailUseCase
@@ -164,11 +165,12 @@ internal class MarketsTokenDetailsModel @Inject constructor(
                 type = percentChangeType.toChartType(),
                 xAxisFormatter = MarketsDateTimeFormatters.getChartXFormatterByInterval(PriceChangeInterval.H24),
                 yAxisFormatter = { value ->
-                    BigDecimalFormatter.formatFiatPriceUncapped(
-                        fiatAmount = value,
-                        fiatCurrencyCode = currentAppCurrency.value.code,
-                        fiatCurrencySymbol = currentAppCurrency.value.symbol,
-                    )
+                    value.format {
+                        fiat(
+                            fiatCurrencyCode = currentAppCurrency.value.code,
+                            fiatCurrencySymbol = currentAppCurrency.value.symbol,
+                        ).price()
+                    }
                 },
             )
         }
@@ -196,11 +198,12 @@ internal class MarketsTokenDetailsModel @Inject constructor(
     val state = MutableStateFlow(
         MarketsTokenDetailsUM(
             tokenName = params.token.name,
-            priceText = BigDecimalFormatter.formatFiatPriceUncapped(
-                fiatAmount = params.token.tokenQuotes.currentPrice,
-                fiatCurrencyCode = currentAppCurrency.value.code,
-                fiatCurrencySymbol = currentAppCurrency.value.symbol,
-            ),
+            priceText = params.token.tokenQuotes.currentPrice.format {
+                fiat(
+                    fiatCurrencyCode = currentAppCurrency.value.code,
+                    fiatCurrencySymbol = currentAppCurrency.value.symbol,
+                ).price()
+            },
             dateTimeText = resourceReference(R.string.common_today),
             priceChangePercentText = params.token.tokenQuotes.h24Percent?.format { percent() },
             priceChangeType = params.token.tokenQuotes.h24Percent.percentChangeType(),
@@ -403,7 +406,12 @@ internal class MarketsTokenDetailsModel @Inject constructor(
 
         state.update {
             it.copy(
-                priceText = newInfo.quotes.currentPrice.formatAsPrice(currentAppCurrency.value),
+                priceText = newInfo.quotes.currentPrice.format {
+                    fiat(
+                        fiatCurrencySymbol = currentAppCurrency.value.symbol,
+                        fiatCurrencyCode = currentAppCurrency.value.code,
+                    ).price()
+                },
                 priceChangePercentText = newInfo.quotes.getFormattedPercentByInterval(
                     interval = it.selectedInterval,
                 ),
@@ -490,7 +498,12 @@ internal class MarketsTokenDetailsModel @Inject constructor(
             )
         } ?: getDefaultDateTimeString(currentState.selectedInterval)
 
-        val priceText = (price ?: currentQuotes.value.currentPrice).formatAsPrice(currentAppCurrency.value)
+        val priceText = (price ?: currentQuotes.value.currentPrice).format {
+            fiat(
+                fiatCurrencySymbol = currentAppCurrency.value.symbol,
+                fiatCurrencyCode = currentAppCurrency.value.code,
+            ).price()
+        }
 
         val percent = price?.let {
             getChangePercentBetween(

features/markets/impl/src/main/kotlin/com/tangem/features/markets/details/impl/model/converters/ExchangeItemStateConverter.kt

@@ -5,7 +5,9 @@ import com.tangem.core.ui.components.currency.icon.CurrencyIconState
 import com.tangem.core.ui.components.token.state.TokenItemState
 import com.tangem.core.ui.extensions.resourceReference
 import com.tangem.core.ui.extensions.stringReference
-import com.tangem.core.ui.utils.BigDecimalFormatter
+import com.tangem.core.ui.format.bigdecimal.fiat
+import com.tangem.core.ui.format.bigdecimal.format
+import com.tangem.core.ui.format.bigdecimal.price
 import com.tangem.domain.markets.TokenMarketExchange
 import com.tangem.domain.markets.TokenMarketExchange.TrustScore
 import com.tangem.features.markets.impl.R
@@ -29,11 +31,12 @@ internal object ExchangeItemStateConverter : Converter<TokenMarketExchange, Toke
             ),
             titleState = TokenItemState.TitleState.Content(text = stringReference(value.name)),
             fiatAmountState = TokenItemState.FiatAmountState.Content(
-                text = BigDecimalFormatter.formatFiatPriceUncapped(
-                    fiatAmount = value.volumeInUsd,
-                    fiatCurrencyCode = "USD",
-                    fiatCurrencySymbol = "$",
-                ),
+                text = value.volumeInUsd.format {
+                    fiat(
+                        fiatCurrencyCode = "USD",
+                        fiatCurrencySymbol = "$",
+                    ).price()
+                },
             ),
             subtitleState = TokenItemState.SubtitleState.TextContent(
                 value = stringReference(value = if (value.isCentralized) "CEX" else "DEX"),

features/markets/impl/src/main/kotlin/com/tangem/features/markets/details/impl/model/converters/PricePerformanceConverter.kt

@@ -1,7 +1,9 @@
 package com.tangem.features.markets.details.impl.model.converters
 
 import androidx.compose.runtime.Stable
-import com.tangem.core.ui.utils.BigDecimalFormatter
+import com.tangem.core.ui.format.bigdecimal.fiat
+import com.tangem.core.ui.format.bigdecimal.format
+import com.tangem.core.ui.format.bigdecimal.price
 import com.tangem.domain.appcurrency.model.AppCurrency
 import com.tangem.domain.markets.PriceChangeInterval
 import com.tangem.domain.markets.TokenMarketInfo
@@ -45,11 +47,12 @@ internal class PricePerformanceConverter(
     private fun BigDecimal?.convert(): String {
         val currency = appCurrency()
 
-        return BigDecimalFormatter.formatFiatPriceUncapped(
-            fiatAmount = this,
-            fiatCurrencyCode = currency.code,
-            fiatCurrencySymbol = currency.symbol,
-        )
+        return format {
+            fiat(
+                fiatCurrencyCode = currency.code,
+                fiatCurrencySymbol = currency.symbol,
+            ).price()
+        }
     }
 
     private fun TokenMarketInfo.Range.calculateFraction(currentPrice: BigDecimal): Float {

features/markets/impl/src/main/kotlin/com/tangem/features/markets/details/impl/model/formatter/Formatters.kt

@@ -3,22 +3,13 @@ package com.tangem.features.markets.details.impl.model.formatter
 import com.tangem.common.ui.charts.state.MarketChartLook
 import com.tangem.core.ui.components.marketprice.PriceChangeType
 import com.tangem.core.ui.format.bigdecimal.format
+import com.tangem.core.ui.format.bigdecimal.getFiatPriceAmountWithScale
 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.markets.PriceChangeInterval
 import com.tangem.domain.markets.TokenQuotes
 import java.math.BigDecimal
 import java.math.RoundingMode
 
-internal fun BigDecimal.formatAsPrice(currency: AppCurrency): String {
-    return BigDecimalFormatter.formatFiatPriceUncapped(
-        fiatAmount = this,
-        fiatCurrencyCode = currency.code,
-        fiatCurrencySymbol = currency.symbol,
-    )
-}
-
 internal fun TokenQuotes.getFormattedPercentByInterval(interval: PriceChangeInterval): String {
     val percent = when (interval) {
         PriceChangeInterval.H24 -> h24ChangePercent
@@ -66,8 +57,8 @@ internal fun getChangePercentBetween(currentPrice: BigDecimal, previousPrice: Bi
 }
 
 internal fun getFormattedPriceChange(currentPrice: BigDecimal, updatedPrice: BigDecimal): PriceChangeType {
-    val current = BigDecimalFormatter.getFiatPriceUncappedWithScale(value = currentPrice).first
-    val updated = BigDecimalFormatter.getFiatPriceUncappedWithScale(value = updatedPrice).first
+    val current = getFiatPriceAmountWithScale(value = currentPrice).first
+    val updated = getFiatPriceAmountWithScale(value = updatedPrice).first
 
     return when {
         updated > current -> PriceChangeType.UP

features/markets/impl/src/main/kotlin/com/tangem/features/markets/details/impl/model/state/QuotesStateUpdater.kt

@@ -3,6 +3,9 @@ package com.tangem.features.markets.details.impl.model.state
 import com.tangem.core.ui.components.marketprice.PriceChangeType
 import com.tangem.core.ui.event.consumedEvent
 import com.tangem.core.ui.event.triggeredEvent
+import com.tangem.core.ui.format.bigdecimal.fiat
+import com.tangem.core.ui.format.bigdecimal.format
+import com.tangem.core.ui.format.bigdecimal.price
 import com.tangem.domain.appcurrency.model.AppCurrency
 import com.tangem.domain.markets.PriceChangeInterval
 import com.tangem.domain.markets.TokenMarketInfo
@@ -57,7 +60,12 @@ internal class QuotesStateUpdater(
 
         state.update { stateToUpdate ->
             stateToUpdate.copy(
-                priceText = newQuotes.currentPrice.formatAsPrice(currentAppCurrency()),
+                priceText = newQuotes.currentPrice.format {
+                    fiat(
+                        fiatCurrencySymbol = currentAppCurrency().symbol,
+                        fiatCurrencyCode = currentAppCurrency().code,
+                    ).price()
+                },
                 priceChangePercentText = newQuotes.getFormattedPercentByInterval(
                     interval = stateToUpdate.selectedInterval,
                 ),

features/markets/impl/src/main/kotlin/com/tangem/features/markets/token/block/impl/model/TokenMarketBlockModel.kt

@@ -11,9 +11,10 @@ import com.tangem.core.decompose.model.Model
 import com.tangem.core.decompose.model.ParamsContainer
 import com.tangem.core.decompose.navigation.Router
 import com.tangem.core.ui.components.marketprice.PriceChangeType
+import com.tangem.core.ui.format.bigdecimal.fiat
 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.core.ui.format.bigdecimal.price
 import com.tangem.domain.appcurrency.GetSelectedAppCurrencyUseCase
 import com.tangem.domain.appcurrency.model.AppCurrency
 import com.tangem.domain.markets.GetCurrencyQuotesUseCase
@@ -86,13 +87,14 @@ internal class TokenMarketBlockModel @Inject constructor(
                     )
 
                     state.value = state.value.copy(
-                        currentPrice = BigDecimalFormatter.formatFiatPriceUncapped(
-                            fiatAmount = res.fiatRate,
-                            // TODO get currency from quotes use case [REDACTED_TASK_KEY]
-                            fiatCurrencyCode = currentAppCurrency.value.code,
-                            // TODO get currency from quotes use case [REDACTED_TASK_KEY]
-                            fiatCurrencySymbol = currentAppCurrency.value.symbol,
-                        ),
+                        currentPrice = res.fiatRate.format {
+                            fiat(
+                                // TODO get currency from quotes use case [REDACTED_TASK_KEY]
+                                fiatCurrencyCode = currentAppCurrency.value.code,
+                                // TODO get currency from quotes use case [REDACTED_TASK_KEY]
+                                fiatCurrencySymbol = currentAppCurrency.value.symbol,
+                            ).price()
+                        },
                         h24Percent = res.priceChange.format { percent() },
                         priceChangeType = PriceChangeType.fromBigDecimal(res.priceChange),
                     )

features/markets/impl/src/main/kotlin/com/tangem/features/markets/tokenlist/impl/model/converters/MarketsTokenItemConverter.kt

@@ -7,11 +7,7 @@ import com.tangem.common.ui.charts.state.sorted
 import com.tangem.core.ui.components.marketprice.PriceChangeType
 import com.tangem.core.ui.extensions.resourceReference
 import com.tangem.core.ui.extensions.wrappedList
-import com.tangem.core.ui.format.bigdecimal.compact
-import com.tangem.core.ui.format.bigdecimal.fiat
-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.core.ui.format.bigdecimal.*
 import com.tangem.domain.appcurrency.model.AppCurrency
 import com.tangem.domain.markets.TokenMarket
 import com.tangem.features.markets.impl.R
@@ -94,11 +90,12 @@ internal class MarketsTokenItemConverter(
     private fun TokenMarket.getCurrentPrice(prev: TokenMarket? = null): MarketsListItemUM.Price {
         val prevPrice = prev?.tokenQuotesShort?.currentPrice
 
-        val priceText = BigDecimalFormatter.formatFiatPriceUncapped(
-            fiatAmount = tokenQuotesShort.currentPrice,
-            fiatCurrencyCode = appCurrency.code,
-            fiatCurrencySymbol = appCurrency.symbol,
-        )
+        val priceText = tokenQuotesShort.currentPrice.format {
+            fiat(
+                fiatCurrencyCode = appCurrency.code,
+                fiatCurrencySymbol = appCurrency.symbol,
+            ).price()
+        }
 
         val changeType = if (prevPrice != null) {
             if (tokenQuotesShort.currentPrice > prevPrice) {

features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/converters/RewardsValidatorStateConverter.kt

@@ -2,8 +2,8 @@ package com.tangem.features.staking.impl.presentation.state.converters
 
 import com.tangem.core.ui.extensions.stringReference
 import com.tangem.core.ui.format.bigdecimal.crypto
+import com.tangem.core.ui.format.bigdecimal.fiat
 import com.tangem.core.ui.format.bigdecimal.format
-import com.tangem.core.ui.utils.BigDecimalFormatter
 import com.tangem.core.ui.utils.parseBigDecimal
 import com.tangem.domain.appcurrency.model.AppCurrency
 import com.tangem.domain.models.currency.CryptoCurrencyStatus
@@ -69,11 +69,12 @@ internal class RewardsValidatorStateConverter(
             },
         )
         val formattedFiatAmount = stringReference(
-            BigDecimalFormatter.formatFiatAmount(
-                fiatAmount = fiatValue,
-                fiatCurrencyCode = appCurrency.code,
-                fiatCurrencySymbol = appCurrency.symbol,
-            ),
+            fiatValue.format {
+                fiat(
+                    fiatCurrencyCode = appCurrency.code,
+                    fiatCurrencySymbol = appCurrency.symbol,
+                )
+            },
         )
 
         return BalanceState(

features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/transformers/approval/ShowApprovalBottomSheetTransformer.kt

@@ -6,8 +6,8 @@ import com.tangem.core.ui.components.bottomsheets.TangemBottomSheetConfig
 import com.tangem.core.ui.extensions.resourceReference
 import com.tangem.core.ui.extensions.wrappedList
 import com.tangem.core.ui.format.bigdecimal.crypto
+import com.tangem.core.ui.format.bigdecimal.fiat
 import com.tangem.core.ui.format.bigdecimal.format
-import com.tangem.core.ui.utils.BigDecimalFormatter
 import com.tangem.domain.appcurrency.model.AppCurrency
 import com.tangem.domain.models.currency.CryptoCurrencyStatus
 import com.tangem.features.staking.impl.R
@@ -38,11 +38,12 @@ internal class ShowApprovalBottomSheetTransformer(
         val feeCryptoValue = fee.amount.value.format {
             crypto(fee.amount.currencySymbol, fee.amount.decimals)
         }
-        val feeFiatValue = BigDecimalFormatter.formatFiatAmount(
-            fiatAmount = feeCryptoCurrencyStatus?.value?.fiatRate?.multiply(fee.amount.value),
-            fiatCurrencyCode = appCurrencyProvider().code,
-            fiatCurrencySymbol = appCurrencyProvider().symbol,
-        )
+        val feeFiatValue = feeCryptoCurrencyStatus?.value?.fiatRate?.multiply(fee.amount.value).format {
+            fiat(
+                fiatCurrencyCode = appCurrencyProvider().code,
+                fiatCurrencySymbol = appCurrencyProvider().symbol,
+            )
+        }
         return prevState.copy(
             bottomSheetConfig = TangemBottomSheetConfig(
                 isShown = true,

features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/ui/block/StakingFeeBlock.kt

@@ -26,9 +26,9 @@ import com.tangem.core.ui.format.bigdecimal.fee
 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 com.tangem.domain.appcurrency.model.AppCurrency
 import com.tangem.features.staking.impl.presentation.state.FeeState
+import com.tangem.utils.StringsSigns.DASH_SIGN
 import java.math.BigDecimal
 
 @Composable
@@ -126,7 +126,7 @@ private fun BoxScope.FeeError(feeState: FeeState) {
     ) {
         if (it == FeeState.Error) {
             Text(
-                text = BigDecimalFormatter.EMPTY_BALANCE_SIGN,
+                text = DASH_SIGN,
                 color = TangemTheme.colors.text.primary1,
                 style = TangemTheme.typography.body1,
             )

features/swap/impl/src/main/java/com/tangem/feature/swap/converters/TokensDataConverter.kt

@@ -3,8 +3,8 @@ package com.tangem.feature.swap.converters
 import com.tangem.core.ui.components.currency.icon.CurrencyIconState
 import com.tangem.core.ui.extensions.*
 import com.tangem.core.ui.format.bigdecimal.crypto
+import com.tangem.core.ui.format.bigdecimal.fiat
 import com.tangem.core.ui.format.bigdecimal.format
-import com.tangem.core.ui.utils.BigDecimalFormatter
 import com.tangem.domain.appcurrency.model.AppCurrency
 import com.tangem.domain.models.currency.CryptoCurrency
 import com.tangem.domain.models.currency.CryptoCurrencyStatus
@@ -111,10 +111,11 @@ class TokensDataConverter(
     }
 
     private fun formatFiatAmount(cryptoCurrencyStatus: CryptoCurrencyStatus, appCurrency: AppCurrency): String {
-        return BigDecimalFormatter.formatFiatAmount(
-            fiatAmount = cryptoCurrencyStatus.value.fiatAmount,
-            fiatCurrencyCode = appCurrency.code,
-            fiatCurrencySymbol = appCurrency.symbol,
-        )
+        return cryptoCurrencyStatus.value.fiatAmount.format {
+            fiat(
+                fiatCurrencyCode = appCurrency.code,
+                fiatCurrencySymbol = appCurrency.symbol,
+            )
+        }
     }
 }

features/swap/impl/src/main/java/com/tangem/feature/swap/ui/StateBuilder.kt

@@ -13,8 +13,8 @@ import com.tangem.core.ui.event.triggeredEvent
 import com.tangem.core.ui.extensions.*
 import com.tangem.core.ui.format.bigdecimal.anyDecimals
 import com.tangem.core.ui.format.bigdecimal.crypto
+import com.tangem.core.ui.format.bigdecimal.fiat
 import com.tangem.core.ui.format.bigdecimal.format
-import com.tangem.core.ui.utils.BigDecimalFormatter
 import com.tangem.core.ui.utils.parseBigDecimal
 import com.tangem.domain.appcurrency.model.AppCurrency
 import com.tangem.domain.models.currency.CryptoCurrency
@@ -1273,7 +1273,12 @@ internal class StateBuilder(
     private fun getFormattedFiatAmount(amount: BigDecimal?): String {
         val appCurrency = appCurrencyProvider()
 
-        return BigDecimalFormatter.formatFiatAmount(amount, appCurrency.code, appCurrency.symbol)
+        return amount.format {
+            fiat(
+                fiatCurrencyCode = appCurrency.code,
+                fiatCurrencySymbol = appCurrency.symbol,
+            )
+        }
     }
 
     private fun SwapAmount.getFormattedCryptoAmount(token: CryptoCurrency): String {

features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/ui/components/TokenDetailsBalanceBlock.kt

@@ -20,11 +20,11 @@ import com.tangem.core.ui.extensions.resolveReference
 import com.tangem.core.ui.extensions.stringResourceSafe
 import com.tangem.core.ui.res.TangemTheme
 import com.tangem.core.ui.res.TangemThemePreview
-import com.tangem.core.ui.utils.BigDecimalFormatter
 import com.tangem.feature.tokendetails.presentation.tokendetails.TokenDetailsPreviewData
 import com.tangem.feature.tokendetails.presentation.tokendetails.state.TokenDetailsBalanceBlockState
 import com.tangem.feature.tokendetails.presentation.tokendetails.state.components.TokenDetailsActionButton
 import com.tangem.features.tokendetails.impl.R
+import com.tangem.utils.StringsSigns.DASH_SIGN
 import kotlinx.collections.immutable.toImmutableList
 
 @Suppress("DestructuringDeclarationWithTooManyEntries")
@@ -124,7 +124,7 @@ private fun FiatBalance(
         )
         is TokenDetailsBalanceBlockState.Error -> Text(
             modifier = modifier,
-            text = BigDecimalFormatter.EMPTY_BALANCE_SIGN.orMaskWithStars(isBalanceHidden),
+            text = DASH_SIGN.orMaskWithStars(isBalanceHidden),
             style = TangemTheme.typography.h2,
             color = TangemTheme.colors.text.primary1,
         )
@@ -154,7 +154,7 @@ private fun CryptoBalance(
         )
         is TokenDetailsBalanceBlockState.Error -> Text(
             modifier = modifier,
-            text = BigDecimalFormatter.EMPTY_BALANCE_SIGN.orMaskWithStars(isBalanceHidden),
+            text = DASH_SIGN.orMaskWithStars(isBalanceHidden),
             style = TangemTheme.typography.caption2,
             color = TangemTheme.colors.text.tertiary,
         )

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/transformers/converter/SingleWalletMarketPriceConverter.kt

@@ -4,11 +4,13 @@ import com.tangem.core.ui.components.marketprice.MarketPriceBlockState
 import com.tangem.core.ui.components.marketprice.PriceChangeState
 import com.tangem.core.ui.components.marketprice.PriceChangeType
 import com.tangem.core.ui.components.marketprice.utils.PriceChangeConverter
+import com.tangem.core.ui.format.bigdecimal.fiat
 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.core.ui.format.bigdecimal.uncapped
 import com.tangem.domain.appcurrency.model.AppCurrency
 import com.tangem.domain.models.currency.CryptoCurrencyStatus
+import com.tangem.utils.StringsSigns.DASH_SIGN
 import com.tangem.utils.converter.Converter
 
 internal class SingleWalletMarketPriceConverter(
@@ -47,17 +49,18 @@ internal class SingleWalletMarketPriceConverter(
     }
 
     private fun formatPrice(status: CryptoCurrencyStatus.Value, appCurrency: AppCurrency): String {
-        val fiatRate = status.fiatRate ?: return BigDecimalFormatter.EMPTY_BALANCE_SIGN
+        val fiatRate = status.fiatRate ?: return DASH_SIGN
 
-        return BigDecimalFormatter.formatFiatAmountUncapped(
-            fiatAmount = fiatRate,
-            fiatCurrencyCode = appCurrency.code,
-            fiatCurrencySymbol = appCurrency.symbol,
-        )
+        return fiatRate.format {
+            fiat(
+                fiatCurrencyCode = appCurrency.code,
+                fiatCurrencySymbol = appCurrency.symbol,
+            ).uncapped()
+        }
     }
 
     private fun formatPriceChange(status: CryptoCurrencyStatus.Value): String {
-        val priceChange = status.priceChange ?: return BigDecimalFormatter.EMPTY_BALANCE_SIGN
+        val priceChange = status.priceChange ?: return DASH_SIGN
 
         return priceChange.format { percent() }
     }

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/transformers/converter/VisaTxDetailsBottomSheetConverter.kt

@@ -2,13 +2,13 @@ package com.tangem.feature.wallet.presentation.wallet.state.transformers.convert
 
 import com.tangem.core.ui.extensions.capitalize
 import com.tangem.core.ui.format.bigdecimal.crypto
+import com.tangem.core.ui.format.bigdecimal.fiat
 import com.tangem.core.ui.format.bigdecimal.format
-import com.tangem.core.ui.utils.BigDecimalFormatter
 import com.tangem.core.ui.utils.DateTimeFormatters
 import com.tangem.domain.visa.model.VisaCurrency
 import com.tangem.domain.visa.model.VisaTxDetails
-import com.tangem.feature.wallet.presentation.wallet.state.model.VisaTxDetailsBottomSheetConfig
 import com.tangem.feature.wallet.child.wallet.model.intents.VisaWalletIntents
+import com.tangem.feature.wallet.presentation.wallet.state.model.VisaTxDetailsBottomSheetConfig
 import com.tangem.utils.converter.Converter
 import kotlinx.collections.immutable.toImmutableList
 import org.joda.time.DateTimeZone
@@ -71,11 +71,12 @@ internal class VisaTxDetailsBottomSheetConverter(
     }
 
     private fun formatFiatAmount(amount: BigDecimal, fiatCurrency: Currency): String {
-        return BigDecimalFormatter.formatFiatAmount(
-            fiatAmount = amount,
-            fiatCurrencyCode = fiatCurrency.currencyCode,
-            fiatCurrencySymbol = fiatCurrency.symbol,
-        )
+        return amount.format {
+            fiat(
+                fiatCurrencyCode = fiatCurrency.currencyCode,
+                fiatCurrencySymbol = fiatCurrency.symbol,
+            )
+        }
     }
 
     private companion object {

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/transformers/converter/VisaTxHistoryItemStateConverter.kt

@@ -4,13 +4,13 @@ import com.tangem.core.ui.components.transactions.state.TransactionState
 import com.tangem.core.ui.extensions.capitalize
 import com.tangem.core.ui.extensions.stringReference
 import com.tangem.core.ui.format.bigdecimal.crypto
+import com.tangem.core.ui.format.bigdecimal.fiat
 import com.tangem.core.ui.format.bigdecimal.format
-import com.tangem.core.ui.utils.BigDecimalFormatter
 import com.tangem.core.ui.utils.DateTimeFormatters
 import com.tangem.domain.visa.model.VisaCurrency
 import com.tangem.domain.visa.model.VisaTxHistoryItem
-import com.tangem.feature.wallet.impl.R
 import com.tangem.feature.wallet.child.wallet.model.intents.VisaWalletIntents
+import com.tangem.feature.wallet.impl.R
 import com.tangem.utils.StringsSigns
 import com.tangem.utils.converter.Converter
 import org.joda.time.DateTimeZone
@@ -29,11 +29,12 @@ internal class VisaTxHistoryItemStateConverter(
             txHash = value.id,
             amount = value.amount.format { crypto(visaCurrency.symbol, visaCurrency.decimals) },
             // Show tx fiat amount instead of tx time
-            time = BigDecimalFormatter.formatFiatAmount(
-                fiatAmount = value.fiatAmount,
-                fiatCurrencyCode = value.fiatCurrency.currencyCode,
-                fiatCurrencySymbol = value.fiatCurrency.symbol,
-            ),
+            time = value.fiatAmount.format {
+                fiat(
+                    fiatCurrencyCode = value.fiatCurrency.currencyCode,
+                    fiatCurrencySymbol = value.fiatCurrency.symbol,
+                )
+            },
             status = TransactionState.Content.Status.Confirmed,
             direction = TransactionState.Content.Direction.INCOMING,
             iconRes = R.drawable.ic_arrow_up_24,