diff --git 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 index b02511017c..77ac36e571 100644 --- 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 @@ -9,6 +9,7 @@ import com.tangem.blockchain.common.Blockchain import com.tangem.blockchain.common.IconsUtil import com.tangem.blockchain.common.Token import com.tangem.core.ui.extensions.getActiveIconRes +import com.tangem.domain.common.extensions.toCoinId import com.tangem.domain.common.extensions.toNetworkId import com.tangem.tap.common.extensions.getColor import com.tangem.tap.common.extensions.getTextColor @@ -85,7 +86,7 @@ class CurrencyIconRequest( crossinline onError: (Blockchain) -> Unit = {}, ) { currencyImageView.loadIcon( - data = if (getLocalImage) getActiveIconRes(blockchain.id) else getIconUrl(blockchain.toNetworkId()), + data = getBlockchainIconData(blockchain), placeholderRes = getActiveIconRes(blockchain.id), onStart = { onStart(blockchain) }, onSuccess = { onSuccess(blockchain) }, @@ -93,6 +94,20 @@ class CurrencyIconRequest( ) } + private fun getBlockchainIconData(blockchain: Blockchain): Any { + return if (getLocalImage) { + when (blockchain) { + Blockchain.TerraV1, Blockchain.TerraV2 -> getActiveIconRes(blockchain.toCoinId()) + else -> getActiveIconRes(blockchain.id) + } + } else { + when (blockchain) { + Blockchain.TerraV1, Blockchain.TerraV2 -> getIconUrl(blockchain.toCoinId()) + else -> getIconUrl(blockchain.toNetworkId()) + } + } + } + private inline fun loadTokenIconBase( crossinline onStart: (Token) -> Unit = {}, crossinline onSuccess: (Token) -> Unit = {}, diff --git a/core/ui/src/main/java/com/tangem/core/ui/extensions/BlockchainIcons.kt b/core/ui/src/main/java/com/tangem/core/ui/extensions/BlockchainIcons.kt index eda6fbf9f3..c9fb561faa 100644 --- a/core/ui/src/main/java/com/tangem/core/ui/extensions/BlockchainIcons.kt +++ b/core/ui/src/main/java/com/tangem/core/ui/extensions/BlockchainIcons.kt @@ -37,8 +37,8 @@ fun getActiveIconRes(blockchainId: String): Int { "KAVA", "KAVA/test" -> R.drawable.img_kava_22 "ravencoin", "ravencoin/test" -> R.drawable.img_ravencoin_22 "cosmos", "cosmos/test" -> R.drawable.img_cosmos_22 - "terra" -> R.drawable.img_terra_22 - "terra-2" -> R.drawable.img_terra2_22 + "terra", "terra-luna" -> R.drawable.img_terra_22 + "terra-2", "terra-luna-2" -> R.drawable.img_terra2_22 else -> R.drawable.ic_alert_24 } }