diff --git a/app/src/main/java/com/tangem/tap/features/tokens/ui/compose/currencyItem/CurrencyItemHeader.kt b/app/src/main/java/com/tangem/tap/features/tokens/ui/compose/currencyItem/CurrencyItemHeader.kt index cc8562ac62..506d6a0793 100644 --- a/app/src/main/java/com/tangem/tap/features/tokens/ui/compose/currencyItem/CurrencyItemHeader.kt +++ b/app/src/main/java/com/tangem/tap/features/tokens/ui/compose/currencyItem/CurrencyItemHeader.kt @@ -34,6 +34,8 @@ import com.tangem.blockchain.common.Blockchain import com.tangem.core.ui.extensions.getActiveIconRes import com.tangem.domain.common.extensions.fromNetworkId import com.tangem.tap.common.extensions.getGreyedOutIconRes +import com.tangem.tap.common.extensions.getRoundIconRes +import com.tangem.tap.domain.tokens.Contract import com.tangem.tap.domain.tokens.Currency import com.tangem.tap.features.tokens.redux.TokenWithBlockchain import com.tangem.tap.features.tokens.ui.compose.CurrencyPlaceholderIcon @@ -141,7 +143,7 @@ private fun NetworksRow( addedBlockchains = addedBlockchains, ) } else { - val isAdded = addedTokens.map { it.token.contractAddress }.contains(contract.address) + val isAdded = addedTokens.any(contract::isInclude) val iconResId = if (isAdded) { getActiveIconRes(contract.blockchain.id) } else { @@ -206,4 +208,7 @@ private fun BlockchainNetworkItem( } Spacer(modifier = Modifier.size(5.dp)) } -} \ No newline at end of file +} + +private fun Contract.isInclude(addedToken: TokenWithBlockchain): Boolean = + address == addedToken.token.contractAddress && blockchain == addedToken.blockchain \ No newline at end of file