Updated on 2026-08-14

app/src/main/java/com/tangem/tap/features/details/redux/walletconnect/WalletConnectMiddleware.kt

@@ -16,15 +16,17 @@ import com.tangem.tap.common.redux.navigation.NavigationAction
 import com.tangem.tap.currenciesRepository
 import com.tangem.tap.domain.extensions.isMultiwalletAllowed
 import com.tangem.tap.domain.extensions.makeWalletManagerForApp
-import com.tangem.tap.domain.tokens.BlockchainNetwork
+import com.tangem.tap.domain.tokens.models.BlockchainNetwork
 import com.tangem.tap.domain.walletconnect.BnbHelper
 import com.tangem.tap.domain.walletconnect.WalletConnectManager
 import com.tangem.tap.domain.walletconnect.WalletConnectNetworkUtils
 import com.tangem.tap.features.demo.DemoHelper
 import com.tangem.tap.features.wallet.redux.Currency
 import com.tangem.tap.features.wallet.redux.WalletAction
+import com.tangem.tap.scope
 import com.tangem.tap.store
 import com.tangem.wallet.R
+import kotlinx.coroutines.launch
 import org.rekotlin.Action
 import org.rekotlin.Middleware
 
@@ -257,14 +259,16 @@ class WalletConnectMiddleware {
                 blockchainToMake,
                 card.derivationStyle?.let { DerivationParams.Default(it) }
             )
