Updated on 2026-08-14

2025-03-18 15:14:57 +05:00 · 2025-03-18 15:14:57 +05:00 · 4c7016557f
commit 4c7016557f
parent cbe8cb0b3c
23 changed files with 731 additions and 31 deletions
--- a/common/ui/src/main/java/com/tangem/common/ui/amountScreen/AmountScreenContent.kt
+++ b/common/ui/src/main/java/com/tangem/common/ui/amountScreen/AmountScreenContent.kt
@ -40,7 +40,12 @@ fun AmountScreenContent(
                bottom = TangemTheme.dimens.spacing16,
            ),
    ) {
-        amountField(amountState = amountState, isBalanceHidden = isBalanceHidden)
+        amountField(
+            amountState = amountState,
+            isBalanceHidden = isBalanceHidden,
+            onValueChange = clickIntents::onAmountValueChange,
+            onValuePastedTriggerDismiss = clickIntents::onAmountPasteTriggerDismiss,
+        )
        buttons(
            segmentedButtonConfig = amountState.segmentedButtonConfig,
            clickIntents = clickIntents,
--- a/common/ui/src/main/java/com/tangem/common/ui/amountScreen/converters/AmountPastedTriggerDismissTransformer.kt
+++ b/common/ui/src/main/java/com/tangem/common/ui/amountScreen/converters/AmountPastedTriggerDismissTransformer.kt
@ -6,7 +6,7 @@ import com.tangem.utils.transformer.Transformer
 /**
 * Dismisses indication on pasted value
 */
-class AmountPastedTriggerDismissTransformer : Transformer<AmountState> {
+object AmountPastedTriggerDismissTransformer : Transformer<AmountState> {
    override fun transform(prevState: AmountState): AmountState {
        if (prevState !is AmountState.Data) return prevState

--- a/common/ui/src/main/java/com/tangem/common/ui/amountScreen/converters/AmountStateConverter.kt
+++ b/common/ui/src/main/java/com/tangem/common/ui/amountScreen/converters/AmountStateConverter.kt
@ -3,6 +3,7 @@ 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.converters.field.AmountFieldConverterV2
 import com.tangem.common.ui.amountScreen.models.AmountParameters
 import com.tangem.common.ui.amountScreen.models.AmountSegmentedButtonsConfig
 import com.tangem.common.ui.amountScreen.models.AmountState
@ -30,6 +31,7 @@ import kotlinx.collections.immutable.persistentListOf
 * @property cryptoCurrencyStatusProvider current cryptocurrency status provider
 * @property iconStateConverter currency icon converter
 */
+@Deprecated("Use AmountStateConverterV2")
 class AmountStateConverter(
    private val clickIntents: AmountScreenClickIntents,
    private val appCurrencyProvider: Provider<AppCurrency>,
@ -80,4 +82,63 @@ class AmountStateConverter(
            selectedButton = 0,
        )
    }
+}
+
+/**
+ * Converts initial [String] to [AmountState]
+ *
+ * @property clickIntents amount screen clicks
+ * @property appCurrency selected app currency
+ * @property maxEnterAmount max enter amount data
+ * @property cryptoCurrencyStatus current cryptocurrency status
+ * @property iconStateConverter currency icon converter
+ */
+class AmountStateConverterV2(
+    private val clickIntents: AmountScreenClickIntents,
+    private val appCurrency: AppCurrency,
+    private val cryptoCurrencyStatus: CryptoCurrencyStatus,
+    private val maxEnterAmount: EnterAmountBoundary,
+    private val iconStateConverter: CryptoCurrencyToIconStateConverter,
+) : Converter<AmountParameters, AmountState> {
+
+    private val amountFieldConverter by lazy(LazyThreadSafetyMode.NONE) {
+        AmountFieldConverterV2(
+            clickIntents = clickIntents,
+            cryptoCurrencyStatus = cryptoCurrencyStatus,
+            appCurrency = appCurrency,
+        )
+    }
+
+    override fun convert(value: AmountParameters): AmountState {
+        val fiat = maxEnterAmount.fiatAmount.format { fiat(appCurrency.code, appCurrency.symbol) }
+        val crypto = maxEnterAmount.amount.format { crypto(cryptoCurrencyStatus.currency) }
+        val noFeeRate = cryptoCurrencyStatus.value.fiatRate.isNullOrZero()
+
+        return AmountState.Data(
+            title = value.title,
+            availableBalance = resourceReference(R.string.common_crypto_fiat_format, wrappedList(crypto, fiat)),
+            tokenIconState = iconStateConverter.convert(cryptoCurrencyStatus),
+            amountTextField = amountFieldConverter.convert(value.value),
+            isPrimaryButtonEnabled = false,
+            appCurrencyCode = appCurrency.code,
+            segmentedButtonConfig = persistentListOf(
+                AmountSegmentedButtonsConfig(
+                    title = stringReference(cryptoCurrencyStatus.currency.symbol),
+                    iconState = iconStateConverter.convertCustom(
+                        value = cryptoCurrencyStatus,
+                        forceGrayscale = noFeeRate,
+                        showCustomTokenBadge = false,
+                    ),
+                    isFiat = false,
+                ),
+                AmountSegmentedButtonsConfig(
+                    title = stringReference(appCurrency.code),
+                    iconUrl = appCurrency.iconSmallUrl,
+                    isFiat = true,
+                ),
+            ),
+            isSegmentedButtonsEnabled = !noFeeRate,
+            selectedButton = 0,
+        )
+    }
 }
--- a/common/ui/src/main/java/com/tangem/common/ui/amountScreen/converters/field/AmountFieldChangeTransformer.kt
+++ b/common/ui/src/main/java/com/tangem/common/ui/amountScreen/converters/field/AmountFieldChangeTransformer.kt
@ -31,6 +31,7 @@ class AmountFieldChangeTransformer(
    private val cryptoCurrencyStatus: CryptoCurrencyStatus,
    private val maxEnterAmount: EnterAmountBoundary,
    private val minimumTransactionAmount: EnterAmountBoundary?,
+    private val reduceAmountBy: BigDecimal = BigDecimal.ZERO,
    private val value: String,
 ) : Transformer<AmountState> {

@ -58,7 +59,7 @@ class AmountFieldChangeTransformer(

        val checkValue = if (amountTextField.isFiatValue) fiatValue else cryptoValue
        val isExceedBalance = checkValue.checkExceedBalance(maxEnterAmount, amountTextField)
-        val isLessThanMinimumIfProvided = minimumTransactionAmount?.amount?.let { decimalCryptoValue < it } ?: false
+        val isLessThanMinimumIfProvided = minimumTransactionAmount?.amount?.let { decimalCryptoValue < it } == true
        val isZero = if (amountTextField.isFiatValue) {
            decimalFiatValue.isNullOrZero()
        } else {
@ -67,6 +68,7 @@ class AmountFieldChangeTransformer(
        val isCheckFailed = isExceedBalance || isLessThanMinimumIfProvided
        return prevState.copy(
            isPrimaryButtonEnabled = !isZero && !isCheckFailed,
+            reduceAmountBy = reduceAmountBy,
            amountTextField = amountTextField.copy(
                value = cryptoValue,
                fiatValue = fiatValue,
@ -74,10 +76,11 @@ class AmountFieldChangeTransformer(
                error = when {
                    isExceedBalance -> resourceReference(R.string.send_validation_amount_exceeds_balance)
                    isLessThanMinimumIfProvided -> {
-                        val minimumAmount = minimumTransactionAmount
-                            ?.amount
-                            ?.format { crypto(cryptoCurrencyStatus.currency) }
-                            .orEmpty()
+                        val minimumAmount =
+                            minimumTransactionAmount.amount.format {
+                                crypto(cryptoCurrencyStatus.currency)
+                            }
+
                        resourceReference(
                            R.string.transfer_notification_invalid_minimum_transaction_amount_text,
                            wrappedList(minimumAmount, minimumAmount),
@ -98,6 +101,7 @@ class AmountFieldChangeTransformer(
    private fun AmountState.Data.emptyState(): AmountState.Data {
        return copy(
            isPrimaryButtonEnabled = false,
+            reduceAmountBy = BigDecimal.ZERO,
            amountTextField = amountTextField.copy(
                value = "",
                fiatValue = "",
--- a/common/ui/src/main/java/com/tangem/common/ui/amountScreen/converters/field/AmountFieldConverter.kt
+++ b/common/ui/src/main/java/com/tangem/common/ui/amountScreen/converters/field/AmountFieldConverter.kt
@ -19,12 +19,13 @@ import com.tangem.utils.isNullOrZero
 import java.math.BigDecimal

 /**
- * Converts initial [String] to [AmountField]
+ * Converts initial [String] to [AmountFieldModel]
 *
 * @property clickIntents amount screen clicks
 * @property appCurrencyProvider selected app currency provider
 * @property cryptoCurrencyStatusProvider current cryptocurrency status provider
 */
+@Deprecated("Use AmountFieldConverterV2")
 class AmountFieldConverter(
    private val clickIntents: AmountScreenClickIntents,
    private val cryptoCurrencyStatusProvider: Provider<CryptoCurrencyStatus>,
@ -76,6 +77,68 @@ class AmountFieldConverter(
        type = AmountType.FiatType(appCurrency.code),
    )

+    private companion object {
+        private const val FIAT_DECIMALS = 2
+    }
+}
+
+/**
+ * Converts initial [String] to [AmountFieldModel]
+ *
+ * @property clickIntents amount screen clicks
+ * @property appCurrency selected app currency
+ * @property cryptoCurrencyStatus current cryptocurrency status
+ */
+class AmountFieldConverterV2(
+    private val clickIntents: AmountScreenClickIntents,
+    private val cryptoCurrencyStatus: CryptoCurrencyStatus,
+    private val appCurrency: AppCurrency,
+) : Converter<String, AmountFieldModel> {
+
+    override fun convert(value: String): AmountFieldModel {
+        val cryptoDecimal = value.toBigDecimalOrNull() ?: BigDecimal.ZERO
+        val cryptoAmount = cryptoDecimal.convertToAmount(cryptoCurrencyStatus.currency)
+        val fiatRate = cryptoCurrencyStatus.value.fiatRate
+        val (fiatValue, fiatDecimal) = when {
+            fiatRate.isNullOrZero() -> "" to null
+            value.isEmpty() -> "" to BigDecimal.ZERO
+            else -> {
+                val fiatDecimal = fiatRate?.multiply(cryptoDecimal)
+                val fiatValue = fiatDecimal?.parseBigDecimal(FIAT_DECIMALS).orEmpty()
+                fiatValue to fiatDecimal
+            }
+        }
+        val isDoneActionEnabled = !cryptoDecimal.isNullOrZero()
+        return AmountFieldModel(
+            value = value,
+            fiatValue = fiatValue,
+            onValueChange = clickIntents::onAmountValueChange,
+            keyboardOptions = KeyboardOptions(
+                imeAction = if (isDoneActionEnabled) ImeAction.Done else ImeAction.None,
+                keyboardType = KeyboardType.Number,
+            ),
+            keyboardActions = KeyboardActions(
+                onDone = { clickIntents.onAmountNext() },
+            ),
+            isFiatValue = false,
+            cryptoAmount = cryptoAmount,
+            fiatAmount = getAppCurrencyAmount(fiatDecimal, appCurrency),
+            isError = false,
+            isWarning = false,
+            error = TextReference.EMPTY,
+            isFiatUnavailable = fiatRate == null,
+            isValuePasted = false,
+            onValuePastedTriggerDismiss = clickIntents::onAmountPasteTriggerDismiss,
+        )
+    }
+
+    private fun getAppCurrencyAmount(fiatValue: BigDecimal?, appCurrency: AppCurrency) = Amount(
+        currencySymbol = appCurrency.symbol,
+        value = fiatValue,
+        decimals = FIAT_DECIMALS,
+        type = AmountType.FiatType(appCurrency.code),
+    )
+
    private companion object {
        private const val FIAT_DECIMALS = 2
    }
--- a/common/ui/src/main/java/com/tangem/common/ui/amountScreen/converters/field/AmountFieldSetMaxAmountTransformer.kt
+++ b/common/ui/src/main/java/com/tangem/common/ui/amountScreen/converters/field/AmountFieldSetMaxAmountTransformer.kt
@ -15,6 +15,7 @@ import com.tangem.core.ui.utils.parseBigDecimal
 import com.tangem.domain.tokens.model.CryptoCurrencyStatus
 import com.tangem.utils.extensions.isZero
 import com.tangem.utils.transformer.Transformer
+import java.math.BigDecimal
 import java.math.RoundingMode

 /**
@ -26,6 +27,7 @@ class AmountFieldSetMaxAmountTransformer(
    private val cryptoCurrencyStatus: CryptoCurrencyStatus,
    private val maxAmount: EnterAmountBoundary,
    private val minAmount: EnterAmountBoundary?,
+    private val reduceAmountBy: BigDecimal = BigDecimal.ZERO,
 ) : Transformer<AmountState> {

    override fun transform(prevState: AmountState): AmountState {
@ -42,9 +44,10 @@ class AmountFieldSetMaxAmountTransformer(

        val cryptoValue = decimalCryptoValue.parseBigDecimal(cryptoDecimals)
        val fiatValue = decimalFiatValue?.parseBigDecimal(fiatDecimals, roundingMode = RoundingMode.HALF_UP).orEmpty()
-        val isLessThanMinimumIfProvided = minAmount?.amount?.let { decimalCryptoValue < it } ?: false
+        val isLessThanMinimumIfProvided = minAmount?.amount?.let { decimalCryptoValue < it } == true
        return prevState.copy(
            isPrimaryButtonEnabled = !isLessThanMinimumIfProvided,
+            reduceAmountBy = reduceAmountBy,
            amountTextField = amountTextField.copy(
                isValuePasted = true,
                value = cryptoValue,
@ -52,10 +55,7 @@ class AmountFieldSetMaxAmountTransformer(
                isError = isLessThanMinimumIfProvided,
                error = when {
                    isLessThanMinimumIfProvided -> {
-                        val minimumAmount = minAmount
-                            ?.amount
-                            ?.format { crypto(cryptoCurrencyStatus.currency) }
-                            .orEmpty()
+                        val minimumAmount = minAmount.amount.format { crypto(cryptoCurrencyStatus.currency) }
                        resourceReference(
                            R.string.transfer_notification_invalid_minimum_transaction_amount_text,
                            wrappedList(minimumAmount, minimumAmount),
--- a/common/ui/src/main/java/com/tangem/common/ui/amountScreen/models/AmountState.kt
+++ b/common/ui/src/main/java/com/tangem/common/ui/amountScreen/models/AmountState.kt
@ -4,6 +4,7 @@ import androidx.compose.runtime.Stable
 import com.tangem.core.ui.components.currency.icon.CurrencyIconState
 import com.tangem.core.ui.extensions.TextReference
 import kotlinx.collections.immutable.PersistentList
+import java.math.BigDecimal

 /** Model for amount state */
@Stable
@ -21,6 +22,8 @@ sealed class AmountState {
     * @param isSegmentedButtonsEnabled indicates if currency switches is enabled
     * @param amountTextField amount field state
     * @param appCurrencyCode app currency code
+     * @param isEditingDisabled indicated whether amount is editable
+     * @param reduceAmountBy reduces amount to be sent by specified value
     */
    data class Data(
        override val isPrimaryButtonEnabled: Boolean,
@ -32,6 +35,8 @@ sealed class AmountState {
        val isSegmentedButtonsEnabled: Boolean,
        val amountTextField: AmountFieldModel,
        val appCurrencyCode: String,
+        val isEditingDisabled: Boolean = false,
+        val reduceAmountBy: BigDecimal = BigDecimal.ZERO,
    ) : AmountState()

    data class Empty(
--- a/common/ui/src/main/java/com/tangem/common/ui/amountScreen/ui/AmountField.kt
+++ b/common/ui/src/main/java/com/tangem/common/ui/amountScreen/ui/AmountField.kt
@ -25,12 +25,13 @@ import com.tangem.core.ui.components.fields.visualtransformations.AmountVisualTr
 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.fiat
 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
 import kotlinx.coroutines.delay

+@Deprecated("Use AmountField with clicks")
@Composable
 internal fun AmountField(amountField: AmountFieldModel, appCurrencyCode: String) {
    val decimalFormat = rememberDecimalFormat()
@ -80,6 +81,60 @@ internal fun AmountField(amountField: AmountFieldModel, appCurrencyCode: String)
    AmountSecondary(amountField, appCurrencyCode)
 }

+@Composable
+internal fun AmountField(
+    amountField: AmountFieldModel,
+    appCurrencyCode: String,
+    onValueChange: (String) -> Unit,
+    onValuePastedTriggerDismiss: () -> Unit,
+) {
+    val decimalFormat = rememberDecimalFormat()
+    val isFiatValue = amountField.isFiatValue
+    val currencyCode = if (isFiatValue) appCurrencyCode else null
+    val (primaryAmount, primaryValue) = if (isFiatValue) {
+        amountField.fiatAmount to amountField.fiatValue
+    } else {
+        amountField.cryptoAmount to amountField.value
+    }
+    val requester = remember { FocusRequester() }
+
+    AmountTextField(
+        value = primaryValue,
+        decimals = primaryAmount.decimals,
+        visualTransformation = AmountVisualTransformation(
+            decimals = primaryAmount.decimals,
+            symbol = primaryAmount.currencySymbol,
+            currencyCode = currencyCode,
+            decimalFormat = decimalFormat,
+        ),
+        onValueChange = onValueChange,
+        keyboardOptions = amountField.keyboardOptions,
+        keyboardActions = amountField.keyboardActions,
+        textStyle = TangemTheme.typography.h2.copy(
+            color = TangemTheme.colors.text.primary1,
+            textAlign = TextAlign.Center,
+        ),
+        isAutoResize = true,
+        isValuePasted = amountField.isValuePasted,
+        onValuePastedTriggerDismiss = onValuePastedTriggerDismiss,
+        modifier = Modifier
+            .focusRequester(requester)
+            .padding(
+                top = TangemTheme.dimens.spacing24,
+                start = TangemTheme.dimens.spacing12,
+                end = TangemTheme.dimens.spacing12,
+            )
+            .requiredHeightIn(min = TangemTheme.dimens.size32),
+    )
+
+    LaunchedEffect(key1 = Unit) {
+        delay(timeMillis = 200)
+        requester.requestFocus()
+    }
+
+    AmountSecondary(amountField, appCurrencyCode)
+}
+
@Composable
 private fun AmountSecondary(amountField: AmountFieldModel, appCurrencyCode: String) {
    val secondaryAmount = if (amountField.isFiatValue) amountField.cryptoAmount else amountField.fiatAmount
@ -96,11 +151,12 @@ private fun AmountSecondary(amountField: AmountFieldModel, appCurrencyCode: Stri
        val text = if (amountField.isFiatValue) {
            secondaryAmount.value.format { crypto(secondaryAmount.currencySymbol, secondaryAmount.decimals) }
        } else {
-            BigDecimalFormatter.formatFiatAmount(
-                fiatAmount = secondaryAmount.value,
-                fiatCurrencySymbol = secondaryAmount.currencySymbol,
-                fiatCurrencyCode = appCurrencyCode,
-            )
+            secondaryAmount.value.format {
+                fiat(
+                    fiatCurrencySymbol = secondaryAmount.currencySymbol,
+                    fiatCurrencyCode = appCurrencyCode,
+                )
+            }
        }
        Text(
            text = text,
--- a/common/ui/src/main/java/com/tangem/common/ui/amountScreen/ui/AmountFieldContainer.kt
+++ b/common/ui/src/main/java/com/tangem/common/ui/amountScreen/ui/AmountFieldContainer.kt
@ -24,6 +24,8 @@ internal fun LazyListScope.amountField(
    amountState: AmountState.Data,
    isBalanceHidden: Boolean,
    modifier: Modifier = Modifier,
+    onValueChange: (String) -> Unit,
+    onValuePastedTriggerDismiss: () -> Unit,
 ) {
    item(key = AMOUNT_FIELD_KEY) {
        Column(
@ -63,6 +65,8 @@ internal fun LazyListScope.amountField(
            AmountField(
                amountField = amountState.amountTextField,
                appCurrencyCode = amountState.appCurrencyCode,
+                onValueChange = onValueChange,
+                onValuePastedTriggerDismiss = onValuePastedTriggerDismiss,
            )
        }
    }