Updated on 2026-08-14

app/src/main/java/com/tangem/tap/domain/TapErrors.kt

@@ -22,6 +22,10 @@ sealed class TapError(
 
     object UnknownError : TapError(R.string.send_error_unknown)
     open class CustomError(val customMessage: String) : TapError(R.string.common_custom_string, listOf(customMessage))
+    data class UnsupportedState(
+        val stateError: String,
+    ) : TapError(R.string.common_custom_string, listOf("Unsupported state: $stateError"))
+
     object ScanCardError : TapError(R.string.scan_card_error)
     object UnknownBlockchain : TapError(R.string.wallet_error_unsupported_blockchain_subtitle)
     object NoInternetConnection : TapError(R.string.wallet_notification_no_internet)
@@ -38,11 +42,6 @@ sealed class TapError(
     data class DustAmount(override val args: List<Any>) : TapError(R.string.send_error_dust_amount_format)
     object DustChange : TapError(R.string.send_error_dust_change)
 
-    data class UnsupportedState(
-        val stateError: String,
-        val customMessage: String = "Unsupported state:",
-    ) : TapError(R.string.common_custom_string, listOf("$customMessage $stateError"))
-
     sealed class WalletManager {
         object CreationError : CustomError("Can't create wallet manager")
         class NoAccountError(amountToCreateAccount: String) : CustomError(amountToCreateAccount)

app/src/main/java/com/tangem/tap/domain/model/WalletDataModel.kt

@@ -79,6 +79,7 @@ data class WalletDataModel(
 
     data class Unreachable(
         override val errorMessage: String?,
+        override val amount: BigDecimal = BigDecimal.ZERO,
     ) : Status() {
         override val isErrorStatus: Boolean = true
     }

app/src/main/java/com/tangem/tap/domain/walletStores/repository/implementation/utils/WalletDataOperations.kt

@@ -170,7 +170,10 @@ internal fun List<WalletDataModel>.updateWithMissedDerivation(): List<WalletData
 internal fun List<WalletDataModel>.updateWithUnreachable(): List<WalletDataModel> {
     return this.map { walletData ->
         walletData.copy(
-            status = WalletDataModel.Unreachable(errorMessage = null),
+            status = WalletDataModel.Unreachable(
+                errorMessage = null,
+                amount = walletData.status.amount,
+            ),
         )
     }
 }

app/src/main/java/com/tangem/tap/features/customtoken/impl/presentation/ui/components/AddCustomTokenFloatingButton.kt

@@ -5,12 +5,11 @@ import androidx.compose.foundation.layout.imePadding
 import androidx.compose.foundation.layout.padding
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.tooling.preview.datasource.CollectionPreviewParameterProvider
-import com.tangem.core.ui.components.PrimaryButtonIconLeft
+import com.tangem.core.ui.components.PrimaryButtonIconStart
 import com.tangem.core.ui.res.TangemTheme
 import com.tangem.tap.features.customtoken.impl.presentation.models.AddCustomTokenFloatingButton
 import com.tangem.wallet.R
@@ -25,13 +24,13 @@ import com.tangem.wallet.R
  */
 @Composable
 internal fun AddCustomTokenFloatingButton(model: AddCustomTokenFloatingButton, modifier: Modifier = Modifier) {
-    PrimaryButtonIconLeft(
+    PrimaryButtonIconStart(
         modifier = modifier
             .imePadding()
             .padding(horizontal = TangemTheme.dimens.spacing16)
             .fillMaxWidth(),
         text = stringResource(id = R.string.common_add),
-        icon = painterResource(id = R.drawable.ic_plus_24),
+        iconResId = R.drawable.ic_plus_24,
         enabled = model.isEnabled,
         onClick = model.onClick,
     )

app/src/main/java/com/tangem/tap/features/customtoken/legacy/compose/AddCustomTokenScreen.kt

@@ -1,48 +1,21 @@
 package com.tangem.tap.features.customtoken.legacy.compose
 
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.PaddingValues
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.material.BottomSheetScaffold
-import androidx.compose.material.BottomSheetScaffoldState
-import androidx.compose.material.BottomSheetState
-import androidx.compose.material.BottomSheetValue
-import androidx.compose.material.ExperimentalMaterialApi
-import androidx.compose.material.FabPosition
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Scaffold
-import androidx.compose.material.Surface
-import androidx.compose.material.rememberBottomSheetScaffoldState
-import androidx.compose.material.rememberScaffoldState
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.DisposableEffect
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.MutableState
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.material.*
+import androidx.compose.runtime.*
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.colorResource
-import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
-import com.tangem.core.ui.components.PrimaryButtonIconLeft
+import com.tangem.core.ui.components.PrimaryButtonIconStart
 import com.tangem.core.ui.components.keyboardAsState
 import com.tangem.core.ui.res.TangemTheme
 import com.tangem.domain.AddCustomTokenError
 import com.tangem.domain.common.form.DataField
 import com.tangem.domain.common.form.FieldId
-import com.tangem.domain.features.addCustomToken.CustomTokenFieldId.ContractAddress
-import com.tangem.domain.features.addCustomToken.CustomTokenFieldId.Decimals
-import com.tangem.domain.features.addCustomToken.CustomTokenFieldId.DerivationPath
-import com.tangem.domain.features.addCustomToken.CustomTokenFieldId.Name
-import com.tangem.domain.features.addCustomToken.CustomTokenFieldId.Network
-import com.tangem.domain.features.addCustomToken.CustomTokenFieldId.Symbol
+import com.tangem.domain.features.addCustomToken.CustomTokenFieldId.*
 import com.tangem.domain.features.addCustomToken.redux.AddCustomTokenAction
 import com.tangem.domain.features.addCustomToken.redux.AddCustomTokenState
 import com.tangem.domain.features.addCustomToken.redux.ScreenState
@@ -189,12 +162,12 @@ fun Warnings(warnings: List<AddCustomTokenError.Warning>) {
 
 @Composable
 private fun AddButton(state: MutableState<AddCustomTokenState>) {
-    PrimaryButtonIconLeft(
+    PrimaryButtonIconStart(
         modifier = Modifier
             .padding(horizontal = TangemTheme.dimens.spacing16)
             .fillMaxWidth(),
         text = stringResource(id = R.string.common_add),
-        icon = painterResource(id = R.drawable.ic_plus_24),
+        iconResId = R.drawable.ic_plus_24,
         enabled = state.value.screenState.addButton.isEnabled,
         onClick = { domainStore.dispatch(AddCustomTokenAction.OnAddCustomTokenClicked) },
     )

app/src/main/java/com/tangem/tap/features/details/ui/common/DetailsComposeElements.kt

@@ -1,23 +1,9 @@
 package com.tangem.tap.features.details.ui.common
 
 import androidx.activity.compose.BackHandler
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.layout.systemBarsPadding
+import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.selection.selectable
-import androidx.compose.material.Icon
-import androidx.compose.material.IconButton
-import androidx.compose.material.RadioButton
-import androidx.compose.material.RadioButtonDefaults
-import androidx.compose.material.Scaffold
-import androidx.compose.material.Text
-import androidx.compose.material.TopAppBar
+import androidx.compose.material.*
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
@@ -25,7 +11,7 @@ import androidx.compose.ui.res.colorResource
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
-import com.tangem.core.ui.components.PrimaryButtonIconRight
+import com.tangem.core.ui.components.PrimaryButtonIconEnd
 import com.tangem.core.ui.res.TangemTheme
 import com.tangem.wallet.R
 
@@ -110,13 +96,13 @@ fun EmptyTopBarWithNavigation(
 
 @Composable
 fun DetailsMainButton(title: String, onClick: () -> Unit, modifier: Modifier = Modifier, enabled: Boolean = true) {
-    PrimaryButtonIconRight(
+    PrimaryButtonIconEnd(
         text = title,
         enabled = enabled,
         onClick = onClick,
         modifier = modifier
             .fillMaxWidth(),
-        icon = painterResource(id = R.drawable.ic_tangem_24),
+        iconResId = R.drawable.ic_tangem_24,
     )
 }
 

app/src/main/java/com/tangem/tap/features/send/redux/SendScreenAction.kt

@@ -26,9 +26,9 @@ interface SendScreenActionUi : SendScreenAction
 object ReleaseSendState : Action
 
 data class PrepareSendScreen(
+    val walletManager: WalletManager,
     val coinAmount: Amount?,
     val coinRate: BigDecimal?,
-    val walletManager: WalletManager?,
     val tokenAmount: Amount? = null,
     val tokenRate: BigDecimal? = null,
 ) : SendScreenAction

app/src/main/java/com/tangem/tap/features/send/redux/reducers/SendScreenReducer.kt

@@ -85,7 +85,7 @@ private class EmptyReducer : SendInternalReducer {
 private class PrepareSendScreenStatesReducer : SendInternalReducer {
     override fun handle(action: SendScreenAction, sendState: SendState): SendState {
         val prepareAction = action as PrepareSendScreen
-        val walletManager = action.walletManager!!
+        val walletManager = action.walletManager
         val amountToExtract = prepareAction.tokenAmount ?: prepareAction.coinAmount!!
         val decimals = amountToExtract.decimals
         val feePaidInNetworkCurrency = isFeePaidInNetworkCurrency(walletManager.wallet.blockchain)

app/src/main/java/com/tangem/tap/features/wallet/redux/WalletAction.kt

@@ -98,7 +98,7 @@ sealed class WalletAction : Action {
             val swapAllowed: Boolean,
         ) : DialogAction()
 
-        data class ChooseCurrency(val amounts: List<Amount>?) : DialogAction()
+        data class ChooseCurrency(val amounts: List<Amount>) : DialogAction()
         data class RussianCardholdersWarningDialog(
             val dialogData: WalletDialog.RussianCardholdersWarningDialog.Data? = null,
         ) : DialogAction()

app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/TradeCryptoMiddleware.kt

@@ -1,6 +1,7 @@
 package com.tangem.tap.features.wallet.redux.middlewares
 
 import androidx.core.os.bundleOf
+import com.google.firebase.crashlytics.FirebaseCrashlytics
 import com.tangem.blockchain.blockchains.ethereum.EthereumWalletManager
 import com.tangem.blockchain.common.AmountType
 import com.tangem.common.extensions.guard
@@ -129,13 +130,16 @@ class TradeCryptoMiddleware {
         val selectedWalletData = store.state.walletState.selectedWalletData ?: return
 
         Analytics.send(Token.ButtonSend(AnalyticsParam.CurrencyType.Currency(selectedWalletData.currency)))
+        val walletManager = store.state.walletState.getWalletManager(selectedWalletData.currency).guard {
+            FirebaseCrashlytics.getInstance().recordException(IllegalStateException("WalletManager is null"))
+            return
+        }
 
-        val walletManager = store.state.walletState.getWalletManager(selectedWalletData.currency)
         store.dispatchOnMain(
             PrepareSendScreen(
-                coinAmount = walletManager?.wallet?.amounts?.get(AmountType.Coin),
-                coinRate = selectedWalletData.fiatRate,
                 walletManager = walletManager,
+                coinAmount = walletManager.wallet.amounts[AmountType.Coin],
+                coinRate = selectedWalletData.fiatRate,
             ),
         )
         store.dispatchOnMain(

app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/WalletDialogsMiddleware.kt

@@ -37,6 +37,8 @@ class WalletDialogsMiddleware {
                 )
             }
             is WalletAction.DialogAction.ChooseCurrency -> {
+                if (action.amounts.isEmpty()) return
+
                 store.dispatchDialogShow(
                     WalletDialog.SelectAmountToSendDialog(
                         amounts = action.amounts,

app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/WalletMiddleware.kt

@@ -3,6 +3,7 @@ package com.tangem.tap.features.wallet.redux.middlewares
 import com.google.firebase.crashlytics.FirebaseCrashlytics
 import com.tangem.blockchain.common.Amount
 import com.tangem.blockchain.common.AmountType
+import com.tangem.blockchain.common.WalletManager
 import com.tangem.blockchain.common.address.AddressType
 import com.tangem.common.CompletionResult
 import com.tangem.common.doOnSuccess
@@ -32,7 +33,6 @@ import com.tangem.tap.features.wallet.redux.WalletAction
 import com.tangem.tap.features.wallet.redux.WalletState
 import com.tangem.tap.proxy.redux.DaggerGraphState
 import com.tangem.utils.coroutines.ifActive
-import com.tangem.wallet.R
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.delay
@@ -147,26 +147,76 @@ class WalletMiddleware {
                 store.dispatchOpenUrl(action.exploreUrl)
             }
             is WalletAction.Send -> {
+                val walletStore = walletState.getWalletStore(walletState.selectedCurrency)
+                val selectedWalletData = walletState.selectedWalletData
+                val walletManager = walletStore?.walletManager
+
+                if (walletStore == null || walletManager == null || selectedWalletData == null) {
+                    val error = TapError.UnsupportedState(
+                        "WalletAction.Send: walletStore or selectedWalletData or walletManager is null",
+                    )
+                    FirebaseCrashlytics.getInstance().recordException(IllegalStateException(error.stateError))
+                    store.dispatchErrorNotification(error)
+                    return
+                }
                 if (!networkConnectionManager.isOnline) {
                     store.dispatchErrorNotification(TapError.NoInternetConnection)
                     return
                 }
-                val newAction = prepareSendAction(action.amount, store.state.walletState)
-                if (newAction is PrepareSendScreen && newAction.walletManager == null) {
-                    store.dispatch(NavigationAction.PopBackTo(screen = AppScreen.Home))
-                    FirebaseCrashlytics.getInstance().recordException(
-                        IllegalStateException("PrepareSendScreen: walletManager is null"),
-                    )
-                    store.dispatchToastNotification(R.string.internal_error_wallet_manager_not_found)
-                } else {
-                    store.dispatch(newAction)
-                    if (newAction is PrepareSendScreen) {
-                        store.state.walletState.selectedWalletData?.currency?.let { currency ->
-                            Analytics.send(Token.ButtonSend(AnalyticsParam.CurrencyType.Currency(currency)))
-                        }
-                        store.dispatch(NavigationAction.NavigateTo(AppScreen.Send))
+
+                val currency = selectedWalletData.currency
+                val initSendStateAction = if (action.amount == null) {
+                    val sendableAmounts = walletManager.wallet.getSendableAmounts()
+                    if (sendableAmounts.isEmpty()) {
+                        val error = TapError.UnsupportedState("WalletAction.Send: Nothing to send")
+                        FirebaseCrashlytics.getInstance().recordException(IllegalStateException(error.stateError))
+                        store.dispatchErrorNotification(error)
+                        return
                     }
+
+                    if (walletState.isMultiwalletAllowed) {
+                        val amountToSend = sendableAmounts.find { it.currencySymbol == currency.currencySymbol }
+                        if (amountToSend == null) {
+                            val error = TapError.UnsupportedState("WalletAction.Send: Amount to send is null")
+                            FirebaseCrashlytics.getInstance().recordException(IllegalStateException(error.stateError))
+                            store.dispatchErrorNotification(error)
+                            return
+                        }
+
+                        makeInitSendStateActionByCurrency(
+                            currency = currency,
+                            amount = amountToSend,
+                            walletStore = walletStore,
+                            walletManager = walletManager,
+                            selectedWalletData = selectedWalletData,
+                        )
+                    } else {
+                        val isSingleAmount = sendableAmounts.size == 1
+                        if (isSingleAmount) {
+                            makeInitSendStateActionByAmount(
+                                amount = sendableAmounts.first(),
+                                walletStore = walletStore,
+                                walletManager = walletManager,
+                                selectedWalletData = selectedWalletData,
+                            )
+                        } else {
+                            store.dispatch(WalletAction.DialogAction.ChooseCurrency(sendableAmounts))
+                            return
+                        }
+                    }
+                } else {
+                    // action.amount received from the ChooseCurrency dialog
+                    makeInitSendStateActionByAmount(
+                        amount = action.amount,
+                        walletManager = walletManager,
+                        walletStore = walletStore,
+                        selectedWalletData = selectedWalletData,
+                    )
                 }
+
+                Analytics.send(Token.ButtonSend(AnalyticsParam.CurrencyType.Currency(currency)))
+                store.dispatch(initSendStateAction)
+                store.dispatch(NavigationAction.NavigateTo(AppScreen.Send))
             }
             is WalletAction.ShowSaveWalletIfNeeded -> {
                 showSaveWalletIfNeeded()
@@ -222,6 +272,59 @@ class WalletMiddleware {
         }
     }
 
+    private fun makeInitSendStateActionByAmount(
+        amount: Amount,
+        walletStore: WalletStoreModel,
+        walletManager: WalletManager,
+        selectedWalletData: WalletDataModel,
+    ): PrepareSendScreen = when (amount.type) {
+        AmountType.Coin ->
+            PrepareSendScreen(
+                walletManager = walletManager,
+                coinAmount = amount,
+                coinRate = selectedWalletData.fiatRate,
+            )
+        is AmountType.Token -> {
+            PrepareSendScreen(
+                walletManager = walletManager,
+                coinAmount = walletManager.wallet.amounts[AmountType.Coin],
+                coinRate = walletStore.blockchainWalletData.fiatRate,
+                tokenAmount = amount,
+                tokenRate = selectedWalletData.fiatRate,
+            )
+        }
+        AmountType.Reserve -> {
+            val exception = IllegalStateException("WalletAction.Send: Reserve can't be sent")
+            FirebaseCrashlytics.getInstance().recordException(exception)
+            throw exception
+        }
+    }
+
+    private fun makeInitSendStateActionByCurrency(
+        currency: Currency,
+        amount: Amount,
+        walletStore: WalletStoreModel,
+        walletManager: WalletManager,
+        selectedWalletData: WalletDataModel,
+    ): PrepareSendScreen = when (currency) {
+        is Currency.Blockchain -> {
+            PrepareSendScreen(
+                walletManager = walletManager,
+                coinAmount = amount,
+                coinRate = selectedWalletData.fiatRate,
+            )
+        }
+        is Currency.Token -> {
+            PrepareSendScreen(
+                walletManager = walletManager,
+                coinAmount = walletManager.wallet.amounts[AmountType.Coin],
+                coinRate = walletStore.blockchainWalletData.fiatRate,
+                tokenAmount = amount,
+                tokenRate = selectedWalletData.fiatRate,
+            )
+        }
+    }
+
     private fun changeSelectedWalletAddress(type: AddressType, state: WalletState) {
         val selectedUserWalletId = userWalletsListManager.selectedUserWalletSync?.walletId.guard {
             Timber.e("Unable to change selected wallet address, no user wallet selected")
@@ -284,72 +387,4 @@ class WalletMiddleware {
             }
         }
     }
-
-    private fun prepareSendAction(amount: Amount?, state: WalletState?): Action {
-        val selectedWalletData = state?.selectedWalletData
-        val currency = selectedWalletData?.currency
-        val walletStore = state?.getWalletStore(currency)
-
-        return if (amount != null) {
-            if (amount.type is AmountType.Token) {
-                prepareSendActionForToken(amount, selectedWalletData, walletStore)
-            } else {
-                PrepareSendScreen(amount, selectedWalletData?.fiatRate, walletStore?.walletManager)
-            }
-        } else {
-            val amounts = walletStore?.walletManager?.wallet?.getSendableAmounts()
-            if (currency != null && state.isMultiwalletAllowed) {
-                when (currency) {
-                    is Currency.Blockchain -> {
-                        val amountToSend = amounts?.find { it.currencySymbol == currency.blockchain.currency }
-                            ?: return WalletAction.DialogAction.ChooseCurrency(amounts)
-                        PrepareSendScreen(
-                            coinAmount = amountToSend,
-                            coinRate = selectedWalletData.fiatRate,
-                            walletManager = walletStore.walletManager,
-                        )
-                    }
-                    is Currency.Token -> {
-                        val amountToSend = amounts?.find { it.currencySymbol == currency.token.symbol }
-                            ?: return WalletAction.DialogAction.ChooseCurrency(amounts)
-                        prepareSendActionForToken(
-                            amount = amountToSend,
-                            selectedWalletData = selectedWalletData,
-                            walletStore = walletStore,
-                        )
-                    }
-                }
-            } else {
-                val amountsSize = amounts?.size ?: 0
-                if (amountsSize > 1) {
-                    WalletAction.DialogAction.ChooseCurrency(amounts)
-                } else {
-                    val amountToSend = amounts?.first()
-                    PrepareSendScreen(
-                        coinAmount = amountToSend,
-                        coinRate = selectedWalletData?.fiatRate,
-                        walletManager = walletStore?.walletManager,
-                    )
-                }
-            }
-        }
-    }
-
-    private fun prepareSendActionForToken(
-        amount: Amount,
-        selectedWalletData: WalletDataModel?,
-        walletStore: WalletStoreModel?,
-    ): PrepareSendScreen {
-        val coinRate = walletStore?.blockchainWalletData?.fiatRate
-        val tokenRate = selectedWalletData?.fiatRate
-        val coinAmount = walletStore?.walletManager?.wallet?.amounts?.get(AmountType.Coin)
-
-        return PrepareSendScreen(
-            coinAmount = coinAmount,
-            coinRate = coinRate,
-            walletManager = walletStore?.walletManager,
-            tokenAmount = amount,
-            tokenRate = tokenRate,
-        )
-    }
 }

app/src/main/java/com/tangem/tap/features/wallet/redux/models/WalletDialog.kt

@@ -6,7 +6,7 @@ import com.tangem.tap.common.redux.StateDialog
 import com.tangem.wallet.R
 
 sealed interface WalletDialog : StateDialog {
-    data class SelectAmountToSendDialog(val amounts: List<Amount>?) : WalletDialog
+    data class SelectAmountToSendDialog(val amounts: List<Amount>) : WalletDialog
     object SignedHashesMultiWalletDialog : WalletDialog
     data class ChooseTradeActionDialog(
         val buyAllowed: Boolean,

app/src/main/java/com/tangem/tap/features/wallet/ui/dialogs/AmountToSendBottomSheetDialog.kt

@@ -5,11 +5,7 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.appcompat.view.ContextThemeWrapper
-import androidx.recyclerview.widget.DiffUtil
-import androidx.recyclerview.widget.DividerItemDecoration
-import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.ListAdapter
-import androidx.recyclerview.widget.RecyclerView
+import androidx.recyclerview.widget.*
 import com.google.android.material.bottomsheet.BottomSheetDialog
 import com.tangem.blockchain.common.Amount
 import com.tangem.tap.common.extensions.toFormattedString
@@ -55,7 +51,7 @@ class AmountToSendBottomSheetDialog(
     }
 }
 
-class ChooseAmountAdapter : ListAdapter<Amount, ChooseAmountAdapter.AmountViewHolder>(DiffUtilCallback) {
+private class ChooseAmountAdapter : ListAdapter<Amount, ChooseAmountAdapter.AmountViewHolder>(DiffUtilCallback) {
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): AmountViewHolder {
         val binding = ItemWalletAmountToSendBinding.inflate(

app/src/main/java/com/tangem/tap/features/walletSelector/ui/components/WallectSelectorScreenContent.kt

@@ -3,14 +3,7 @@ package com.tangem.tap.features.walletSelector.ui.components
 import androidx.annotation.StringRes
 import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.itemsIndexed
 import androidx.compose.material.Icon
@@ -28,7 +21,7 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
 import com.tangem.core.ui.components.PrimaryButton
-import com.tangem.core.ui.components.SecondaryButtonIconRight
+import com.tangem.core.ui.components.SecondaryButtonIconEnd
 import com.tangem.core.ui.components.SpacerWMax
 import com.tangem.core.ui.components.atoms.Hand
 import com.tangem.core.ui.res.TangemTheme
@@ -191,11 +184,11 @@ private fun Footer(
                 onClick = onUnlockClick,
             )
         }
-        SecondaryButtonIconRight(
+        SecondaryButtonIconEnd(
             modifier = Modifier.fillMaxWidth(),
             text = stringResource(R.string.user_wallet_list_add_button),
             showProgress = showAddCardProgress,
-            icon = painterResource(id = R.drawable.ic_tangem_24),
+            iconResId = R.drawable.ic_tangem_24,
             onClick = onAddCardClick,
         )
     }

app/src/main/java/com/tangem/tap/features/welcome/ui/components/WelcomeScreenContent.kt

@@ -1,11 +1,7 @@
 package com.tangem.tap.features.welcome.ui.components
 
 import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.*
 import androidx.compose.material.Icon
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
@@ -15,12 +11,7 @@ import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
-import com.tangem.core.ui.components.PrimaryButtonIconRight
-import com.tangem.core.ui.components.SecondaryButton
-import com.tangem.core.ui.components.SpacerH12
-import com.tangem.core.ui.components.SpacerH16
-import com.tangem.core.ui.components.SpacerH32
-import com.tangem.core.ui.components.SpacerHMax
+import com.tangem.core.ui.components.*
 import com.tangem.core.ui.res.TangemTheme
 import com.tangem.wallet.R
 
@@ -76,13 +67,13 @@ internal fun WelcomeScreenContent(
             onClick = onUnlockClick,
         )
         SpacerH12()
-        PrimaryButtonIconRight(
+        PrimaryButtonIconEnd(
             modifier = Modifier
                 .padding(horizontal = TangemTheme.dimens.spacing16)
                 .fillMaxWidth(),
             text = stringResource(R.string.welcome_unlock_card),
             showProgress = showScanCardProgress,
-            icon = painterResource(id = R.drawable.ic_tangem_24),
+            iconResId = R.drawable.ic_tangem_24,
             onClick = onScanCardClick,
         )
         SpacerH16()