Updated on 2026-08-14

app/src/main/java/com/tangem/tap/domain/TapWalletManager.kt

@@ -179,35 +179,29 @@ class TapWalletManager {
     }
 
     private suspend fun loadUserCurrencies(scanResponse: ScanResponse, walletManagerFactory: WalletManagerFactory) {
-        when (val tokensResult = userTokensRepository.getUserTokens(scanResponse.card)) {
-            is Result.Success -> {
-                withMainContext {
-                    val blockchainNetworks = tokensResult.data.toBlockchainNetworks()
-                    val walletManagers = walletManagerFactory.makeWalletManagersForApp(scanResponse, tokensResult.data)
+        val userTokens = userTokensRepository.getUserTokens(scanResponse.card)
+        withMainContext {
+            val blockchainNetworks = userTokens.toBlockchainNetworks()
+            val walletManagers = walletManagerFactory.makeWalletManagersForApp(scanResponse, userTokens)
+            store.dispatch(
+                WalletAction.MultiWallet.AddBlockchains(
+                    blockchains = blockchainNetworks,
+                    walletManagers = walletManagers,
+                    save = false,
+                ),
+            )
+
+            blockchainNetworks.filter { it.tokens.isNotEmpty() }
+                .map {
                     store.dispatch(
-                        WalletAction.MultiWallet.AddBlockchains(
-                            blockchains = blockchainNetworks,
-                            walletManagers = walletManagers,
+                        WalletAction.MultiWallet.AddTokens(
+                            tokens = it.tokens,
+                            blockchain = it,
                             save = false,
                         ),
                     )
-
-                    blockchainNetworks.filter { it.tokens.isNotEmpty() }
-                        .map {
-                            store.dispatch(
-                                WalletAction.MultiWallet.AddTokens(
-                                    tokens = it.tokens,
-                                    blockchain = it,
-                                    save = false,
-                                ),
-                            )
-                        }
-                    checkIfDerivationsAreMissing(blockchainNetworks, scanResponse)
                 }
-            }
-            is Result.Failure -> {
-                return
-            }
+            checkIfDerivationsAreMissing(blockchainNetworks, scanResponse)
         }
     }
 

app/src/main/java/com/tangem/tap/domain/tokens/UserTokensRepository.kt

@@ -24,20 +24,20 @@ class UserTokensRepository(
     private val storageService: UserTokensStorageService,
     private val networkService: UserTokensNetworkService,
 ) {
-    suspend fun getUserTokens(card: Card): Result<List<Currency>> {
+    suspend fun getUserTokens(card: Card): List<Currency> {
         if (DemoHelper.isDemoCardId(card.cardId)) {
-            return Result.Success(loadDemoCurrencies())
+            return loadDemoCurrencies()
         }
         val userId = card.getUserId()
         if (!NetworkConnectivity.getInstance().isOnlineOrConnecting()) {
-            return Result.Success(loadTokensOffline(card, userId))
+            return loadTokensOffline(card, userId)
         }
 
         return when (val networkResult = networkService.getUserTokens(userId)) {
             is Result.Success -> {
                 val tokens = networkResult.data.tokens.map { Currency.fromTokenResponse(it) }
                 storageService.saveUserTokens(card.getUserId(), tokens)
-                Result.Success(tokens)
+                tokens
             }
             is Result.Failure -> {
                 handleGetUserTokensFailure(card = card, userId = userId, error = networkResult.error)
@@ -73,16 +73,16 @@ class UserTokensRepository(
         card: Card,
         userId: String,
         error: Throwable,
-    ): Result<List<Currency>> {
+    ): List<Currency> {
         return when (error) {
             is NoDataError -> {
                 val tokens = storageService.getUserTokens(card)
                 coroutineScope { launch { networkService.saveUserTokens(userId = userId, tokens = tokens) } }
-                Result.Success(tokens)
+                tokens
             }
             else -> {
                 val tokens = storageService.getUserTokens(userId) ?: storageService.getUserTokens(card)
-                Result.Success(tokens)
+                tokens
             }
         }
     }

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

@@ -39,7 +39,7 @@ sealed class WalletAction : Action {
         data class NoAccount(
             val wallet: Wallet,
             val blockchain: BlockchainNetwork,
-            val amountToCreateAccount: String
+            val amountToCreateAccount: String,
         ) : WalletAction()
 
         data class Failure(val wallet: Wallet, val errorMessage: String? = null) : WalletAction()
@@ -47,6 +47,10 @@ sealed class WalletAction : Action {
 
     data class SetArtworkId(val artworkId: String?) : WalletAction()
 
+    sealed class UserTokens : WalletAction() {
+        object Loading : UserTokens()
+        object Loaded : UserTokens()
+    }
 
     sealed class MultiWallet : WalletAction() {
         data class SetIsMultiwalletAllowed(val isMultiwalletAllowed: Boolean) : MultiWallet()

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

@@ -45,6 +45,7 @@ data class WalletState(
     val totalBalance: TotalBalance? = null,
     val showBackupWarning: Boolean = false,
     val missingDerivations: List<BlockchainNetwork> = emptyList(),
+    val loadingUserTokens: Boolean = false,
 ) : StateType {
 
     // if you do not delegate - the application crashes on startup,

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

@@ -314,6 +314,8 @@ private fun internalReduce(action: Action, state: AppState): WalletState {
         is WalletAction.AppCurrencyAction -> {
             newState = appCurrencyReducer.reduce(action, newState)
         }
+        is WalletAction.UserTokens.Loading -> newState = newState.copy(loadingUserTokens = true)
+        is WalletAction.UserTokens.Loaded -> newState = newState.copy(loadingUserTokens = false)
         else -> { /* no-op */
         }
     }

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

@@ -81,6 +81,8 @@ class MultiWalletView : WalletView() {
         handleRescanWarning(binding, state.missingDerivations.isNotEmpty())
         walletsAdapter.submitList(state.walletsData, state.primaryBlockchain, state.primaryToken)
 
+        binding.pbLoadingUserTokens.show(state.loadingUserTokens)
+
         binding.btnAddToken.setOnClickListener {
             val card = store.state.globalState.scanResponse!!.card
             store.dispatch(

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

@@ -20,6 +20,7 @@ class SaltPaySingleWalletView : WalletView() {
         btnAddToken.hide()
         rvPendingTransaction.hide()
         tvTwinCardNumber.hide()
+        pbLoadingUserTokens.hide()
         lCardBalance.root.hide()
         lAddress.root.hide()
         lSingleWalletBalance.root.show()

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

@@ -36,6 +36,7 @@ class SingleWalletView : WalletView() {
         rvMultiwallet.hide()
         btnAddToken.hide()
         rvPendingTransaction.hide()
+        pbLoadingUserTokens.hide()
         lCardBalance.root.show()
         lAddress.root.show()
         lSingleWalletBalance.root.hide()

app/src/main/res/layout/fragment_wallet.xml

@@ -191,11 +191,31 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="16dp"
+                    android:layout_marginBottom="16dp"
                     android:nestedScrollingEnabled="false"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/rv_pending_transaction" />
 
+                <ProgressBar
+                    android:id="@+id/pb_loading_user_tokens"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:indeterminate="true"
+                    android:indeterminateTint="@color/icon_accent"
+                    android:indeterminateTintMode="src_atop"
+                    android:nestedScrollingEnabled="false"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/rv_pending_transaction" />
+
+                <androidx.constraintlayout.widget.Barrier
+                    android:id="@+id/barrier_wallets"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    app:barrierDirection="bottom"
+                    app:constraint_referenced_ids="rv_multiwallet,pb_loading_user_tokens" />
+
                 <com.google.android.material.button.MaterialButton
                     android:id="@+id/btn_add_token"
                     style="@style/BaseTapButton"
@@ -210,7 +230,7 @@
                     android:visibility="gone"
                     app:cornerRadius="8dp"
                     app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/rv_multiwallet"
+                    app:layout_constraintTop_toBottomOf="@id/barrier_wallets"
                     app:layout_constraintVertical_bias="0.0"
                     tools:layout_editor_absoluteX="16dp" />