-            if (currenciesRepository.loadSavedCurrencies(card.cardId, card.settings.isHDWalletAllowed)
-                    .find { it.blockchain == blockchainToMake } != null
-            ) {
-                walletManager?.let {
-                    currenciesRepository.saveUpdatedCurrency(
-                        card.cardId,
-                        BlockchainNetwork.fromWalletManager(walletManager)
-                    )
+            scope.launch {
+                if (currenciesRepository.loadSavedCurrencies(card.cardId, card.settings.isHDWalletAllowed)
+                        .find { it.blockchain == blockchainToMake } != null
+                ) {
+                    walletManager?.let {
+                        currenciesRepository.saveUpdatedCurrency(
+                            card.cardId,
+                            BlockchainNetwork.fromWalletManager(walletManager)
+                        )
+                    }
                 }
             }
             return walletManager

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

@@ -24,7 +24,7 @@ import com.tangem.tap.domain.TangemSigner
 import com.tangem.tap.domain.TapError
 import com.tangem.tap.domain.configurable.warningMessage.WarningMessage
 import com.tangem.tap.domain.extensions.minimalAmount
-import com.tangem.tap.domain.tokens.BlockchainNetwork
+import com.tangem.tap.domain.tokens.models.BlockchainNetwork
 import com.tangem.tap.features.demo.DemoTransactionSender
 import com.tangem.tap.features.demo.isDemoWallet
 import com.tangem.tap.features.send.redux.*

app/src/main/java/com/tangem/tap/features/tokens/redux/TokensAction.kt

@@ -17,7 +17,8 @@ sealed class TokensAction : Action {
         val supportedBlockchains: List<Blockchain>? = null,
         val scanResponse: ScanResponse? = null
     ) : TokensAction() {
-        data class Success(val currencies: List<Currency>) : TokensAction()
+        data class Success(val currencies: List<Currency>, val loadMore: Boolean) : TokensAction()
+        object Failure : TokensAction()
     }
 
     data class SetAddedCurrencies(
@@ -32,4 +33,6 @@ sealed class TokensAction : Action {
     ) : TokensAction()
 
     object PrepareAndNavigateToAddCustomToken : TokensAction()
+
+    data class SetSearchInput(val searchInput: String) : TokensAction()
 }

app/src/main/java/com/tangem/tap/features/tokens/redux/TokensMiddleware.kt

@@ -8,11 +8,13 @@ import com.tangem.common.card.EllipticCurve
 import com.tangem.common.extensions.ByteArrayKey
 import com.tangem.common.extensions.toMapKey
 import com.tangem.common.hdWallet.DerivationPath
+import com.tangem.common.services.Result
 import com.tangem.domain.DomainWrapped
 import com.tangem.domain.common.KeyWalletPublicKey
 import com.tangem.domain.common.ScanResponse
 import com.tangem.domain.common.TapWorkarounds.derivationStyle
 import com.tangem.domain.common.TapWorkarounds.isTestCard
+import com.tangem.domain.common.extensions.supportedBlockchains
 import com.tangem.domain.features.addCustomToken.CustomCurrency
 import com.tangem.domain.features.addCustomToken.redux.AddCustomTokenAction
 import com.tangem.domain.redux.domainStore
@@ -26,10 +28,10 @@ import com.tangem.tap.common.redux.navigation.AppScreen
 import com.tangem.tap.common.redux.navigation.NavigationAction
 import com.tangem.tap.domain.TapError
 import com.tangem.tap.domain.extensions.makeWalletManagerForApp
-import com.tangem.tap.domain.tokens.BlockchainNetwork
+import com.tangem.tap.domain.tokens.LoadAvailableCoinsService
+import com.tangem.tap.domain.tokens.models.BlockchainNetwork
 import com.tangem.tap.features.wallet.redux.Currency
 import com.tangem.tap.features.wallet.redux.WalletAction
-import kotlinx.coroutines.async
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import org.rekotlin.Middleware
@@ -40,26 +42,65 @@ class TokensMiddleware {
         { next ->
             { action ->
                 when (action) {
-                    is TokensAction.LoadCurrencies -> handleLoadCurrencies(action)
+                    is TokensAction.LoadCurrencies -> handleLoadCurrencies(action.scanResponse)
                     is TokensAction.SaveChanges -> handleSaveChanges(action)
-                    is TokensAction.PrepareAndNavigateToAddCustomToken -> handleAddingCustomToken(action)
+                    is TokensAction.PrepareAndNavigateToAddCustomToken -> handleAddingCustomToken(
+                        action
+                    )
+                    is TokensAction.SetSearchInput -> {
+                        handleLoadCurrencies(
+                            scanResponse = store.state.globalState.scanResponse,
+                            action.searchInput
+                        )
+                    }
+
                 }
                 next(action)
             }
         }
     }
 
-    private fun handleLoadCurrencies(action: TokensAction.LoadCurrencies) {
-        val scanResponse = store.state.globalState.scanResponse
+    private fun handleLoadCurrencies(scanResponse: ScanResponse?, newSearchInput: String? = null) {
+        val tokensState = store.state.tokensState
+
         val isTestcard = scanResponse?.card?.isTestCard ?: false
 
+        val supportedBlockchains: List<Blockchain> =
+            scanResponse?.card?.supportedBlockchains() ?: Blockchain.values().toList()
+                .filter { !it.isTestnet() }
+
+        val loadCoinsService = LoadAvailableCoinsService(
+            store.state.domainNetworks.tangemTechService,
+            currenciesRepository
+        )
+
         scope.launch {
-            val currencies = async {
-                currenciesRepository.getSupportedTokens(isTestcard)
-                    .filter(action.supportedBlockchains?.toSet())
+
+            val loadCoinsResult = if (newSearchInput == null) {
+                loadCoinsService.getSupportedTokens(
+                    isTestcard,
+                    supportedBlockchains,
+                    tokensState.pageToLoad,
+                    tokensState.searchInput
+                )
+            } else {
+                loadCoinsService.getSupportedTokens(
+                    isTestcard, supportedBlockchains, 0, newSearchInput.ifBlank { null }
+                )
             }
-            delay(600)
-            store.dispatchOnMain(TokensAction.LoadCurrencies.Success(currencies.await()))
+            when (loadCoinsResult) {
+                is Result.Success -> {
+                    val currencies = loadCoinsResult.data.currencies
+                        .filter(supportedBlockchains.toSet())
+                    store.dispatchOnMain(
+                        TokensAction.LoadCurrencies.Success(
+                            currencies, loadCoinsResult.data.moreAvailable
+                        )
+                    )
+                }
+                is Result.Failure -> store.dispatchOnMain(TokensAction.LoadCurrencies.Failure)
+            }
+
         }
     }
 
@@ -74,7 +115,8 @@ class TokensMiddleware {
         )
 
         val blockchainsToAdd = action.addedBlockchains.filter { !currentBlockchains.contains(it) }
-        val blockchainsToRemove = currentBlockchains.filter { !action.addedBlockchains.contains(it) }
+        val blockchainsToRemove =
+            currentBlockchains.filter { !action.addedBlockchains.contains(it) }
 
         val tokensToAdd = action.addedTokens.filter { !currentTokens.contains(it) }
         val tokensToRemove = currentTokens.filter { token ->
@@ -82,11 +124,13 @@ class TokensMiddleware {
         }
         val derivationStyle = scanResponse.card.derivationStyle
 
-        removeCurrenciesIfNeeded(convertToCurrencies(
-            blockchains = blockchainsToRemove,
-            tokens = tokensToRemove,
-            derivationStyle = derivationStyle
-        ))
+        removeCurrenciesIfNeeded(
+            convertToCurrencies(
+                blockchains = blockchainsToRemove,
+                tokens = tokensToRemove,
+                derivationStyle = derivationStyle
+            )
+        )
 
         if (tokensToAdd.isEmpty() && blockchainsToAdd.isEmpty()) {
             store.dispatchDebugErrorNotification("Nothing to save")
@@ -246,7 +290,8 @@ class TokensMiddleware {
                     val rawDerivationPath = currency.derivationPath
                         ?: currency.blockchain.derivationPath(derivationStyle)?.rawPath
 
-                    val blockchainNetwork = BlockchainNetwork(currency.blockchain, rawDerivationPath, emptyList())
+                    val blockchainNetwork =
+                        BlockchainNetwork(currency.blockchain, rawDerivationPath, emptyList())
                     WalletAction.MultiWallet.AddToken(currency.token, blockchainNetwork)
                 }
             }
@@ -297,8 +342,15 @@ class TokensMiddleware {
             walletStore.walletsData.map { walletData -> walletData.currency }
         }.flatten().map {
             when (it) {
-                is Currency.Blockchain -> DomainWrapped.Currency.Blockchain(it.blockchain, it.derivationPath)
-                is Currency.Token -> DomainWrapped.Currency.Token(it.token, it.blockchain, it.derivationPath)
+                is Currency.Blockchain -> DomainWrapped.Currency.Blockchain(
+                    it.blockchain,
+                    it.derivationPath
+                )
+                is Currency.Token -> DomainWrapped.Currency.Token(
+                    it.token,
+                    it.blockchain,
+                    it.derivationPath
+                )
             }
         }
         domainStore.dispatch(AddCustomTokenAction.Init.SetAddedCurrencies(addedCurrencies))

app/src/main/java/com/tangem/tap/features/tokens/redux/TokensReducer.kt

@@ -15,9 +15,24 @@ private fun internalReduce(action: Action, state: AppState): TokensState {
     val tokensState = state.tokensState
     return when (action) {
         is TokensAction.ResetState -> TokensState()
-        is TokensAction.LoadCurrencies -> tokensState.copy(scanResponse = action.scanResponse)
+        is TokensAction.LoadCurrencies -> {
+            val loadingState = if (tokensState.currencies.isEmpty()) {
+                LoadCoinsState.LOADING
+            } else {
+                LoadCoinsState.LOADED
+            }
+            tokensState.copy(
+                scanResponse = action.scanResponse,
+                loadCoinsState = loadingState
+            )
+        }
         is TokensAction.LoadCurrencies.Success -> {
-            tokensState.copy(currencies = action.currencies)
+            tokensState.copy(
+                currencies = tokensState.currencies + action.currencies,
+                needToLoadMore = action.loadMore,
+                pageToLoad = tokensState.pageToLoad + 1,
+                loadCoinsState = LoadCoinsState.LOADED
+            )
         }
         is TokensAction.SetAddedCurrencies -> {
 
@@ -38,6 +53,15 @@ private fun internalReduce(action: Action, state: AppState): TokensState {
         is TokensAction.AllowToAddTokens -> {
             tokensState.copy(allowToAdd = action.allow)
         }
+        is TokensAction.SetSearchInput -> {
+            tokensState.copy(
+                searchInput = action.searchInput.ifBlank { null },
+                needToLoadMore = true,
+                currencies = emptyList(),
+                pageToLoad = 0,
+                loadCoinsState = LoadCoinsState.LOADING
+            )
+        }
         else -> tokensState
     }
 }

app/src/main/java/com/tangem/tap/features/tokens/redux/TokensState.kt

@@ -17,9 +17,13 @@ data class TokensState(
     val nonRemovableTokens: List<ContractAddress> = emptyList(),
     val nonRemovableBlockchains: List<Blockchain> = emptyList(),
     val currencies: List<Currency> = emptyList(),
+    val searchInput: String? = null,
     val allowToAdd: Boolean = true,
     val derivationStyle: DerivationStyle? = null,
-    val scanResponse: ScanResponse? = null
+    val scanResponse: ScanResponse? = null,
+    val needToLoadMore: Boolean = true,
+    val pageToLoad: Int = 0,
+    val loadCoinsState: LoadCoinsState = LoadCoinsState.LOADING,
 ) : StateType {
 
     fun canHandleToken(token: TokenWithBlockchain): Boolean {
@@ -74,4 +78,8 @@ fun List<Currency>.filter(supportedBlockchains: Set<Blockchain>?): List<Currency
     }.filterNot {
         it.contracts.isNullOrEmpty() && !supportedBlockchains.contains(Blockchain.fromNetworkId(it.id))
     }
+}
+
+enum class LoadCoinsState {
+    LOADING, LOADED, ERROR
 }

app/src/main/java/com/tangem/tap/features/tokens/ui/AddTokensFragment.kt

@@ -17,6 +17,7 @@ import com.google.accompanist.appcompattheme.AppCompatTheme
 import com.tangem.blockchain.common.Blockchain
 import com.tangem.tap.common.extensions.copyToClipboard
 import com.tangem.tap.common.extensions.dispatchNotification
+import com.tangem.tap.common.extensions.dispatchOnMain
 import com.tangem.tap.common.extensions.getString
 import com.tangem.tap.common.redux.navigation.NavigationAction
 import com.tangem.tap.features.tokens.redux.ContractAddress
@@ -46,6 +47,7 @@ class AddTokensFragment : Fragment(R.layout.fragment_add_tokens),
         activity?.onBackPressedDispatcher?.addCallback(this, object : OnBackPressedCallback(true) {
             override fun handleOnBackPressed() {
                 store.dispatch(NavigationAction.PopBackTo())
+                store.dispatch(TokensAction.ResetState)
             }
         })
         val inflater = TransitionInflater.from(requireContext())
@@ -81,13 +83,17 @@ class AddTokensFragment : Fragment(R.layout.fragment_add_tokens),
             store.dispatchNotification(R.string.contract_address_copied_message)
         }
 
+        val onLoadMore = {
+            store.dispatch(TokensAction.LoadCurrencies(scanResponse = store.state.globalState.scanResponse))
+        }
+
         cvCurrencies.setContent {
             AppCompatTheme {
                 CurrenciesScreen(
                     tokensState = tokensState,
-                    searchInput = searchInput,
                     onSaveChanges = onSaveChanges,
-                    onNetworkItemClicked = onNetworkItemClicked
+                    onNetworkItemClicked = onNetworkItemClicked,
+                    onLoadMore = onLoadMore
                 )
             }
         }
@@ -123,10 +129,11 @@ class AddTokensFragment : Fragment(R.layout.fragment_add_tokens),
         searchView.queryHint = searchView.getString(R.string.add_token_search_hint)
         searchView.maxWidth = android.R.attr.width
         searchView.inputtedTextAsFlow()
-            .debounce(400)
+            .debounce(800)
             .distinctUntilChanged()
             .onEach {
                 searchInput.value = it.lowercase()
+                dispatchOnMain(TokensAction.SetSearchInput(searchInput.value))
             }
             .launchIn(mainScope)
         return super.onCreateOptionsMenu(menu, inflater)

app/src/main/java/com/tangem/tap/features/tokens/ui/compose/CurrenciesScreen.kt

@@ -27,6 +27,7 @@ import com.tangem.tap.common.extensions.pixelsToDp
 import com.tangem.tap.common.redux.AppDialog
 import com.tangem.tap.domain.tokens.Currency
 import com.tangem.tap.features.tokens.redux.ContractAddress
+import com.tangem.tap.features.tokens.redux.LoadCoinsState
 import com.tangem.tap.features.tokens.redux.TokenWithBlockchain
 import com.tangem.tap.features.tokens.redux.TokensState
 import com.tangem.tap.store
@@ -35,9 +36,9 @@ import com.tangem.wallet.R
 @Composable
 fun CurrenciesScreen(
     tokensState: MutableState<TokensState> = mutableStateOf(store.state.tokensState),
-    searchInput: MutableState<String>,
     onSaveChanges: (List<TokenWithBlockchain>, List<Blockchain>) -> Unit,
-    onNetworkItemClicked: (ContractAddress) -> Unit
+    onNetworkItemClicked: (ContractAddress) -> Unit,
+    onLoadMore: () -> Unit
 ) {
     val context = LocalContext.current
     val addedTokensState = remember { mutableStateOf(tokensState.value.addedTokens) }
@@ -76,7 +77,7 @@ fun CurrenciesScreen(
     ) {
 
         AnimatedVisibility(
-            visible = tokensState.value.currencies.isEmpty(),
+            visible = tokensState.value.loadCoinsState == LoadCoinsState.LOADING,
             enter = fadeIn(),
             exit = fadeOut()
         ) {
@@ -90,7 +91,7 @@ fun CurrenciesScreen(
             }
         }
         AnimatedVisibility(
-            visible = tokensState.value.currencies.isNotEmpty(),
+            visible = tokensState.value.loadCoinsState == LoadCoinsState.LOADED,
             enter = fadeIn(animationSpec = tween(1000)),
             exit = fadeOut(animationSpec = tween(1000))
         ) {
@@ -103,7 +104,6 @@ fun CurrenciesScreen(
                     nonRemovableBlockchains = tokensState.value.nonRemovableBlockchains,
                     addedTokens = addedTokensState.value,
                     addedBlockchains = addedBlockchainsState.value,
-                    searchInput = searchInput.value,
                     allowToAdd = tokensState.value.allowToAdd,
                     onAddCurrencyToggled = { currency, token ->
                         onAddCurrencyToggleClick(currency, token)
@@ -118,7 +118,8 @@ fun CurrenciesScreen(
                         }
 
                     },
-                    onNetworkItemClicked = onNetworkItemClicked
+                    onNetworkItemClicked = onNetworkItemClicked,
+                    onLoadMore = onLoadMore
                 )
             }
         }

app/src/main/java/com/tangem/tap/features/tokens/ui/compose/ListOfCurrencies.kt

@@ -3,8 +3,9 @@ package com.tangem.tap.features.tokens.ui.compose
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.lazy.itemsIndexed
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.SideEffect
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
@@ -23,10 +24,10 @@ fun ListOfCurrencies(
     nonRemovableBlockchains: List<Blockchain>,
     addedTokens: List<TokenWithBlockchain>,
     addedBlockchains: List<Blockchain>,
-    searchInput: String,
     allowToAdd: Boolean,
     onAddCurrencyToggled: (Currency, TokenWithBlockchain?) -> Unit,
-    onNetworkItemClicked: (ContractAddress) -> Unit
+    onNetworkItemClicked: (ContractAddress) -> Unit,
+    onLoadMore: () -> Unit
 ) {
 
     val expandedCurrencies = remember { mutableStateOf(listOf("")) }
@@ -46,31 +47,28 @@ fun ListOfCurrencies(
             .fillMaxSize(),
         contentPadding = PaddingValues(bottom = 90.dp)
     ) {
-
-        val filteredCurrencies = if (searchInput.isBlank()) {
-            currencies
-        } else {
-            currencies.asSequence().filter {
-                it.name.lowercase().contains(searchInput) || it.symbol.lowercase()
-                    .contains(searchInput)
-            }.toList()
-        }
         item { header() }
-        items(filteredCurrencies) { currency ->
-            CurrencyItem(
-                currency = currency,
-                nonRemovableTokens = nonRemovableTokens,
-                nonRemovableBlockchains = nonRemovableBlockchains,
-                addedTokens = addedTokens,
-                addedBlockchains = addedBlockchains,
-                allowToAdd = allowToAdd,
-                expanded = expandedCurrencies.value.contains(currency.id),
-                onCurrencyClick = onCurrencyClick,
-                onAddCurrencyToggled = onAddCurrencyToggled,
-                onNetworkItemClicked = onNetworkItemClicked
-            )
-        }
+        itemsIndexed(currencies) { index, currency ->
+            val lastIndex = currencies.lastIndex
+            if (currencies.isNotEmpty()) {
+                if (index + 40 == lastIndex) {
+                    SideEffect { onLoadMore() }
+                }
+                CurrencyItem(
+                    currency = currency,
+                    nonRemovableTokens = nonRemovableTokens,
+                    nonRemovableBlockchains = nonRemovableBlockchains,
+                    addedTokens = addedTokens,
+                    addedBlockchains = addedBlockchains,
+                    allowToAdd = allowToAdd,
+                    expanded = expandedCurrencies.value.contains(currency.id),
+                    onCurrencyClick = onCurrencyClick,
+                    onAddCurrencyToggled = onAddCurrencyToggled,
+                    onNetworkItemClicked = onNetworkItemClicked
+                )
+            }
 
+        }
     }
 }
 

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

@@ -1,11 +1,7 @@
 package com.tangem.tap.features.wallet.redux
 
 import android.content.Context
-import com.tangem.blockchain.common.Amount
-import com.tangem.blockchain.common.Blockchain
-import com.tangem.blockchain.common.Token
-import com.tangem.blockchain.common.Wallet
-import com.tangem.blockchain.common.WalletManager
+import com.tangem.blockchain.common.*
 import com.tangem.blockchain.common.address.AddressType
 import com.tangem.common.card.Card
 import com.tangem.tap.common.entities.FiatCurrency
@@ -13,10 +9,10 @@ import com.tangem.tap.common.redux.ErrorAction
 import com.tangem.tap.common.redux.NotificationAction
 import com.tangem.tap.domain.TapError
 import com.tangem.tap.domain.configurable.warningMessage.WarningMessage
-import com.tangem.tap.domain.tokens.BlockchainNetwork
+import com.tangem.tap.domain.tokens.models.BlockchainNetwork
 import com.tangem.wallet.R
-import java.math.BigDecimal
 import org.rekotlin.Action
+import java.math.BigDecimal
 
 sealed class WalletAction : Action {
 

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

@@ -1,13 +1,7 @@
 package com.tangem.tap.features.wallet.redux
 
 import android.graphics.Bitmap
-import com.tangem.blockchain.common.Amount
-import com.tangem.blockchain.common.AmountType
-import com.tangem.blockchain.common.Blockchain
-import com.tangem.blockchain.common.DerivationStyle
-import com.tangem.blockchain.common.Token
-import com.tangem.blockchain.common.Wallet
-import com.tangem.blockchain.common.WalletManager
+import com.tangem.blockchain.common.*
 import com.tangem.blockchain.common.address.AddressType
 import com.tangem.blockchain.extensions.isAboveZero
 import com.tangem.common.extensions.isZero
@@ -23,21 +17,16 @@ import com.tangem.tap.domain.configurable.warningMessage.WarningMessage
 import com.tangem.tap.domain.extensions.buyIsAllowed
 import com.tangem.tap.domain.extensions.sellIsAllowed
 import com.tangem.tap.domain.extensions.toSendableAmounts
-import com.tangem.tap.domain.tokens.BlockchainNetwork
+import com.tangem.tap.domain.tokens.models.BlockchainNetwork
 import com.tangem.tap.features.onboarding.products.twins.redux.TwinCardsState
 import com.tangem.tap.features.tokens.redux.TokenWithBlockchain
-import com.tangem.tap.features.wallet.models.PendingTransaction
-import com.tangem.tap.features.wallet.models.TotalBalance
-import com.tangem.tap.features.wallet.models.WalletRent
-import com.tangem.tap.features.wallet.models.WalletWarning
-import com.tangem.tap.features.wallet.models.toPendingTransactions
-import com.tangem.tap.features.wallet.models.toPendingTransactionsForToken
+import com.tangem.tap.features.wallet.models.*
 import com.tangem.tap.features.wallet.ui.BalanceStatus
 import com.tangem.tap.features.wallet.ui.BalanceWidgetData
 import com.tangem.tap.network.exchangeServices.CurrencyExchangeManager
 import com.tangem.tap.store
-import java.math.BigDecimal
 import org.rekotlin.StateType
+import java.math.BigDecimal
 import kotlin.properties.ReadOnlyProperty
 
 data class WalletState(

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

@@ -9,7 +9,7 @@ import com.tangem.tap.common.redux.navigation.AppScreen
 import com.tangem.tap.common.redux.navigation.NavigationAction
 import com.tangem.tap.currenciesRepository
 import com.tangem.tap.domain.extensions.makeWalletManagerForApp
-import com.tangem.tap.domain.tokens.BlockchainNetwork
+import com.tangem.tap.domain.tokens.models.BlockchainNetwork
 import com.tangem.tap.features.demo.DemoHelper
 import com.tangem.tap.features.demo.isDemoCard
 import com.tangem.tap.features.wallet.redux.Currency

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

@@ -7,7 +7,7 @@ import com.tangem.common.extensions.isZero
 import com.tangem.tap.common.extensions.toFiatString
 import com.tangem.tap.common.extensions.toFormattedCurrencyString
 import com.tangem.tap.domain.getFirstToken
-import com.tangem.tap.domain.tokens.BlockchainNetwork
+import com.tangem.tap.domain.tokens.models.BlockchainNetwork
 import com.tangem.tap.features.wallet.models.removeUnknownTransactions
 import com.tangem.tap.features.wallet.models.toPendingTransactions
 import com.tangem.tap.features.wallet.redux.*

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

@@ -8,7 +8,7 @@ import com.tangem.tap.common.extensions.toFiatValue
 import com.tangem.tap.common.extensions.toFormattedCurrencyString
 import com.tangem.tap.common.extensions.toFormattedFiatValue
 import com.tangem.tap.domain.getFirstToken
-import com.tangem.tap.domain.tokens.BlockchainNetwork
+import com.tangem.tap.domain.tokens.models.BlockchainNetwork
 import com.tangem.tap.features.wallet.models.removeUnknownTransactions
 import com.tangem.tap.features.wallet.models.toPendingTransactions
 import com.tangem.tap.features.wallet.redux.*

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

@@ -14,7 +14,7 @@ import com.tangem.tap.common.redux.AppState
 import com.tangem.tap.domain.TapError
 import com.tangem.tap.domain.extensions.getArtworkUrl
 import com.tangem.tap.domain.getFirstToken
-import com.tangem.tap.domain.tokens.BlockchainNetwork
+import com.tangem.tap.domain.tokens.models.BlockchainNetwork
 import com.tangem.tap.features.wallet.models.WalletRent
 import com.tangem.tap.features.wallet.redux.*
 import com.tangem.tap.features.wallet.ui.BalanceStatus

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

@@ -19,7 +19,7 @@ import com.tangem.tap.common.extensions.*
 import com.tangem.tap.common.recyclerView.SpaceItemDecoration
 import com.tangem.tap.common.redux.StateDialog
 import com.tangem.tap.common.redux.navigation.NavigationAction
-import com.tangem.tap.domain.tokens.BlockchainNetwork
+import com.tangem.tap.domain.tokens.models.BlockchainNetwork
 import com.tangem.tap.features.onboarding.getQRReceiveMessage
 import com.tangem.tap.features.wallet.models.PendingTransaction
 import com.tangem.tap.features.wallet.redux.*

app/src/main/java/com/tangem/tap/features/wallet/ui/test/TestWalletDetailsActions.kt

@@ -4,7 +4,7 @@ import com.tangem.blockchain.common.Amount
 import com.tangem.blockchain.common.WalletManager
 import com.tangem.tap.common.TestAction
 import com.tangem.tap.common.TestActions
-import com.tangem.tap.domain.tokens.BlockchainNetwork
+import com.tangem.tap.domain.tokens.models.BlockchainNetwork
 import com.tangem.tap.features.wallet.redux.WalletAction
 import com.tangem.tap.store
 import java.math.BigDecimal