Updated on 2026-08-14

app/src/main/java/com/tangem/tap/network/auth/DefaultAuthProvider.kt

@@ -4,11 +4,16 @@ import com.tangem.common.extensions.toHexString
 import com.tangem.datasource.api.common.AuthProvider
 import com.tangem.domain.models.wallet.UserWallet
 import com.tangem.domain.wallets.legacy.UserWalletsListManager
+import com.tangem.domain.core.wallets.UserWalletsListRepository
 
-internal class DefaultAuthProvider(private val userWalletsListManager: UserWalletsListManager) : AuthProvider {
+internal class DefaultAuthProvider(
+    private val userWalletsListManager: UserWalletsListManager,
+    private val userWalletsListRepository: UserWalletsListRepository,
+    private val useNewListRepository: Boolean = false,
+) : AuthProvider {
 
-    override fun getCardPublicKey(): String {
-        val userWallet = userWalletsListManager.selectedUserWalletSync
+    override suspend fun getCardPublicKey(): String {
+        val userWallet = getSelectedWallet()
 
         if (userWallet !is UserWallet.Cold) {
             return ""
@@ -17,8 +22,8 @@ internal class DefaultAuthProvider(private val userWalletsListManager: UserWalle
         return userWallet.scanResponse.card.cardPublicKey.toHexString()
     }
 
-    override fun getCardId(): String {
-        val userWallet = userWalletsListManager.selectedUserWalletSync
+    override suspend fun getCardId(): String {
+        val userWallet = getSelectedWallet()
 
         if (userWallet !is UserWallet.Cold) {
             return ""
@@ -27,9 +32,25 @@ internal class DefaultAuthProvider(private val userWalletsListManager: UserWalle
         return userWallet.scanResponse.card.cardId
     }
 
-    override fun getCardsPublicKeys(): Map<String, String> {
-        return userWalletsListManager.userWalletsSync.filterIsInstance<UserWallet.Cold>().associate {
+    override suspend fun getCardsPublicKeys(): Map<String, String> {
+        return getWallets().filterIsInstance<UserWallet.Cold>().associate {
             it.scanResponse.card.cardId to it.scanResponse.card.cardPublicKey.toHexString()
         }
     }
+
+    private suspend fun getWallets(): List<UserWallet> {
+        return if (useNewListRepository) {
+            userWalletsListRepository.userWalletsSync()
+        } else {
+            userWalletsListManager.userWalletsSync
+        }
+    }
+
+    private suspend fun getSelectedWallet(): UserWallet? {
+        return if (useNewListRepository) {
+            userWalletsListRepository.selectedUserWalletSync()
+        } else {
+            userWalletsListManager.selectedUserWalletSync
+        }
+    }
 }

app/src/main/java/com/tangem/tap/network/auth/di/AuthModule.kt

@@ -3,6 +3,8 @@ package com.tangem.tap.network.auth.di
 import com.tangem.datasource.api.common.AuthProvider
 import com.tangem.datasource.local.config.environment.EnvironmentConfigStorage
 import com.tangem.domain.wallets.legacy.UserWalletsListManager
+import com.tangem.domain.core.wallets.UserWalletsListRepository
+import com.tangem.features.hotwallet.HotWalletFeatureToggles
 import com.tangem.lib.auth.ExpressAuthProvider
 import com.tangem.lib.auth.StakeKitAuthProvider
 import com.tangem.tap.network.auth.DefaultAppVersionProvider
@@ -22,8 +24,16 @@ internal class AuthModule {
 
     @Provides
     @Singleton
-    fun provideAuthProvider(userWalletsListManager: UserWalletsListManager): AuthProvider {
-        return DefaultAuthProvider(userWalletsListManager)
+    fun provideAuthProvider(
+        userWalletsListManager: UserWalletsListManager,
+        userWalletsListRepository: UserWalletsListRepository,
+        hotWalletFeatureToggles: HotWalletFeatureToggles,
+    ): AuthProvider {
+        return DefaultAuthProvider(
+            userWalletsListManager = userWalletsListManager,
+            userWalletsListRepository = userWalletsListRepository,
+            useNewListRepository = hotWalletFeatureToggles.isHotWalletEnabled,
+        )
     }
 
     @Provides

app/src/main/java/com/tangem/tap/network/exchangeServices/DefaultRampManager.kt

@@ -13,9 +13,9 @@ import com.tangem.domain.core.lce.Lce
 import com.tangem.domain.exchange.ExpressAvailabilityState
 import com.tangem.domain.exchange.RampStateManager
 import com.tangem.domain.models.currency.CryptoCurrency
+import com.tangem.domain.models.currency.CryptoCurrencyStatus
 import com.tangem.domain.models.wallet.UserWallet
 import com.tangem.domain.models.wallet.UserWalletId
-import com.tangem.domain.tokens.model.CryptoCurrencyStatus
 import com.tangem.domain.tokens.model.ScenarioUnavailabilityReason
 import com.tangem.domain.tokens.repository.CurrenciesRepository
 import com.tangem.domain.transaction.models.AssetRequirementsCondition

app/src/main/java/com/tangem/tap/network/exchangeServices/moonpay/MoonPayService.kt

@@ -12,7 +12,7 @@ import com.tangem.domain.core.utils.lceContent
 import com.tangem.domain.core.utils.lceError
 import com.tangem.domain.core.utils.lceLoading
 import com.tangem.domain.models.currency.CryptoCurrency
-import com.tangem.domain.models.scan.CardDTO
+import com.tangem.domain.models.wallet.UserWallet
 import com.tangem.tap.domain.model.Currency
 import com.tangem.tap.network.exchangeServices.ExchangeService
 import com.tangem.tap.network.exchangeServices.ExchangeServiceInitializationStatus
@@ -27,7 +27,7 @@ class MoonPayService(
     private val apiKey: String,
     private val secretKey: String,
     private val logEnabled: Boolean,
-    private val cardProvider: () -> CardDTO?,
+    private val userWalletProvider: () -> UserWallet?,
 ) : ExchangeService {
 
     override val initializationStatus: StateFlow<ExchangeServiceInitializationStatus>
@@ -103,8 +103,8 @@ class MoonPayService(
     }
 
     override fun availableForSell(currency: Currency): Boolean {
-        val card = cardProvider() ?: return false
-        val checkCardExchange = !card.isStart2Coin
+        val userWallet = userWalletProvider() ?: return false
+        val checkCardExchange = userWallet !is UserWallet.Cold || !userWallet.scanResponse.card.isStart2Coin
 
         if (!checkCardExchange) return false
 

app/src/main/java/com/tangem/tap/network/exchangeServices/moonpay/MoonpayBlockchainMapping.kt

@@ -158,4 +158,5 @@ internal val Blockchain.moonPaySupportedCurrency: MoonPaySupportedCurrency?
         ZkLinkNova, ZkLinkNovaTestnet -> null
         KaspaTestnet -> null
         Pepecoin, PepecoinTestnet -> null
+        Hyperliquid, HyperliquidTestnet -> null
     }