diff --git a/data/nft/src/main/kotlin/com/tangem/data/nft/DefaultNFTRepository.kt b/data/nft/src/main/kotlin/com/tangem/data/nft/DefaultNFTRepository.kt index b19fef322d..aa6b40e845 100644 --- a/data/nft/src/main/kotlin/com/tangem/data/nft/DefaultNFTRepository.kt +++ b/data/nft/src/main/kotlin/com/tangem/data/nft/DefaultNFTRepository.kt @@ -135,13 +135,10 @@ internal class DefaultNFTRepository @Inject constructor( override suspend fun isNFTSupported(network: Network): Boolean = network.canHandleNFTs() override suspend fun getNFTSupportedNetworks(userWalletId: UserWalletId): List { - val userWallet = requireNotNull(userWalletsStore.getSyncOrNull(userWalletId)) { - "User wallet [$userWalletId] not found" - } + val userWallet = userWalletsStore.getSyncStrict(userWalletId) return Blockchain .entries - .filter { it.canHandleNFTs() } - .filter { !it.isTestnet() } + .filter { it.canHandleNFTs() && !it.isTestnet() } .mapNotNull { getNetwork( blockchain = it, diff --git a/domain/nft/models/src/main/kotlin/com/tangem/domain/nft/models/NFTNetworks.kt b/domain/nft/models/src/main/kotlin/com/tangem/domain/nft/models/NFTNetworks.kt index 14cb57f3e7..2cdbcfa4a3 100644 --- a/domain/nft/models/src/main/kotlin/com/tangem/domain/nft/models/NFTNetworks.kt +++ b/domain/nft/models/src/main/kotlin/com/tangem/domain/nft/models/NFTNetworks.kt @@ -4,5 +4,5 @@ import com.tangem.domain.tokens.model.Network data class NFTNetworks( val availableNetworks: List, - val notAvailableNetworks: List, + val unavailableNetworks: List, ) \ No newline at end of file diff --git a/domain/nft/src/main/kotlin/com/tangem/domain/nft/FilterNFTAvailableNetworksUseCase.kt b/domain/nft/src/main/kotlin/com/tangem/domain/nft/FilterNFTAvailableNetworksUseCase.kt index ca8aff4b42..21f06eb54f 100644 --- a/domain/nft/src/main/kotlin/com/tangem/domain/nft/FilterNFTAvailableNetworksUseCase.kt +++ b/domain/nft/src/main/kotlin/com/tangem/domain/nft/FilterNFTAvailableNetworksUseCase.kt @@ -12,7 +12,7 @@ class FilterNFTAvailableNetworksUseCase( withContext(dispatchers.default) { NFTNetworks( availableNetworks = networks.availableNetworks.filter(searchQuery), - notAvailableNetworks = networks.notAvailableNetworks.filter(searchQuery), + unavailableNetworks = networks.unavailableNetworks.filter(searchQuery), ) } diff --git a/domain/nft/src/main/kotlin/com/tangem/domain/nft/GetNFTNetworksUseCase.kt b/domain/nft/src/main/kotlin/com/tangem/domain/nft/GetNFTNetworksUseCase.kt index ca8a8c22bd..8a87f0ca6f 100644 --- a/domain/nft/src/main/kotlin/com/tangem/domain/nft/GetNFTNetworksUseCase.kt +++ b/domain/nft/src/main/kotlin/com/tangem/domain/nft/GetNFTNetworksUseCase.kt @@ -19,14 +19,14 @@ class GetNFTNetworksUseCase( .filter { nftRepository.isNFTSupported(it) } .sortedBy { it.name } - val notAvailableNetworks = nftRepository + val unavailableNetworks = nftRepository .getNFTSupportedNetworks(userWalletId) .filter { supportedNetwork -> availableNetworks.none { it.id == supportedNetwork.id } } .sortedBy { it.name } NFTNetworks( availableNetworks = availableNetworks, - notAvailableNetworks = notAvailableNetworks, + unavailableNetworks = unavailableNetworks, ) } } \ No newline at end of file diff --git a/features/nft/impl/src/main/kotlin/com/tangem/features/nft/receive/entity/NFTReceiveUM.kt b/features/nft/impl/src/main/kotlin/com/tangem/features/nft/receive/entity/NFTReceiveUM.kt index eea9a23b79..6bb4b1f9f2 100644 --- a/features/nft/impl/src/main/kotlin/com/tangem/features/nft/receive/entity/NFTReceiveUM.kt +++ b/features/nft/impl/src/main/kotlin/com/tangem/features/nft/receive/entity/NFTReceiveUM.kt @@ -20,7 +20,7 @@ internal data class NFTReceiveUM( data class Content( val availableItems: ImmutableList, - val notAvailableItems: ImmutableList, + val unavailableItems: ImmutableList, ) : Networks() } } \ No newline at end of file diff --git a/features/nft/impl/src/main/kotlin/com/tangem/features/nft/receive/entity/transformer/UpdateDataStateTransformer.kt b/features/nft/impl/src/main/kotlin/com/tangem/features/nft/receive/entity/transformer/UpdateDataStateTransformer.kt index c113d54905..d9f6d6a4b0 100644 --- a/features/nft/impl/src/main/kotlin/com/tangem/features/nft/receive/entity/transformer/UpdateDataStateTransformer.kt +++ b/features/nft/impl/src/main/kotlin/com/tangem/features/nft/receive/entity/transformer/UpdateDataStateTransformer.kt @@ -17,13 +17,13 @@ internal class UpdateDataStateTransformer( override fun transform(prevState: NFTReceiveUM): NFTReceiveUM = prevState.copy( networks = when { - networks.availableNetworks.isEmpty() && networks.notAvailableNetworks.isEmpty() + networks.availableNetworks.isEmpty() && networks.unavailableNetworks.isEmpty() -> NFTReceiveUM.Networks.Empty else -> NFTReceiveUM.Networks.Content( availableItems = networks.availableNetworks .map { it.transform(true) } .toPersistentList(), - notAvailableItems = networks.notAvailableNetworks + unavailableItems = networks.unavailableNetworks .map { it.transform(false) } .toPersistentList(), ) diff --git a/features/nft/impl/src/main/kotlin/com/tangem/features/nft/receive/model/NFTReceiveModel.kt b/features/nft/impl/src/main/kotlin/com/tangem/features/nft/receive/model/NFTReceiveModel.kt index 090d51ff5c..a093929cf3 100644 --- a/features/nft/impl/src/main/kotlin/com/tangem/features/nft/receive/model/NFTReceiveModel.kt +++ b/features/nft/impl/src/main/kotlin/com/tangem/features/nft/receive/model/NFTReceiveModel.kt @@ -58,7 +58,7 @@ internal class NFTReceiveModel @Inject constructor( search = getInitialSearchBar(), networks = NFTReceiveUM.Networks.Content( availableItems = persistentListOf(), - notAvailableItems = persistentListOf(), + unavailableItems = persistentListOf(), ), bottomSheetConfig = null, ), diff --git a/features/nft/impl/src/main/kotlin/com/tangem/features/nft/receive/ui/NFTReceiveNetworksContent.kt b/features/nft/impl/src/main/kotlin/com/tangem/features/nft/receive/ui/NFTReceiveNetworksContent.kt index 8b01fd73b0..26d245c7f2 100644 --- a/features/nft/impl/src/main/kotlin/com/tangem/features/nft/receive/ui/NFTReceiveNetworksContent.kt +++ b/features/nft/impl/src/main/kotlin/com/tangem/features/nft/receive/ui/NFTReceiveNetworksContent.kt @@ -54,13 +54,13 @@ internal fun NFTReceiveNetworksContent(state: NFTReceiveUM.Networks.Content, mod } networks(state.availableItems) } - if (state.notAvailableItems.isNotEmpty()) { + if (state.unavailableItems.isNotEmpty()) { item( key = "not_available_title", ) { Title(resourceReference(R.string.nft_receive_unavailable_section_title)) } - networks(state.notAvailableItems) + networks(state.unavailableItems) } } } @@ -207,7 +207,7 @@ private fun Preview_NFTReceiveNetworksUM() { onItemClick = { }, ), ), - notAvailableItems = persistentListOf(), + unavailableItems = persistentListOf(), ), ) }