Updated on 2026-08-14

2022-06-24 19:09:57 +04:00 · 2022-06-24 19:09:57 +04:00 · 13b0b403b6
commit 13b0b403b6
parent 9563a0b1c3 b7e01fc502
37 changed files with 392 additions and 414 deletions
--- a/app/src/main/java/com/tangem/tap/features/onboarding/products/note/OnboardingNoteFragment.kt
+++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/note/OnboardingNoteFragment.kt
@ -10,7 +10,7 @@ import androidx.annotation.LayoutRes
 import androidx.constraintlayout.widget.ConstraintSet
 import androidx.core.view.isVisible
 import androidx.transition.TransitionManager
-import com.squareup.picasso.Picasso
+import coil.load
 import com.tangem.blockchain.common.Blockchain
 import com.tangem.tangem_sdk_new.extensions.fadeIn
 import com.tangem.tangem_sdk_new.extensions.fadeOut
@ -67,11 +67,11 @@ class OnboardingNoteFragment : BaseOnboardingFragment<OnboardingNoteState>() {
    override fun newState(state: OnboardingNoteState) {
        if (activity == null || view == null) return

-        Picasso.get()
-            .load(state.cardArtworkUrl)
-            .error(R.drawable.card_placeholder_black)
-            .placeholder(R.drawable.card_placeholder_black)
-            ?.into(binding.onboardingTopContainer.imvFrontCard)
+        binding.onboardingTopContainer.imvFrontCard.load(state.cardArtworkUrl) {
+            placeholder(R.drawable.card_placeholder_black)
+            error(R.drawable.card_placeholder_black)
+            fallback(R.drawable.card_placeholder_black)
+        }

        pbBinding.pbState.max = state.steps.size - 1
        pbBinding.pbState.progress = state.progress
--- a/app/src/main/java/com/tangem/tap/features/onboarding/products/otherCards/OnboardingOtherCardsFragment.kt
+++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/otherCards/OnboardingOtherCardsFragment.kt
@ -7,7 +7,7 @@ import androidx.annotation.LayoutRes
 import androidx.constraintlayout.widget.ConstraintSet
 import androidx.core.view.isVisible
 import androidx.transition.TransitionManager
-import com.squareup.picasso.Picasso
+import coil.load
 import com.tangem.tap.common.extensions.getDrawableCompat
 import com.tangem.tap.common.redux.navigation.ShareElement
 import com.tangem.tap.common.transitions.InternalNoteLayoutTransition
@ -54,11 +54,11 @@ class OnboardingOtherCardsFragment : BaseOnboardingFragment<OnboardingOtherCards
        if (activity == null || view == null) return
        if (state.currentStep == OnboardingOtherCardsStep.None) return

-        Picasso.get()
-            .load(state.cardArtworkUrl)
-            .error(R.drawable.card_placeholder_black)
-            .placeholder(R.drawable.card_placeholder_black)
-            ?.into(binding.onboardingTopContainer.imvFrontCard)
+        binding.onboardingTopContainer.imvFrontCard.load(state.cardArtworkUrl) {
+            placeholder(R.drawable.card_placeholder_black)
+            error(R.drawable.card_placeholder_black)
+            fallback(R.drawable.card_placeholder_black)
+        }

        pbBinding.pbState.max = state.steps.size - 1
        pbBinding.pbState.progress = state.progress
--- a/app/src/main/java/com/tangem/tap/features/onboarding/products/twins/ui/TwinsCardsFragment.kt
+++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/twins/ui/TwinsCardsFragment.kt
@ -9,13 +9,18 @@ import androidx.constraintlayout.widget.ConstraintSet
 import androidx.core.view.isVisible
 import androidx.transition.TransitionInflater
 import androidx.transition.TransitionManager
-import com.squareup.picasso.Picasso
+import coil.load
 import com.tangem.Message
 import com.tangem.blockchain.common.Blockchain
 import com.tangem.common.extensions.VoidCallback
 import com.tangem.domain.common.TwinCardNumber
 import com.tangem.tangem_sdk_new.ui.widget.leapfrogWidget.LeapfrogWidget
-import com.tangem.tap.common.extensions.*
+import com.tangem.tap.common.extensions.beginDelayedTransition
+import com.tangem.tap.common.extensions.getDrawableCompat
+import com.tangem.tap.common.extensions.hide
+import com.tangem.tap.common.extensions.readAssetAsString
+import com.tangem.tap.common.extensions.show
+import com.tangem.tap.common.extensions.stripZeroPlainString
 import com.tangem.tap.common.redux.navigation.AppScreen
 import com.tangem.tap.common.redux.navigation.NavigationAction
 import com.tangem.tap.common.redux.navigation.ShareElement
@ -75,24 +80,28 @@ class TwinsCardsFragment : BaseOnboardingFragment<TwinCardsState>() {
        resources.getValue(R.dimen.device_scale_factor_for_twins_welcome, typedValue, true)
        val deviceScaleFactorForWelcomeState = typedValue.float

-        twinsWidget = TwinsCardWidget(LeapfrogWidget(binding.onboardingTopContainer.cardsContainer), deviceScaleFactorForWelcomeState) {
+        twinsWidget = TwinsCardWidget(
+            LeapfrogWidget(binding.onboardingTopContainer.cardsContainer),
+            deviceScaleFactorForWelcomeState
+        ) {
            285f * deviceScaleFactorForWelcomeState
        }
-        btnRefreshBalanceWidget = RefreshBalanceWidget(binding.onboardingTopContainer.onboardingMainContainer)
+        btnRefreshBalanceWidget =
+            RefreshBalanceWidget(binding.onboardingTopContainer.onboardingMainContainer)

        binding.toolbar.title = getText(R.string.twins_recreate_toolbar)

-        Picasso.get()
-            .load(Artwork.TWIN_CARD_1)
-            .error(R.drawable.card_placeholder_black)
-            .placeholder(R.drawable.card_placeholder_black)
-            ?.into(binding.onboardingTopContainer.imvTwinFrontCard)
+        binding.onboardingTopContainer.imvTwinFrontCard.load(Artwork.TWIN_CARD_1) {
+            placeholder(R.drawable.card_placeholder_black)
+            error(R.drawable.card_placeholder_black)
+            fallback(R.drawable.card_placeholder_black)
+        }

-        Picasso.get()
-            .load(Artwork.TWIN_CARD_2)
-            .error(R.drawable.card_placeholder_white)
-            .placeholder(R.drawable.card_placeholder_white)
-            ?.into(binding.onboardingTopContainer.imvTwinBackCard)
+        binding.onboardingTopContainer.imvTwinBackCard.load(Artwork.TWIN_CARD_2) {
+            placeholder(R.drawable.card_placeholder_white)
+            error(R.drawable.card_placeholder_white)
+            fallback(R.drawable.card_placeholder_white)
+        }
    }

    private fun reconfigureLayoutForTwins(containerBinding: LayoutOnboardingContainerTopBinding) =
--- a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/OnboardingWalletFragment.kt
+++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/OnboardingWalletFragment.kt
@ -11,9 +11,9 @@ import androidx.fragment.app.Fragment
 import androidx.transition.TransitionInflater
 import androidx.transition.TransitionManager
 import by.kirich1409.viewbindingdelegate.viewBinding
+import coil.load
 import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.android.material.tabs.TabLayoutMediator
-import com.squareup.picasso.Picasso
 import com.tangem.common.CardIdFormatter
 import com.tangem.common.core.CardIdDisplayFormat
 import com.tangem.tangem_sdk_new.ui.widget.leapfrogWidget.LeapfrogWidget
@ -22,7 +22,12 @@ import com.tangem.tap.common.extensions.hide
 import com.tangem.tap.common.extensions.show
 import com.tangem.tap.features.FragmentOnBackPressedHandler
 import com.tangem.tap.features.addBackPressHandler
-import com.tangem.tap.features.onboarding.products.wallet.redux.*
+import com.tangem.tap.features.onboarding.products.wallet.redux.BackupAction
+import com.tangem.tap.features.onboarding.products.wallet.redux.BackupState
+import com.tangem.tap.features.onboarding.products.wallet.redux.BackupStep
+import com.tangem.tap.features.onboarding.products.wallet.redux.OnboardingWalletAction
+import com.tangem.tap.features.onboarding.products.wallet.redux.OnboardingWalletState
+import com.tangem.tap.features.onboarding.products.wallet.redux.OnboardingWalletStep
 import com.tangem.tap.features.onboarding.products.wallet.ui.dialogs.AccessCodeDialog
 import com.tangem.tap.store
 import com.tangem.wallet.R
@ -124,11 +129,11 @@ class OnboardingWalletFragment : Fragment(R.layout.fragment_onboarding_wallet),
    }

    private fun loadImageIntoImageView(url: String?, view: ImageView) {
-        Picasso.get()
-            .load(url)
-            .error(R.drawable.card_placeholder_black)
-            .placeholder(R.drawable.card_placeholder_black)
-            ?.into(view)
+        view.load(url) {
+            placeholder(R.drawable.card_placeholder_black)
+            error(R.drawable.card_placeholder_black)
+            fallback(R.drawable.card_placeholder_black)
+        }
    }

    private fun setupCreateWalletState() = with(binding) {
--- a/app/src/main/java/com/tangem/tap/features/send/redux/reducers/ReceiptReducer.kt
+++ b/app/src/main/java/com/tangem/tap/features/send/redux/reducers/ReceiptReducer.kt
@ -7,6 +7,7 @@ import com.tangem.tap.common.extensions.stripZeroPlainString
 import com.tangem.tap.features.send.redux.ReceiptAction.RefreshReceipt
 import com.tangem.tap.features.send.redux.SendScreenAction
 import com.tangem.tap.features.send.redux.states.*
+import com.tangem.tap.features.wallet.redux.WalletState.Companion.UNKNOWN_AMOUNT_SIGN
 import com.tangem.tap.store
 import java.math.BigDecimal

@ -15,10 +16,6 @@ import java.math.BigDecimal
 */
 class ReceiptReducer : SendInternalReducer {

-    companion object {
-        const val EMPTY = "-"
-    }
-
    private lateinit var sendState: SendState
    private lateinit var amountState: AmountState
    private lateinit var feeState: FeeState
@ -137,9 +134,9 @@ class ReceiptReducer : SendInternalReducer {
            )
        } else {
            ReceiptTokenFiat(
-                amountFiat = EMPTY,
-                feeFiat = EMPTY,
-                totalFiat = EMPTY,
+                amountFiat = UNKNOWN_AMOUNT_SIGN,
+                feeFiat = UNKNOWN_AMOUNT_SIGN,
+                totalFiat = UNKNOWN_AMOUNT_SIGN,
                willSentToken = tokensToSend.stripZeroPlainString(),
                willSentFeeCoin = feeCoin.stripZeroPlainString(),
                symbols = symbols
@ -169,7 +166,7 @@ class ReceiptReducer : SendInternalReducer {
            ReceiptTokenCrypto(
                amountToken = tokensToSend.stripZeroPlainString(),
                feeCoin = feeCoin.stripZeroPlainString().addPrecisionSign(),
-                totalFiat = EMPTY,
+                totalFiat = UNKNOWN_AMOUNT_SIGN,
                symbols = symbols
            )
        }
@ -206,7 +203,7 @@ class ReceiptReducer : SendInternalReducer {
        return when {
            !isToken && sendState.coinIsConvertible() -> sendState.coinConverter!!.toFiatWithPrecision(value).stripZeroPlainString()
            isToken && sendState.tokenIsConvertible() -> sendState.tokenConverter!!.toFiatWithPrecision(value).stripZeroPlainString()
-            else -> EMPTY
+            else -> UNKNOWN_AMOUNT_SIGN
        }
    }

--- a/app/src/main/java/com/tangem/tap/features/send/ui/stateSubscribers/SendStateSubscriber.kt
+++ b/app/src/main/java/com/tangem/tap/features/send/ui/stateSubscribers/SendStateSubscriber.kt
@ -17,12 +17,13 @@ import com.tangem.tap.features.BaseStoreFragment
 import com.tangem.tap.features.send.redux.AddressPayIdVerifyAction.Error
 import com.tangem.tap.features.send.redux.FeeAction
 import com.tangem.tap.features.send.redux.SendAction
-import com.tangem.tap.features.send.redux.reducers.ReceiptReducer
 import com.tangem.tap.features.send.redux.states.*
 import com.tangem.tap.features.send.ui.FeeUiHelper
 import com.tangem.tap.features.send.ui.SendFragment
 import com.tangem.tap.features.send.ui.dialogs.SendTransactionFailsDialog
 import com.tangem.tap.features.send.ui.dialogs.TezosWarningDialog
+import com.tangem.tap.features.wallet.redux.WalletState.Companion.ROUGH_SIGN
+import com.tangem.tap.features.wallet.redux.WalletState.Companion.UNKNOWN_AMOUNT_SIGN
 import com.tangem.tap.features.wallet.ui.adapters.WarningMessagesAdapter
 import com.tangem.tap.store
 import com.tangem.wallet.R
@ -257,12 +258,12 @@ class SendStateSubscriber(fragment: BaseStoreFragment) :
        val mainLayout = clReceiptContainer as ViewGroup
        val totalLayout = llTotalContainer.llTotal as ViewGroup
        val totalTokenLayout = llTotalContainer.flTotalTokenCrypto as ViewGroup
-        fun getString(id: Int, vararg formatStrings: String): String =
-            mainLayout.context.getString(id, *formatStrings)

-        val rough = getString(R.string.sign_rough)
-        fun roughOrEmpty(value: String): String =
-            if (value == ReceiptReducer.EMPTY) value else "$rough $value"
+        fun getString(id: Int, vararg formatStrings: String): String = mainLayout.getString(id, *formatStrings)
+
+        fun roughOrEmpty(value: String): String {
+            return if (value == UNKNOWN_AMOUNT_SIGN) value else "$ROUGH_SIGN $value"
+        }

        when (state.visibleTypeOfReceipt) {
            ReceiptLayoutType.FIAT -> {
--- a/app/src/main/java/com/tangem/tap/features/wallet/redux/WalletState.kt
+++ b/app/src/main/java/com/tangem/tap/features/wallet/redux/WalletState.kt
@ -301,6 +301,11 @@ data class WalletState(
            )
        } else this
    }
+
+    companion object {
+        const val UNKNOWN_AMOUNT_SIGN = "—"
+        const val ROUGH_SIGN = "≈"
+    }
 }

 sealed interface WalletDialog : StateDialog {
--- a/app/src/main/java/com/tangem/tap/features/wallet/redux/reducers/MultiWalletReducer.kt
+++ b/app/src/main/java/com/tangem/tap/features/wallet/redux/reducers/MultiWalletReducer.kt
@ -13,6 +13,7 @@ import com.tangem.tap.features.wallet.models.filterByToken
 import com.tangem.tap.features.wallet.models.getPendingTransactions
 import com.tangem.tap.features.wallet.models.removeUnknownTransactions
 import com.tangem.tap.features.wallet.redux.*
+import com.tangem.tap.features.wallet.redux.WalletState.Companion.UNKNOWN_AMOUNT_SIGN
 import com.tangem.tap.features.wallet.ui.BalanceStatus
 import com.tangem.tap.features.wallet.ui.BalanceWidgetData
 import com.tangem.tap.features.wallet.ui.TokenData
@ -127,9 +128,8 @@ class MultiWalletReducer {
                            action.amount.decimals, action.amount.currencySymbol
                        ),
                        fiatAmountFormatted = tokenWalletData.fiatRate?.let {
-                            action.amount.value
-                                ?.toFiatString(it, store.state.globalState.appCurrency.symbol)
-                        },
+                            action.amount.value?.toFiatString(it, store.state.globalState.appCurrency.symbol)
+                        } ?: UNKNOWN_AMOUNT_SIGN,
                        blockchainAmount = wallet.amounts[AmountType.Coin]?.value ?: BigDecimal.ZERO
                    ),
                    pendingTransactions = pendingTransactions.removeUnknownTransactions(),
--- a/app/src/main/java/com/tangem/tap/features/wallet/redux/reducers/OnWalletLoadedReducer.kt
+++ b/app/src/main/java/com/tangem/tap/features/wallet/redux/reducers/OnWalletLoadedReducer.kt
@ -14,11 +14,11 @@ import com.tangem.tap.features.wallet.models.filterByToken
 import com.tangem.tap.features.wallet.models.getPendingTransactions
 import com.tangem.tap.features.wallet.models.removeUnknownTransactions
 import com.tangem.tap.features.wallet.redux.*
+import com.tangem.tap.features.wallet.redux.WalletState.Companion.UNKNOWN_AMOUNT_SIGN
 import com.tangem.tap.features.wallet.ui.BalanceStatus
 import com.tangem.tap.features.wallet.ui.BalanceWidgetData
 import com.tangem.tap.features.wallet.ui.TokenData
 import com.tangem.tap.store
-import java.math.RoundingMode

 class OnWalletLoadedReducer {

@ -55,6 +55,8 @@ class OnWalletLoadedReducer {
        }

        val fiatAmount = walletData.fiatRate?.let { coinAmountValue?.toFiatValue(it) }
+        val fiatAmountFormatted = fiatAmount?.toFormattedFiatValue(fiatCurrency.symbol) ?: UNKNOWN_AMOUNT_SIGN
+
        val newWalletData = walletData.copy(
            currencyData = walletData.currencyData.copy(
                status = balanceStatus,
@ -64,7 +66,7 @@ class OnWalletLoadedReducer {
                amount = coinAmountValue,
                amountFormatted = formattedAmount,
                fiatAmount = fiatAmount,
-                fiatAmountFormatted = fiatAmount?.toFormattedFiatValue(fiatCurrency.symbol)
+                fiatAmountFormatted = fiatAmountFormatted,
            ),
            pendingTransactions = pendingTransactions.removeUnknownTransactions(),
            mainButton = WalletMainButton.SendButton(isCoinSendButtonEnabled),
@ -82,8 +84,9 @@ class OnWalletLoadedReducer {
                else -> BalanceStatus.VerifiedOnline
            }
            val tokenAmountValue = wallet.getTokenAmount(token)?.value
-            val tokenFiatAmount =
-                tokenWalletData?.fiatRate?.let { rate -> tokenAmountValue?.toFiatValue(rate) }
+            val tokenFiatAmount = tokenWalletData?.fiatRate?.let { tokenAmountValue?.toFiatValue(it) }
+            val tokenFiatAmountFormatted = tokenFiatAmount?.toFormattedFiatValue(fiatCurrency.symbol)
+                ?: UNKNOWN_AMOUNT_SIGN

            val isTokenSendButtonEnabled = newWalletData.shouldEnableTokenSendButton()
                && pendingTransactions.isEmpty()
@ -97,7 +100,7 @@ class OnWalletLoadedReducer {
                        token.symbol
                    ),
                    fiatAmount = tokenFiatAmount,
-                    fiatAmountFormatted = tokenFiatAmount?.toFormattedFiatValue(fiatCurrency.symbol)
+                    fiatAmountFormatted = tokenFiatAmountFormatted,
                ),
                pendingTransactions = tokenPendingTransactions.removeUnknownTransactions(),
                mainButton = WalletMainButton.SendButton(isTokenSendButtonEnabled),
@ -141,9 +144,8 @@ class OnWalletLoadedReducer {
            wallet.blockchain.decimals(),
            wallet.blockchain.currency
        )
-        val fiatRate = walletState.primaryWallet?.fiatRate
-        val fiatAmountRaw = fiatRate?.multiply(amount)?.setScale(2, RoundingMode.DOWN)
-        val fiatAmount = fiatRate?.let { amount?.toFiatString(it, fiatCurrencyName) }
+        val fiatAmount = walletState.primaryWallet?.fiatRate?.let { amount?.toFiatValue(it) }
+        val fiatAmountFormatted = fiatAmount?.toFormattedFiatValue(fiatCurrencyName) ?: UNKNOWN_AMOUNT_SIGN

        val pendingTransactions = wallet.getPendingTransactions()
        val sendButtonEnabled = amount?.isZero() == false && pendingTransactions.isEmpty()
@ -160,8 +162,8 @@ class OnWalletLoadedReducer {
                blockchainAmount = amount,
                amount = amount,
                amountFormatted = formattedAmount,
-                fiatAmountFormatted = fiatAmount,
-                fiatAmount = fiatAmountRaw
+                fiatAmount = fiatAmount,
+                fiatAmountFormatted = fiatAmountFormatted
            ),
            pendingTransactions = pendingTransactions.removeUnknownTransactions(),
            mainButton = WalletMainButton.SendButton(sendButtonEnabled),
--- a/app/src/main/java/com/tangem/tap/features/wallet/redux/reducers/WalletReducer.kt
+++ b/app/src/main/java/com/tangem/tap/features/wallet/redux/reducers/WalletReducer.kt
@ -217,8 +217,8 @@ private fun internalReduce(action: Action, state: AppState): WalletState {
                            currency = walletBlockchain.currency,
                        ),
                        fiatAmount = fiatAmount,
-                        fiatAmountFormatted = fiatAmount.toFiatRateString(
-                            fiatCurrencyName = store.state.globalState.appCurrency.symbol
+                        fiatAmountFormatted = fiatAmount.toFormattedFiatValue(
+                            fiatCurrencyName = state.globalState.appCurrency.symbol
                        ),
                        amountToCreateAccount = action.amountToCreateAccount,
                    )
@ -439,7 +439,7 @@ private fun setMultiWalletFiatRate(
                wallet?.getTokenAmount(currency.token)?.value?.toFiatValue(rate)
        }
        if (currencyData.status == BalanceStatus.NoAccount && fiatAmount == null) {
-            fiatAmount = BigDecimal.ZERO
+            fiatAmount = BigDecimal.ZERO.setScale(2)
        }
        val fiatAmountFormatted = fiatAmount?.toFormattedFiatValue(appCurrency.symbol)

--- a/app/src/main/java/com/tangem/tap/features/wallet/ui/BalanceWidget.kt
+++ b/app/src/main/java/com/tangem/tap/features/wallet/ui/BalanceWidget.kt
@ -26,8 +26,8 @@ data class BalanceWidgetData(
    val blockchainAmount: BigDecimal? = BigDecimal.ZERO,
    val amount: BigDecimal? = null,
    val amountFormatted: String? = null,
-    val fiatAmountFormatted: String? = null,
    val fiatAmount: BigDecimal? = null,
+    val fiatAmountFormatted: String? = null,
    val token: TokenData? = null,
    val amountToCreateAccount: String? = null,
    val errorMessage: String? = null
--- a/app/src/main/java/com/tangem/tap/features/wallet/ui/WalletDetailsFragment.kt
+++ b/app/src/main/java/com/tangem/tap/features/wallet/ui/WalletDetailsFragment.kt
@ -11,7 +11,7 @@ import androidx.fragment.app.Fragment
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.transition.TransitionInflater
 import by.kirich1409.viewbindingdelegate.viewBinding
-import com.squareup.picasso.Picasso
+import com.tangem.tangem_sdk_new.extensions.dpToPx
 import com.tangem.tap.common.SnackbarHandler
 import com.tangem.tap.common.TestActions
 import com.tangem.tap.common.extensions.*
@ -22,8 +22,10 @@ import com.tangem.tap.features.onboarding.getQRReceiveMessage
 import com.tangem.tap.features.wallet.models.Currency
 import com.tangem.tap.features.wallet.models.PendingTransaction
 import com.tangem.tap.features.wallet.redux.*
+import com.tangem.tap.features.wallet.redux.WalletState.Companion.UNKNOWN_AMOUNT_SIGN
 import com.tangem.tap.features.wallet.ui.adapters.PendingTransactionsAdapter
 import com.tangem.tap.features.wallet.ui.adapters.WalletDetailWarningMessagesAdapter
+import com.tangem.tap.features.wallet.ui.images.loadCurrencyIcon
 import com.tangem.tap.features.wallet.ui.test.TestWalletDetails
 import com.tangem.tap.store
 import com.tangem.wallet.R
@ -127,11 +129,11 @@ class WalletDetailsFragment : Fragment(R.layout.fragment_wallet_details),

        handleCurrencyIcon(selectedWallet)
        handleWarnings(selectedWallet)
+        updateViewMeasurements()

        binding.srlWalletDetails.setOnRefreshListener {
            if (selectedWallet.currencyData.status != BalanceStatus.Loading) {
-                store.dispatch(
-                    WalletAction.LoadWallet(
+                store.dispatch(WalletAction.LoadWallet(
                        blockchain = BlockchainNetwork(
                            selectedWallet.currency.blockchain,
                            selectedWallet.currency.derivationPath,
@ -147,13 +149,27 @@ class WalletDetailsFragment : Fragment(R.layout.fragment_wallet_details),
        }
    }

+    private fun updateViewMeasurements() {
+        val tvFiatAmount = binding.lWalletDetails.lBalance.tvFiatAmount
+        val paddingStart = when (tvFiatAmount.text) {
+            UNKNOWN_AMOUNT_SIGN -> 16f
+            else -> 12f
+        }
+        tvFiatAmount.setPadding(
+            tvFiatAmount.dpToPx(paddingStart).toInt(),
+            tvFiatAmount.paddingTop,
+            tvFiatAmount.paddingEnd,
+            tvFiatAmount.paddingBottom,
+        )
+    }
+
    private fun setupCurrency(currencyData: BalanceWidgetData, currency: Currency) = with(binding) {
        tvCurrencyTitle.text = currencyData.currency
        if (currency is Currency.Token) {
-            binding.tvCurrencySubtitle.text = currency.blockchain.tokenDisplayName()
-            binding.tvCurrencySubtitle.show()
+            tvCurrencySubtitle.text = currency.blockchain.tokenDisplayName()
+            tvCurrencySubtitle.show()
        } else {
-            binding.tvCurrencySubtitle.hide()
+            tvCurrencySubtitle.hide()
        }
    }

@ -185,9 +201,9 @@ class WalletDetailsFragment : Fragment(R.layout.fragment_wallet_details),
    }

    private fun handleCurrencyIcon(wallet: WalletData) = with(binding.lWalletDetails.lBalance) {
-        Picasso.get().loadCurrenciesIcon(
-            imageView = ivCurrency,
-            textView = tvTokenLetter,
+        loadCurrencyIcon(
+            currencyImageView = ivCurrency,
+            currencyTextView = tvTokenLetter,
            blockchain = wallet.currency.blockchain,
            token = (wallet.currency as? Currency.Token)?.token
        )
--- a/app/src/main/java/com/tangem/tap/features/wallet/ui/WalletFragment.kt
+++ b/app/src/main/java/com/tangem/tap/features/wallet/ui/WalletFragment.kt
@ -12,7 +12,7 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import androidx.transition.TransitionInflater
 import by.kirich1409.viewbindingdelegate.viewBinding
-import com.squareup.picasso.Picasso
+import coil.load
 import com.tangem.tap.MainActivity
 import com.tangem.tap.common.extensions.show
 import com.tangem.tap.common.recyclerView.SpaceItemDecoration
@ -165,11 +165,11 @@ class WalletFragment : Fragment(R.layout.fragment_wallet), StoreSubscriber<Walle
    }

    private fun setupCardImage(cardImage: Artwork?) {
-        Picasso.get()
-            .load(cardImage?.artworkId)
-            .placeholder(R.drawable.card_placeholder_black)
-            ?.error(R.drawable.card_placeholder_black)
-            ?.into(binding.ivCard)
+        binding.ivCard.load(cardImage?.artworkId) {
+            placeholder(R.drawable.card_placeholder_black)
+            error(R.drawable.card_placeholder_black)
+            fallback(R.drawable.card_placeholder_black)
+        }
    }

    override fun onOptionsItemSelected(item: MenuItem): Boolean {
--- a/app/src/main/java/com/tangem/tap/features/wallet/ui/adapters/WalletAdapter.kt
+++ b/app/src/main/java/com/tangem/tap/features/wallet/ui/adapters/WalletAdapter.kt
@ -6,18 +6,17 @@ import androidx.core.view.isVisible
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.ListAdapter
 import androidx.recyclerview.widget.RecyclerView
-import com.squareup.picasso.Picasso
 import com.tangem.blockchain.common.Blockchain
 import com.tangem.blockchain.common.Token
 import com.tangem.domain.common.TapWorkarounds.derivationStyle
 import com.tangem.tap.common.extensions.getString
 import com.tangem.tap.common.extensions.hide
-import com.tangem.tap.common.extensions.loadCurrenciesIcon
 import com.tangem.tap.common.extensions.show
 import com.tangem.tap.features.wallet.models.Currency
 import com.tangem.tap.features.wallet.redux.WalletAction
 import com.tangem.tap.features.wallet.redux.WalletData
 import com.tangem.tap.features.wallet.ui.BalanceStatus
+import com.tangem.tap.features.wallet.ui.images.loadCurrencyIcon
 import com.tangem.tap.store
 import com.tangem.wallet.R
 import com.tangem.wallet.databinding.ItemCurrencyWalletBinding
@ -98,16 +97,16 @@ class WalletAdapter
                lContent.root.show()
            }

-            Picasso.get().loadCurrenciesIcon(
-                imageView = ivCurrency,
-                textView = tvTokenLetter,
+            loadCurrencyIcon(
+                currencyImageView = ivCurrency,
+                currencyTextView = tvTokenLetter,
                token = (wallet.currency as? Currency.Token)?.token,
                blockchain = wallet.currency.blockchain,
            )

            lContent.tvCurrency.text = wallet.currencyData.currency
-            lContent.tvAmountFiat.text = wallet.currencyData.fiatAmountFormatted ?: "—"
-            lContent.tvAmount.text = wallet.currencyData.amountFormatted ?: "—"
+            lContent.tvAmountFiat.text = wallet.currencyData.fiatAmountFormatted
+            lContent.tvAmount.text = wallet.currencyData.amountFormatted

            lContent.tvStatus.isVisible = statusMessage != null
            lContent.tvStatus.text = statusMessage
--- a/app/src/main/java/com/tangem/tap/features/wallet/ui/images/CurrencyIconRequest.kt
+++ b/app/src/main/java/com/tangem/tap/features/wallet/ui/images/CurrencyIconRequest.kt
@ -0,0 +1,109 @@
+package com.tangem.tap.features.wallet.ui.images
+
+import android.graphics.PorterDuff
+import android.graphics.PorterDuffColorFilter
+import android.widget.ImageView
+import android.widget.TextView
+import androidx.constraintlayout.utils.widget.ImageFilterView
+import coil.imageLoader
+import coil.load
+import coil.request.ImageRequest
+import coil.transform.RoundedCornersTransformation
+import com.tangem.blockchain.common.Blockchain
+import com.tangem.blockchain.common.IconsUtil
+import com.tangem.blockchain.common.Token
+import com.tangem.domain.common.extensions.toNetworkId
+import com.tangem.tap.common.extensions.getColor
+import com.tangem.tap.common.extensions.getRoundIconRes
+import com.tangem.tap.common.extensions.getTextColor
+import com.tangem.tap.domain.extensions.getCustomIconUrl
+import com.tangem.tap.domain.tokens.getIconUrl
+import com.tangem.wallet.R
+
+private const val QCX = "QCX"
+private const val VOYR = "VOYRME"
+
+fun loadCurrencyIcon(
+    currencyImageView: ImageFilterView,
+    currencyTextView: TextView,
+    token: Token?,
+    blockchain: Blockchain,
+) {
+    when {
+        token == null -> currencyImageView.loadIcon(
+            iconUrl = getIconUrl(blockchain.toNetworkId()),
+            placeholderRes = blockchain.getRoundIconRes(),
+            onStart = {
+                if (blockchain.isTestnet()) {
+                    currencyImageView.saturation = 0f
+                } else {
+                    currencyImageView.colorFilter = null
+                }
+            }
+        )
+        token.symbol == QCX -> currencyImageView.load(R.drawable.ic_qcx)
+        token.symbol == VOYR -> currencyImageView.load(R.drawable.ic_voyr)
+        else -> currencyImageView.loadIcon(
+            iconUrl = getTokenIconUrl(token, blockchain),
+            placeholderRes = R.drawable.shape_circle,
+            onStart = {
+                currencyTextView.text = token.symbol.take(1)
+                currencyTextView.setTextColor(token.getTextColor())
+
+                if (blockchain.isTestnet()) {
+                    currencyImageView.saturation = 0f
+                }
+            },
+            onError = {
+                currencyImageView.colorFilter = PorterDuffColorFilter(
+                    /* color = */
+                    token.getColor(),
+                    /* mode = */
+                    PorterDuff.Mode.SRC_ATOP,
+                )
+            },
+            onSuccess = {
+                if (!blockchain.isTestnet()) {
+                    currencyImageView.colorFilter = null
+                }
+            }
+        )
+    }
+}
+
+private inline fun ImageView.loadIcon(
+    iconUrl: String?,
+    placeholderRes: Int,
+    crossinline onStart: () -> Unit = {},
+    crossinline onSuccess: () -> Unit = {},
+    crossinline onError: () -> Unit = {},
+) {
+    ImageRequest.Builder(context)
+        .data(iconUrl)
+        .placeholder(placeholderRes)
+        .error(placeholderRes)
+        .fallback(placeholderRes)
+        .transformations(
+            RoundedCornersTransformation(
+                topLeft = 32f,
+                topRight = 32f,
+                bottomLeft = 32f,
+                bottomRight = 32f
+            )
+        )
+        .listener(
+            onStart = { onStart() },
+            onSuccess = { _, _ -> onSuccess() },
+            onError = { _, _ -> onError() }
+        )
+        .target(imageView = this)
+        .build()
+        .also(context.imageLoader::enqueue)
+}
+
+private fun getTokenIconUrl(token: Token, blockchain: Blockchain): String? {
+    return token.id?.let(::getIconUrl)
+        ?: token.getCustomIconUrl()
+        ?: IconsUtil.getTokenIconUri(blockchain, token)
+            ?.toString()
+}