Updated on 2026-08-14

common/routing/src/main/kotlin/com/tangem/common/routing/AppRoute.kt

@@ -11,7 +11,6 @@ import com.tangem.core.decompose.navigation.Route
 import com.tangem.domain.appcurrency.model.AppCurrency
 import com.tangem.domain.feedback.models.WalletMetaInfo
 import com.tangem.domain.markets.TokenMarketParams
-import com.tangem.domain.models.PortfolioId
 import com.tangem.domain.models.account.Account
 import com.tangem.domain.models.currency.CryptoCurrency
 import com.tangem.domain.models.scan.ScanResponse
@@ -51,50 +50,25 @@ sealed class AppRoute(val path: String) : Route {
 
     @Serializable
     data class CurrencyDetails(
-        val portfolioId: PortfolioId,
+        val userWalletId: UserWalletId,
         val currency: CryptoCurrency,
-    ) : AppRoute(path = "/currency_details/${portfolioId.stringValue}/${currency.id.value}") {
-        companion object {
-            operator fun invoke(userWalletId: UserWalletId, currency: CryptoCurrency) = CurrencyDetails(
-                portfolioId = PortfolioId(userWalletId),
-                currency = currency,
-            )
-        }
-    }
+    ) : AppRoute(path = "/currency_details/${userWalletId.stringValue}/${currency.id.value}")
 
     @Serializable
     data class Send(
-        val portfolioId: PortfolioId,
+        val userWalletId: UserWalletId,
         val currency: CryptoCurrency,
         val transactionId: String? = null,
         val amount: String? = null,
         val tag: String? = null,
         val destinationAddress: String? = null,
     ) : AppRoute(
-        path = "/send/${portfolioId.stringValue}/${currency.id.value}?" +
+        path = "/send/${userWalletId.stringValue}/${currency.id.value}?" +
             "&$transactionId" +
             "&$amount" +
             "&$tag" +
             "&$destinationAddress",
-    ) {
-        companion object {
-            operator fun invoke(
-                userWalletId: UserWalletId,
-                currency: CryptoCurrency,
-                transactionId: String? = null,
-                amount: String? = null,
-                tag: String? = null,
-                destinationAddress: String? = null,
-            ) = Send(
-                portfolioId = PortfolioId(userWalletId),
-                currency = currency,
-                transactionId = transactionId,
-                amount = amount,
-                tag = tag,
-                destinationAddress = destinationAddress,
-            )
-        }
-    }
+    )
 
     @Serializable
     data class Details(
@@ -147,8 +121,8 @@ sealed class AppRoute(val path: String) : Route {
     @Serializable
     data class ManageTokens(
         val source: Source,
-        val userWalletId: UserWalletId? = null,
-    ) : AppRoute(path = "${source.name.lowercase()}/manage_tokens/$userWalletId") {
+        val portfolioId: PortfolioId? = null,
+    ) : AppRoute(path = "${source.name.lowercase()}/manage_tokens/${portfolioId?.stringValue}") {
 
         enum class Source {
             STORIES,
@@ -199,51 +173,26 @@ sealed class AppRoute(val path: String) : Route {
     data class Swap(
         val currencyFrom: CryptoCurrency,
         val currencyTo: CryptoCurrency? = null,
-        val portfolioId: PortfolioId,
+        val userWalletId: UserWalletId,
         val isInitialReverseOrder: Boolean = false,
         val screenSource: String,
     ) : AppRoute(
         path = "/swap" +
             "/${currencyFrom.id.value}" +
             "/${currencyTo?.id?.value}" +
-            "/${portfolioId.stringValue}" +
+            "/${userWalletId.stringValue}" +
             "/$isInitialReverseOrder",
-    ) {
-        companion object {
-            operator fun invoke(
-                userWalletId: UserWalletId,
-                currencyFrom: CryptoCurrency,
-                currencyTo: CryptoCurrency? = null,
-                isInitialReverseOrder: Boolean = false,
-                screenSource: String,
-            ) = Swap(
-                portfolioId = PortfolioId(userWalletId),
-                currencyFrom = currencyFrom,
-                currencyTo = currencyTo,
-                isInitialReverseOrder = isInitialReverseOrder,
-                screenSource = screenSource,
-            )
-        }
-    }
+    )
 
     @Serializable
     data object AppCurrencySelector : AppRoute(path = "/app_currency_selector")
 
     @Serializable
     data class Staking(
-        val portfolioId: PortfolioId,
+        val userWalletId: UserWalletId,
         val cryptoCurrencyId: CryptoCurrency.ID,
         val yieldId: String,
-    ) : AppRoute(path = "/staking/${portfolioId.stringValue}/${cryptoCurrencyId.value}/$yieldId") {
-        companion object {
-            operator fun invoke(userWalletId: UserWalletId, cryptoCurrencyId: CryptoCurrency.ID, yieldId: String) =
-                Staking(
-                    portfolioId = PortfolioId(userWalletId),
-                    cryptoCurrencyId = cryptoCurrencyId,
-                    yieldId = yieldId,
-                )
-        }
-    }
+    ) : AppRoute(path = "/staking/${userWalletId.stringValue}/${cryptoCurrencyId.value}/$yieldId")
 
     @Serializable
     data class PushNotification(
@@ -287,25 +236,11 @@ sealed class AppRoute(val path: String) : Route {
     @Serializable
     data class Onramp(
         val source: OnrampSource,
-        val portfolioId: PortfolioId,
+        val userWalletId: UserWalletId,
         val currency: CryptoCurrency,
         val shouldLaunchSepa: Boolean = false,
-    ) : AppRoute(path = "/onramp/${portfolioId.stringValue}/${currency.symbol}"), RouteBundleParams {
+    ) : AppRoute(path = "/onramp/${userWalletId.stringValue}/${currency.symbol}"), RouteBundleParams {
         override fun getBundle(): Bundle = bundle(serializer())
-
-        companion object {
-            operator fun invoke(
-                source: OnrampSource,
-                userWalletId: UserWalletId,
-                currency: CryptoCurrency,
-                launchSepa: Boolean = false,
-            ) = Onramp(
-                source = source,
-                portfolioId = PortfolioId(userWalletId),
-                currency = currency,
-                shouldLaunchSepa = launchSepa,
-            )
-        }
     }
 
     @Serializable

common/ui/src/main/java/com/tangem/common/ui/account/AccountLabel.kt

@@ -0,0 +1,53 @@
+package com.tangem.common.ui.account
+
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Row
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.unit.dp
+import com.tangem.core.ui.components.account.AccountIconSize
+import com.tangem.core.ui.extensions.TextReference
+import com.tangem.core.ui.extensions.resolveReference
+import com.tangem.core.ui.res.TangemTheme
+
+/**
+ * Displays account name with icon
+ *
+ * @param name account name
+ * @param icon portfolio account icon model
+ * @param iconSize portfolio account icon size
+ * @param nameStyle account name style
+ * @param nameColor account name color
+ * @see AccountIcon
+ */
+@Composable
+fun AccountLabel(
+    name: TextReference,
+    icon: CryptoPortfolioIconUM,
+    iconSize: AccountIconSize,
+    modifier: Modifier = Modifier,
+    nameStyle: TextStyle = TangemTheme.typography.subtitle2,
+    nameColor: Color = TangemTheme.colors.text.tertiary,
+) {
+    Row(
+        modifier = modifier,
+        verticalAlignment = Alignment.CenterVertically,
+        horizontalArrangement = Arrangement.spacedBy(4.dp),
+    ) {
+        AccountIcon(
+            name = name,
+            icon = icon,
+            size = iconSize,
+        )
+        Text(
+            text = name.resolveReference(),
+            style = nameStyle,
+            color = nameColor,
+            maxLines = 1,
+        )
+    }
+}

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

@@ -13,21 +13,17 @@ import androidx.compose.ui.unit.dp
 import com.tangem.common.ui.amountScreen.models.AmountState
 import com.tangem.common.ui.amountScreen.preview.AmountScreenClickIntentsStub
 import com.tangem.common.ui.amountScreen.preview.AmountStatePreviewData
-import com.tangem.common.ui.amountScreen.ui.amountField
 import com.tangem.common.ui.amountScreen.ui.amountFieldV2
-import com.tangem.common.ui.amountScreen.ui.buttons
 import com.tangem.core.ui.res.TangemThemePreview
 
 /**
  * Amount screen with field
  * @param amountState amount state
- * @param isBalanceHidden flag hidden balances
  * @param clickIntents amount screen clicks
  */
 @Composable
 fun AmountScreenContent(
     amountState: AmountState,
-    isBalanceHidden: Boolean,
     clickIntents: AmountScreenClickIntents,
     modifier: Modifier = Modifier,
     extraContent: (@Composable () -> Unit)? = null,
@@ -38,32 +34,17 @@ fun AmountScreenContent(
             .padding(horizontal = 16.dp),
         verticalArrangement = Arrangement.spacedBy(12.dp),
     ) {
-        if (amountState.isRedesignEnabled) {
-            amountFieldV2(
-                amountState = amountState,
-                onValueChange = clickIntents::onAmountValueChange,
-                onValuePastedTriggerDismiss = clickIntents::onAmountPasteTriggerDismiss,
-                onCurrencyChange = clickIntents::onCurrencyChangeClick,
-                onMaxAmountClick = clickIntents::onMaxValueClick,
-            )
-            if (extraContent != null) {
-                item("EXTRA_CONTENT_KEY") {
-                    extraContent()
-                }
+        amountFieldV2(
+            amountState = amountState,
+            onValueChange = clickIntents::onAmountValueChange,
+            onValuePastedTriggerDismiss = clickIntents::onAmountPasteTriggerDismiss,
+            onCurrencyChange = clickIntents::onCurrencyChangeClick,
+            onMaxAmountClick = clickIntents::onMaxValueClick,
+        )
+        if (extraContent != null) {
+            item("EXTRA_CONTENT_KEY") {
+                extraContent()
             }
-        } else if (amountState is AmountState.Data) {
-            amountField(
-                amountState = amountState,
-                isBalanceHidden = isBalanceHidden,
-                onValueChange = clickIntents::onAmountValueChange,
-                onValuePastedTriggerDismiss = clickIntents::onAmountPasteTriggerDismiss,
-            )
-            buttons(
-                segmentedButtonConfig = amountState.segmentedButtonConfig,
-                clickIntents = clickIntents,
-                isSegmentedButtonsEnabled = amountState.isSegmentedButtonsEnabled,
-                selectedButton = amountState.selectedButton,
-            )
         }
     }
 }
@@ -78,7 +59,6 @@ private fun SendAmountContentPreview(
     TangemThemePreview {
         AmountScreenContent(
             amountState = amountState,
-            isBalanceHidden = false,
             clickIntents = AmountScreenClickIntentsStub,
         )
     }

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

@@ -38,7 +38,6 @@ class AmountCurrencyTransformer(
                         keyboardType = KeyboardType.Number,
                     ),
                 ),
-                selectedButton = prevState.segmentedButtonConfig.indexOfFirst { it.isFiat == value },
             )
         }
     }

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

@@ -70,10 +70,9 @@ class AmountReduceByTransformer(
                 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),

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

@@ -64,10 +64,9 @@ class AmountReduceToTransformer(
                 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),

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

@@ -1,104 +1,35 @@
 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
 import com.tangem.common.ui.amountScreen.models.EnterAmountBoundary
 import com.tangem.core.ui.components.currency.icon.converter.CryptoCurrencyToIconStateConverter
-import com.tangem.core.ui.extensions.*
+import com.tangem.core.ui.extensions.TextReference
+import com.tangem.core.ui.extensions.combinedReference
+import com.tangem.core.ui.extensions.orMaskWithStars
+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.domain.appcurrency.model.AppCurrency
 import com.tangem.domain.models.currency.CryptoCurrencyStatus
-import com.tangem.utils.Provider
 import com.tangem.utils.StringsSigns.DOT
 import com.tangem.utils.converter.Converter
-import com.tangem.utils.isNullOrZero
-import kotlinx.collections.immutable.persistentListOf
-
-/**
- * Converts initial [String] to [AmountState]
- *
- * @property clickIntents amount screen clicks
- * @property appCurrencyProvider selected app currency provider
- * @property maxEnterAmount max enter amount data
- * @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>,
-    private val cryptoCurrencyStatusProvider: Provider<CryptoCurrencyStatus>,
-    private val maxEnterAmount: EnterAmountBoundary,
-    private val iconStateConverter: CryptoCurrencyToIconStateConverter,
-) : Converter<AmountParameters, AmountState> {
-
-    private val amountFieldConverter by lazy(LazyThreadSafetyMode.NONE) {
-        AmountFieldConverter(
-            clickIntents = clickIntents,
-            cryptoCurrencyStatusProvider = cryptoCurrencyStatusProvider,
-            appCurrencyProvider = appCurrencyProvider,
-        )
-    }
-
-    override fun convert(value: AmountParameters): AmountState {
-        val appCurrency = appCurrencyProvider()
-        val status = cryptoCurrencyStatusProvider()
-        val fiat = maxEnterAmount.fiatAmount.format { fiat(appCurrency.code, appCurrency.symbol) }
-        val crypto = maxEnterAmount.amount.format { crypto(status.currency) }
-        val hasNoFeeRate = status.value.fiatRate.isNullOrZero()
-
-        return AmountState.Data(
-            title = value.title,
-            availableBalance = resourceReference(R.string.common_crypto_fiat_format, wrappedList(crypto, fiat)),
-            availableBalanceCrypto = stringReference(crypto),
-            availableBalanceFiat = stringReference(fiat),
-            tokenName = stringReference(status.currency.name),
-            tokenIconState = iconStateConverter.convert(status),
-            amountTextField = amountFieldConverter.convert(value.value),
-            isPrimaryButtonEnabled = false,
-            appCurrency = appCurrency,
-            segmentedButtonConfig = persistentListOf(
-                AmountSegmentedButtonsConfig(
-                    title = stringReference(status.currency.symbol),
-                    iconState = iconStateConverter.convertCustom(
-                        value = status,
-                        forceGrayscale = hasNoFeeRate,
-                        showCustomTokenBadge = false,
-                    ),
-                    isFiat = false,
-                ),
-                AmountSegmentedButtonsConfig(
-                    title = stringReference(appCurrency.code),
-                    iconUrl = appCurrency.iconSmallUrl,
-                    isFiat = true,
-                ),
-            ),
-            isSegmentedButtonsEnabled = !hasNoFeeRate,
-            selectedButton = 0,
-            isRedesignEnabled = false,
-        )
-    }
-}
 
 /**
  * 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 maxEnterAmount max enter amount data
  * @property iconStateConverter currency icon converter
  * @property isBalanceHidden is balance hidden status
  */
 @Suppress("LongParameterList")
-class AmountStateConverterV2(
+class AmountStateConverter(
     private val clickIntents: AmountScreenClickIntents,
     private val appCurrency: AppCurrency,
     private val cryptoCurrencyStatus: CryptoCurrencyStatus,
@@ -108,7 +39,7 @@ class AmountStateConverterV2(
 ) : Converter<AmountParameters, AmountState> {
 
     private val amountFieldConverter by lazy(LazyThreadSafetyMode.NONE) {
-        AmountFieldConverterV2(
+        AmountFieldConverter(
             clickIntents = clickIntents,
             cryptoCurrencyStatus = cryptoCurrencyStatus,
             appCurrency = appCurrency,
@@ -118,19 +49,13 @@ class AmountStateConverterV2(
     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()
 
         if (cryptoCurrencyStatus.value is CryptoCurrencyStatus.Loading) {
-            return AmountState.Empty(isRedesignEnabled = true)
+            return AmountState.Empty
         }
 
         return AmountState.Data(
             title = value.title,
-            availableBalance = combinedReference(
-                stringReference(crypto),
-                stringReference(" $DOT "),
-                stringReference(fiat),
-            ).orMaskWithStars(isBalanceHidden),
             availableBalanceCrypto = stringReference(crypto).orMaskWithStars(isBalanceHidden),
             availableBalanceFiat = if (isBalanceHidden) {
                 TextReference.EMPTY
@@ -145,25 +70,6 @@ class AmountStateConverterV2(
             amountTextField = amountFieldConverter.convert(value.value),
             isPrimaryButtonEnabled = false,
             appCurrency = appCurrency,
-            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,
-            isRedesignEnabled = true,
         )
     }
 }

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

@@ -2,7 +2,10 @@ package com.tangem.common.ui.amountScreen.converters.field
 
 import com.tangem.common.ui.amountScreen.models.AmountState
 import com.tangem.common.ui.amountScreen.models.EnterAmountBoundary
-import com.tangem.core.ui.extensions.*
+import com.tangem.core.ui.extensions.TextReference
+import com.tangem.core.ui.extensions.combinedReference
+import com.tangem.core.ui.extensions.orMaskWithStars
+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
@@ -32,14 +35,7 @@ class AmountBoundaryUpdateTransformer(
         val fiat = maxEnterAmount.fiatAmount.format { fiat(appCurrency.code, appCurrency.symbol) }
         val crypto = maxEnterAmount.amount.format { crypto(cryptoCurrencyStatus.currency) }
 
-        val availableBalance = combinedReference(
-            stringReference(crypto),
-            stringReference(" $DOT "),
-            stringReference(fiat),
-        )
-
         return prevState.copy(
-            availableBalance = availableBalance.orMaskWithStars(isBalanceHidden),
             availableBalanceCrypto = stringReference(crypto).orMaskWithStars(isBalanceHidden),
             availableBalanceFiat = if (isBalanceHidden) {
                 TextReference.EMPTY

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

@@ -13,75 +13,10 @@ import com.tangem.domain.models.currency.CryptoCurrencyStatus
 import com.tangem.domain.tokens.model.Amount
 import com.tangem.domain.tokens.model.AmountType
 import com.tangem.domain.tokens.model.convertToAmount
-import com.tangem.utils.Provider
 import com.tangem.utils.converter.Converter
 import com.tangem.utils.isNullOrZero
 import java.math.BigDecimal
 
-/**
- * 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>,
-    private val appCurrencyProvider: Provider<AppCurrency>,
-) : Converter<String, AmountFieldModel> {
-
-    override fun convert(value: String): AmountFieldModel {
-        val cryptoCurrencyStatus = cryptoCurrencyStatusProvider()
-        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, appCurrencyProvider()),
-            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
-    }
-}
-
 /**
  * Converts initial [String] to [AmountFieldModel]
  *
@@ -89,7 +24,7 @@ class AmountFieldConverter(
  * @property appCurrency selected app currency
  * @property cryptoCurrencyStatus current cryptocurrency status
  */
-class AmountFieldConverterV2(
+class AmountFieldConverter(
     private val clickIntents: AmountScreenClickIntents,
     private val cryptoCurrencyStatus: CryptoCurrencyStatus,
     private val appCurrency: AppCurrency,

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

@@ -54,7 +54,7 @@ class AmountFieldSetMaxAmountTransformer(
                 isError = isLessThanMinimumIfProvided,
                 error = when {
                     isLessThanMinimumIfProvided -> {
-                        val minimumAmount = minAmount?.amount.format { crypto(cryptoCurrencyStatus.currency) }
+                        val minimumAmount = minAmount.amount.format { crypto(cryptoCurrencyStatus.currency) }
                         resourceReference(
                             R.string.transfer_notification_invalid_minimum_transaction_amount_text,
                             wrappedList(minimumAmount, minimumAmount),

common/ui/src/main/java/com/tangem/common/ui/amountScreen/models/AmountSegmentedButtonsConfig.kt

@@ -1,21 +0,0 @@
-package com.tangem.common.ui.amountScreen.models
-
-import androidx.compose.runtime.Immutable
-import com.tangem.core.ui.components.currency.icon.CurrencyIconState
-import com.tangem.core.ui.extensions.TextReference
-
-/**
- * Segmented buttons config
- *
- * @param title button title
- * @param iconState currency icon state
- * @param iconUrl currency icon url
- * @param isFiat is fiat currency
- */
-@Immutable
-data class AmountSegmentedButtonsConfig(
-    val title: TextReference,
-    val iconState: CurrencyIconState? = null,
-    val iconUrl: String? = null,
-    val isFiat: Boolean,
-)

common/ui/src/main/java/com/tangem/common/ui/amountScreen/models/AmountState.kt

@@ -4,7 +4,6 @@ import androidx.compose.runtime.Stable
 import com.tangem.core.ui.components.currency.icon.CurrencyIconState
 import com.tangem.core.ui.extensions.TextReference
 import com.tangem.domain.appcurrency.model.AppCurrency
-import kotlinx.collections.immutable.PersistentList
 import java.math.BigDecimal
 
 /** Model for amount state */
@@ -12,18 +11,13 @@ import java.math.BigDecimal
 sealed class AmountState {
 
     abstract val isPrimaryButtonEnabled: Boolean
-    abstract val isRedesignEnabled: Boolean
 
     /**
      * @param isPrimaryButtonEnabled indicates if next state button enabled
      * @param title title
-     * @param availableBalance user crypto currency balance with fiat balance
      * @param availableBalanceCrypto user crypto currency balance in crypto
      * @param availableBalanceFiat user crypto currency balance in fiat
      * @param tokenIconState crypto currency icon state
-     * @param segmentedButtonConfig currency switcher config
-     * @param selectedButton selected currency index
-     * @param isSegmentedButtonsEnabled indicates if currency switches is enabled
      * @param amountTextField amount field state
      * @param appCurrency app currency
      * @param isEditingDisabled indicated whether amount is editable
@@ -32,17 +26,11 @@ sealed class AmountState {
      */
     data class Data(
         override val isPrimaryButtonEnabled: Boolean,
-        override val isRedesignEnabled: Boolean,
         val title: TextReference,
-        @Deprecated("Remove with SEND_REDESIGNED toggle")
-        val availableBalance: TextReference,
         val availableBalanceCrypto: TextReference,
         val availableBalanceFiat: TextReference,
         val tokenName: TextReference,
         val tokenIconState: CurrencyIconState,
-        val segmentedButtonConfig: PersistentList<AmountSegmentedButtonsConfig>,
-        val selectedButton: Int,
-        val isSegmentedButtonsEnabled: Boolean,
         val amountTextField: AmountFieldModel,
         val appCurrency: AppCurrency,
         val isEditingDisabled: Boolean = false,
@@ -50,8 +38,7 @@ sealed class AmountState {
         val isIgnoreReduce: Boolean = false,
     ) : AmountState()
 
-    data class Empty(
-        override val isPrimaryButtonEnabled: Boolean = false,
-        override val isRedesignEnabled: Boolean,
-    ) : AmountState()
+    data object Empty : AmountState() {
+        override val isPrimaryButtonEnabled: Boolean = false
+    }
 }

common/ui/src/main/java/com/tangem/common/ui/amountScreen/preview/AmountStatePreviewData.kt

@@ -3,7 +3,6 @@ package com.tangem.common.ui.amountScreen.preview
 import androidx.compose.foundation.text.KeyboardActions
 import androidx.compose.foundation.text.KeyboardOptions
 import com.tangem.common.ui.amountScreen.models.AmountFieldModel
-import com.tangem.common.ui.amountScreen.models.AmountSegmentedButtonsConfig
 import com.tangem.common.ui.amountScreen.models.AmountState
 import com.tangem.core.ui.components.currency.icon.CurrencyIconState
 import com.tangem.core.ui.extensions.TextReference
@@ -12,31 +11,18 @@ import com.tangem.domain.appcurrency.model.AppCurrency
 import com.tangem.domain.tokens.model.Amount
 import com.tangem.domain.tokens.model.AmountType
 import com.tangem.utils.StringsSigns
-import kotlinx.collections.immutable.persistentListOf
 import java.math.BigDecimal
 
 object AmountStatePreviewData {
 
-    val emptyState = AmountState.Empty(isRedesignEnabled = true)
+    val emptyState = AmountState.Empty
 
     val amountState = AmountState.Data(
         isPrimaryButtonEnabled = false,
         title = stringReference("Family Wallet"),
-        availableBalance = stringReference("2 130,81231238 USDT • 2 129,12 \$)"),
         availableBalanceCrypto = stringReference("2 130,81231238 USDT"),
         availableBalanceFiat = stringReference("1 232 129,12 \$"),
         tokenIconState = CurrencyIconState.Loading,
-        segmentedButtonConfig = persistentListOf(
-            AmountSegmentedButtonsConfig(
-                title = stringReference("USDT"),
-                iconState = CurrencyIconState.Locked,
-                isFiat = false,
-            ),
-            AmountSegmentedButtonsConfig(
-                title = stringReference("USD"),
-                isFiat = true,
-            ),
-        ),
         appCurrency = AppCurrency.Default,
         tokenName = stringReference("Tether"),
         amountTextField = AmountFieldModel(
@@ -65,12 +51,9 @@ object AmountStatePreviewData {
             isValuePasted = false,
             onValuePastedTriggerDismiss = {},
         ),
-        isSegmentedButtonsEnabled = true,
-        selectedButton = 0,
-        isRedesignEnabled = false,
     )
 
-    val amountWithValueState = amountState.copy(
+    private val amountWithValueState = amountState.copy(
         amountTextField = amountState.amountTextField.copy(
             value = "100.00",
             cryptoAmount = amountState.amountTextField.cryptoAmount.copy(
@@ -84,16 +67,10 @@ object AmountStatePreviewData {
     )
 
     val amountStateV2 = amountState.copy(
-        isRedesignEnabled = true,
-        availableBalance = stringReference("2 130,81231238 USDT • 2 129,12 \$)"),
         availableBalanceCrypto = stringReference("2 130,81231238 USDT"),
         availableBalanceFiat = stringReference(" ${StringsSigns.DOT} 1 232 129,12 $"),
     )
 
-    val amountWithValueFiatState = amountWithValueState.copy(
-        amountTextField = amountWithValueState.amountTextField.copy(isFiatValue = false),
-    )
-
     val amountStateV2WithoutRates = amountState.copy(
         amountTextField = amountState.amountTextField.copy(
             fiatAmount = amountState.amountTextField.fiatAmount.copy(

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

@@ -16,10 +16,13 @@ import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
+import androidx.compose.ui.unit.dp
 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.SpacerH
 import com.tangem.core.ui.components.currency.icon.CurrencyIcon
+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
@@ -59,7 +62,16 @@ fun AmountBlock(amountState: AmountState, isClickDisabled: Boolean, isEditingDis
             .clickable(enabled = !isClickDisabled && !isEditingDisabled, onClick = onClick)
             .padding(TangemTheme.dimens.spacing16),
     ) {
-        CurrencyIcon(state = amountState.tokenIconState)
+        Text(
+            text = amountState.title.resolveReference(),
+            style = TangemTheme.typography.subtitle2,
+            color = TangemTheme.colors.text.tertiary,
+        )
+        SpacerH(20.dp)
+        CurrencyIcon(
+            state = amountState.tokenIconState,
+            iconSize = 40.dp,
+        )
         ResizableText(
             text = firstAmount,
             style = TangemTheme.typography.h2,

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

@@ -1,126 +0,0 @@
-package com.tangem.common.ui.amountScreen.ui
-
-import androidx.compose.foundation.background
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.lazy.LazyListScope
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
-import androidx.compose.ui.hapticfeedback.HapticFeedbackType
-import androidx.compose.ui.platform.LocalHapticFeedback
-import androidx.compose.ui.platform.testTag
-import com.tangem.common.ui.R
-import com.tangem.common.ui.amountScreen.AmountScreenClickIntents
-import com.tangem.common.ui.amountScreen.models.AmountSegmentedButtonsConfig
-import com.tangem.core.ui.components.SpacerWMax
-import com.tangem.core.ui.components.buttons.segmentedbutton.SegmentedButtons
-import com.tangem.core.ui.components.currency.fiaticon.FiatIcon
-import com.tangem.core.ui.components.currency.icon.CurrencyIcon
-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.test.SendScreenTestTags
-import kotlinx.collections.immutable.PersistentList
-
-private const val AMOUNT_BUTTONS_KEY = "amountButtonsKey"
-
-internal fun LazyListScope.buttons(
-    segmentedButtonConfig: PersistentList<AmountSegmentedButtonsConfig>,
-    clickIntents: AmountScreenClickIntents,
-    isSegmentedButtonsEnabled: Boolean,
-    selectedButton: Int,
-) {
-    item(
-        key = AMOUNT_BUTTONS_KEY,
-    ) {
-        val hapticFeedback = LocalHapticFeedback.current
-        Row {
-            if (segmentedButtonConfig.isNotEmpty()) {
-                SegmentedButtons(
-                    modifier = Modifier
-                        .weight(1f)
-                        .height(TangemTheme.dimens.size40),
-                    config = segmentedButtonConfig,
-                    showIndication = false,
-                    onClick = {
-                        hapticFeedback.performHapticFeedback(HapticFeedbackType.LongPress)
-                        clickIntents.onCurrencyChangeClick(it.isFiat)
-                    },
-                    initialSelectedItem = segmentedButtonConfig.getOrNull(selectedButton),
-                    isEnabled = isSegmentedButtonsEnabled,
-                ) {
-                    AmountCurrencyButton(
-                        button = it,
-                        isSegmentedButtonsEnabled = isSegmentedButtonsEnabled,
-                    )
-                }
-            } else {
-                SpacerWMax()
-            }
-            Text(
-                text = stringResourceSafe(R.string.send_max_amount),
-                style = TangemTheme.typography.button,
-                color = TangemTheme.colors.text.primary1,
-                modifier = Modifier
-                    .padding(start = TangemTheme.dimens.spacing8)
-                    .height(TangemTheme.dimens.size40)
-                    .clip(shape = RoundedCornerShape(TangemTheme.dimens.radius26))
-                    .background(TangemTheme.colors.button.secondary)
-                    .clickable {
-                        hapticFeedback.performHapticFeedback(HapticFeedbackType.LongPress)
-                        clickIntents.onMaxValueClick()
-                    }
-                    .padding(
-                        vertical = TangemTheme.dimens.spacing10,
-                        horizontal = TangemTheme.dimens.spacing34,
-                    )
-                    .testTag(SendScreenTestTags.MAX_BUTTON),
-            )
-        }
-    }
-}
-
-@Composable
-private fun AmountCurrencyButton(button: AmountSegmentedButtonsConfig, isSegmentedButtonsEnabled: Boolean) {
-    Row(
-        modifier = Modifier
-            .fillMaxSize()
-            .padding(
-                horizontal = TangemTheme.dimens.spacing10,
-            )
-            .testTag(SendScreenTestTags.CURRENCY_BUTTON),
-        horizontalArrangement = Arrangement.Center,
-        verticalAlignment = Alignment.CenterVertically,
-    ) {
-        val iconModifier = Modifier
-            .size(TangemTheme.dimens.size18)
-            .padding(horizontal = TangemTheme.dimens.spacing1)
-        if (button.isFiat) {
-            FiatIcon(
-                url = button.iconUrl,
-                size = TangemTheme.dimens.size18,
-                isGrayscale = !isSegmentedButtonsEnabled,
-                modifier = iconModifier.testTag(SendScreenTestTags.FIAT_ICON),
-            )
-        } else if (button.iconState != null) {
-            CurrencyIcon(
-                state = button.iconState,
-                shouldDisplayNetwork = false,
-                modifier = iconModifier.testTag(SendScreenTestTags.CURRENCY_ICON),
-            )
-        }
-        Text(
-            text = button.title.resolveReference(),
-            color = TangemTheme.colors.text.primary1,
-            style = TangemTheme.typography.button,
-            modifier = Modifier
-                .padding(
-                    start = TangemTheme.dimens.spacing8,
-                ),
-        )
-    }
-}

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

@@ -1,160 +0,0 @@
-package com.tangem.common.ui.amountScreen.ui
-
-import androidx.compose.animation.AnimatedVisibility
-import androidx.compose.animation.animateContentSize
-import androidx.compose.animation.fadeIn
-import androidx.compose.animation.fadeOut
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.requiredHeightIn
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.remember
-import androidx.compose.ui.Alignment.Companion.BottomCenter
-import androidx.compose.ui.Alignment.Companion.TopCenter
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.focus.FocusRequester
-import androidx.compose.ui.focus.focusRequester
-import androidx.compose.ui.platform.testTag
-import androidx.compose.ui.text.style.TextAlign
-import androidx.compose.ui.text.style.TextDirection
-import com.tangem.common.ui.amountScreen.models.AmountFieldModel
-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.fiat
-import com.tangem.core.ui.format.bigdecimal.format
-import com.tangem.core.ui.res.TangemTheme
-import com.tangem.core.ui.test.SendScreenTestTags
-import com.tangem.core.ui.utils.rememberDecimalFormat
-import kotlinx.coroutines.delay
-
-@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() }
-    val symbolColor = if (primaryValue.isBlank()) TangemTheme.colors.text.disabled else TangemTheme.colors.text.primary1
-    AmountTextField(
-        value = primaryValue,
-        decimals = primaryAmount.decimals,
-        visualTransformation = AmountVisualTransformation(
-            decimals = primaryAmount.decimals,
-            symbol = primaryAmount.currencySymbol,
-            currencyCode = currencyCode,
-            decimalFormat = decimalFormat,
-            symbolColor = symbolColor,
-        ),
-        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
-    Box(
-        modifier = Modifier
-            .fillMaxWidth()
-            .animateContentSize()
-            .padding(
-                top = TangemTheme.dimens.spacing8,
-                start = TangemTheme.dimens.spacing12,
-                end = TangemTheme.dimens.spacing12,
-            ),
-    ) {
-        val text = if (amountField.isFiatValue) {
-            secondaryAmount.value.format { crypto(secondaryAmount.currencySymbol, secondaryAmount.decimals) }
-        } else {
-            secondaryAmount.value.format {
-                fiat(
-                    fiatCurrencySymbol = secondaryAmount.currencySymbol,
-                    fiatCurrencyCode = appCurrencyCode,
-                )
-            }
-        }
-        Text(
-            text = text,
-            style = TangemTheme.typography.caption2.copy(textDirection = TextDirection.ContentOrLtr),
-            color = TangemTheme.colors.text.tertiary,
-            textAlign = TextAlign.Center,
-            modifier = Modifier
-                .align(TopCenter)
-                .padding(bottom = TangemTheme.dimens.spacing32)
-                .testTag(SendScreenTestTags.SECONDARY_AMOUNT),
-        )
-        AmountFieldError(
-            isError = amountField.isError,
-            isWarning = amountField.isWarning,
-            error = amountField.error,
-            modifier = Modifier
-                .align(BottomCenter)
-                .padding(
-                    top = TangemTheme.dimens.spacing20,
-                    bottom = TangemTheme.dimens.spacing12,
-                ),
-        )
-    }
-}
-
-@Composable
-private fun AmountFieldError(
-    isError: Boolean,
-    isWarning: Boolean,
-    error: TextReference,
-    modifier: Modifier = Modifier,
-) {
-    AnimatedVisibility(
-        visible = isError || isWarning,
-        enter = fadeIn(),
-        exit = fadeOut(),
-        modifier = modifier,
-    ) {
-        val errorText = remember(this, error) { error }
-        val color = if (isError) TangemTheme.colors.text.warning else TangemTheme.colors.text.attention
-        Text(
-            text = errorText.resolveReference(),
-            style = TangemTheme.typography.caption2,
-            color = color,
-            textAlign = TextAlign.Center,
-        )
-    }
-}

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

@@ -15,8 +15,6 @@ import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
-import androidx.compose.ui.platform.testTag
-import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import com.tangem.common.ui.R
 import com.tangem.common.ui.amountScreen.models.AmountState
@@ -25,68 +23,12 @@ import com.tangem.core.ui.components.atoms.text.EllipsisText
 import com.tangem.core.ui.components.atoms.text.TextEllipsis
 import com.tangem.core.ui.components.currency.icon.CurrencyIcon
 import com.tangem.core.ui.components.currency.icon.CurrencyIconState
-import com.tangem.core.ui.extensions.orMaskWithStars
 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.test.SendScreenTestTags
 
 private const val AMOUNT_FIELD_KEY = "amountFieldKey"
 
-internal fun LazyListScope.amountField(
-    amountState: AmountState.Data,
-    isBalanceHidden: Boolean,
-    modifier: Modifier = Modifier,
-    onValueChange: (String) -> Unit,
-    onValuePastedTriggerDismiss: () -> Unit,
-) {
-    item(key = AMOUNT_FIELD_KEY) {
-        Column(
-            horizontalAlignment = Alignment.CenterHorizontally,
-            modifier = modifier
-                .fillMaxWidth()
-                .clip(RoundedCornerShape(TangemTheme.dimens.radius16))
-                .background(TangemTheme.colors.background.action),
-        ) {
-            Text(
-                text = amountState.title.resolveReference(),
-                style = TangemTheme.typography.subtitle2,
-                color = TangemTheme.colors.text.tertiary,
-                modifier = Modifier
-                    .padding(top = TangemTheme.dimens.spacing14)
-                    .testTag(SendScreenTestTags.AMOUNT_CONTAINER_TITLE),
-            )
-
-            val balance = amountState.availableBalance.orMaskWithStars(isBalanceHidden).resolveReference()
-            AnimatedContent(
-                targetState = balance,
-                label = "Hide Balance Animation",
-            ) {
-                Text(
-                    text = it,
-                    style = TangemTheme.typography.caption2,
-                    color = TangemTheme.colors.text.tertiary,
-                    textAlign = TextAlign.Center,
-                    modifier = Modifier
-                        .padding(top = TangemTheme.dimens.spacing2)
-                        .testTag(SendScreenTestTags.AMOUNT_CONTAINER_TEXT),
-                )
-            }
-            CurrencyIcon(
-                state = amountState.tokenIconState,
-                modifier = Modifier
-                    .padding(top = TangemTheme.dimens.spacing32),
-            )
-            AmountField(
-                amountField = amountState.amountTextField,
-                appCurrencyCode = amountState.appCurrency.code,
-                onValueChange = onValueChange,
-                onValuePastedTriggerDismiss = onValuePastedTriggerDismiss,
-            )
-        }
-    }
-}
-
 internal fun LazyListScope.amountFieldV2(
     amountState: AmountState,
     modifier: Modifier = Modifier,
@@ -183,46 +125,49 @@ private fun AmountInfo(amountUM: AmountState, onMaxAmountClick: () -> Unit, modi
 @Composable
 private fun AmountInfoMain(amountUM: AmountState, modifier: Modifier = Modifier) {
     AnimatedContent(
-        targetState = amountUM !is AmountState.Data,
+        targetState = amountUM,
         modifier = modifier,
-    ) { isContent ->
-        if (isContent) {
-            Column(
-                verticalArrangement = Arrangement.spacedBy(2.dp),
-            ) {
-                TextShimmer(
-                    style = TangemTheme.typography.subtitle2,
-                    modifier = Modifier.width(56.dp),
-                )
-                TextShimmer(
-                    style = TangemTheme.typography.caption2,
-                    modifier = Modifier.width(72.dp),
-                )
-            }
-        } else {
-            val amountUM = amountUM as AmountState.Data
-            Column(
-                verticalArrangement = Arrangement.spacedBy(2.dp),
-            ) {
-                Text(
-                    text = amountUM.tokenName.resolveReference(),
-                    style = TangemTheme.typography.subtitle2,
-                    color = TangemTheme.colors.text.primary1,
-                    maxLines = 1,
-                )
-                Row {
-                    EllipsisText(
-                        text = amountUM.availableBalanceCrypto.resolveReference(),
-                        style = TangemTheme.typography.caption2,
-                        color = TangemTheme.colors.text.tertiary,
-                        ellipsis = TextEllipsis.OffsetEnd(amountUM.amountTextField.cryptoAmount.currencySymbol.length),
-                        modifier = Modifier.weight(1f, fill = false),
+    ) { currentAmount ->
+        Column(
+            verticalArrangement = Arrangement.spacedBy(2.dp),
+        ) {
+            when (currentAmount) {
+                is AmountState.Data -> {
+                    val amountUM = amountUM as AmountState.Data
+                    Text(
+                        text = amountUM.tokenName.resolveReference(),
+                        style = TangemTheme.typography.subtitle2,
+                        color = TangemTheme.colors.text.primary1,
+                        maxLines = 1,
                     )
-                    EllipsisText(
-                        text = amountUM.availableBalanceFiat.resolveReference(),
+                    Row {
+                        EllipsisText(
+                            text = amountUM.availableBalanceCrypto.resolveReference(),
+                            style = TangemTheme.typography.caption2,
+                            color = TangemTheme.colors.text.tertiary,
+                            ellipsis = TextEllipsis.OffsetEnd(
+                                amountUM.amountTextField.cryptoAmount.currencySymbol.length,
+                            ),
+                            modifier = Modifier.weight(1f, fill = false),
+                        )
+                        EllipsisText(
+                            text = amountUM.availableBalanceFiat.resolveReference(),
+                            style = TangemTheme.typography.caption2,
+                            color = TangemTheme.colors.text.tertiary,
+                            ellipsis = TextEllipsis.OffsetEnd(
+                                amountUM.amountTextField.fiatAmount.currencySymbol.length,
+                            ),
+                        )
+                    }
+                }
+                AmountState.Empty -> {
+                    TextShimmer(
+                        style = TangemTheme.typography.subtitle2,
+                        modifier = Modifier.width(56.dp),
+                    )
+                    TextShimmer(
                         style = TangemTheme.typography.caption2,
-                        color = TangemTheme.colors.text.tertiary,
-                        ellipsis = TextEllipsis.OffsetEnd(amountUM.amountTextField.fiatAmount.currencySymbol.length),
+                        modifier = Modifier.width(72.dp),
                     )
                 }
             }

common/ui/src/main/java/com/tangem/common/ui/navigationButtons/NavigationButtonsBlock.kt

@@ -55,7 +55,6 @@ fun NavigationButtonsBlock(
             modifier = Modifier.fillMaxWidth(),
             horizontalArrangement = Arrangement.spacedBy(TangemTheme.dimens.spacing12),
         ) {
-            PreviousButton(state?.prevButton)
             NavigationPrimaryButton(state?.primaryButton, modifier = Modifier.weight(1f))
         }
     }

common/ui/src/main/java/com/tangem/common/ui/navigationButtons/NavigationButtonsState.kt

@@ -8,7 +8,6 @@ sealed class NavigationButtonsState {
 
     data class Data(
         val primaryButton: NavigationButton?,
-        val prevButton: NavigationButton?,
         val extraButtons: Pair<NavigationButton, NavigationButton>?,
         val txUrl: String? = null,
         val onTextClick: (String) -> Unit,

common/ui/src/main/java/com/tangem/common/ui/navigationButtons/preview/NavigationButtonsPreview.kt

@@ -3,7 +3,6 @@ package com.tangem.common.ui.navigationButtons.preview
 import com.tangem.common.ui.R
 import com.tangem.common.ui.navigationButtons.NavigationButton
 import com.tangem.common.ui.navigationButtons.NavigationButtonsState
-import com.tangem.core.ui.extensions.TextReference
 import com.tangem.core.ui.extensions.resourceReference
 
 internal object NavigationButtonsPreview {
@@ -26,16 +25,6 @@ internal object NavigationButtonsPreview {
         onClick = {},
     )
 
-    private val prev = NavigationButton(
-        textReference = TextReference.EMPTY,
-        iconRes = R.drawable.ic_back_24,
-        isSecondary = true,
-        isIconVisible = true,
-        shouldShowProgress = false,
-        isEnabled = true,
-        onClick = {},
-    )
-
     private val finished = NavigationButton(
         textReference = resourceReference(R.string.common_close),
         isSecondary = false,
@@ -47,7 +36,6 @@ internal object NavigationButtonsPreview {
 
     val allButtons = NavigationButtonsState.Data(
         primaryButton = finished,
-        prevButton = prev,
         extraButtons = extraButtons,
         txUrl = "https://tangem.com",
         onTextClick = {},