Updated on 2026-08-14

2025-09-01 19:21:37 +03:00 · 2025-09-01 19:21:37 +03:00 · 17d7fb3c02
commit 17d7fb3c02
parent 6312034cf9
36 changed files with 311 additions and 301 deletions
--- a/data/feedback/build.gradle.kts
+++ b/data/feedback/build.gradle.kts
@ -10,7 +10,6 @@ android {
 }

 dependencies {
-
    // region AndroidX libraries
    implementation(deps.androidx.datastore)
    // endregion
@ -37,6 +36,8 @@ dependencies {

    // endregion

+    // Feature modules
+    implementation(projects.features.hotWallet.api)

    implementation(projects.domain.feedback)
    implementation(projects.domain.feedback.models)
--- a/data/feedback/src/main/java/com/tangem/data/feedback/DefaultFeedbackRepository.kt
+++ b/data/feedback/src/main/java/com/tangem/data/feedback/DefaultFeedbackRepository.kt
@ -4,12 +4,14 @@ import android.os.Build
 import com.tangem.blockchain.common.Blockchain
 import com.tangem.core.navigation.email.EmailSender
 import com.tangem.data.feedback.converters.BlockchainInfoConverter
-import com.tangem.data.feedback.converters.CardInfoConverter
+import com.tangem.data.feedback.converters.WalletMetaInfoConverter
 import com.tangem.datasource.local.logs.AppLogsStore
 import com.tangem.datasource.local.walletmanager.WalletManagersStore
+import com.tangem.domain.core.wallets.UserWalletsListRepository
 import com.tangem.domain.feedback.models.*
 import com.tangem.domain.feedback.repository.FeedbackRepository
 import com.tangem.domain.models.scan.ScanResponse
+import com.tangem.domain.models.wallet.UserWallet
 import com.tangem.domain.models.wallet.UserWalletId
 import com.tangem.domain.wallets.legacy.UserWalletsListManager
 import com.tangem.domain.wallets.usecase.GetSelectedWalletUseCase
@ -24,14 +26,19 @@ import java.io.File
 *
 * @property appLogsStore           app logs store
 * @property userWalletsListManager user wallets list manager
+ * @property useNewUserWalletsRepository flag to use new user wallets repository
+ * @property userWalletsListRepository   user wallets repository
 * @property walletManagersStore    wallet managers store
 * @property emailSender            email sender
 * @property appVersionProvider     app version provider
 *
 [REDACTED_AUTHOR]
 */
+@Suppress("LongParameterList")
 internal class DefaultFeedbackRepository(
    private val appLogsStore: AppLogsStore,
+    private val useNewUserWalletsRepository: Boolean,
+    private val userWalletsListRepository: UserWalletsListRepository,
    private val userWalletsListManager: UserWalletsListManager,
    private val walletManagersStore: WalletManagersStore,
    private val emailSender: EmailSender,
@ -41,12 +48,21 @@ internal class DefaultFeedbackRepository(

    private val blockchainsErrors = MutableStateFlow<Map<UserWalletId, BlockchainErrorInfo>>(emptyMap())

-    override fun getCardInfo(scanResponse: ScanResponse) = CardInfoConverter.convert(value = scanResponse)
+    override suspend fun getUserWalletMetaInfo(userWalletId: UserWalletId): WalletMetaInfo {
+        val userWallet = getUserWalletById(userWalletId)
+        return userWallet?.let {
+            WalletMetaInfoConverter.convert(it)
+        } ?: WalletMetaInfo(userWalletId)
+    }
+
+    override fun getUserWalletMetaInfo(scanResponse: ScanResponse): WalletMetaInfo {
+        return WalletMetaInfoConverter.convert(value = scanResponse)
+    }

    override fun getUserWalletsInfo(userWalletId: UserWalletId?): UserWalletsInfo {
        return UserWalletsInfo(
            selectedUserWalletId = userWalletId?.stringValue ?: "card isn't activated",
-            totalUserWallets = userWalletsListManager.walletsCount,
+            totalUserWallets = totalUserWallets(),
        )
    }

@ -108,4 +124,20 @@ internal class DefaultFeedbackRepository(
            ),
        )
    }
+
+    private suspend fun getUserWalletById(userWalletId: UserWalletId): UserWallet? {
+        return if (useNewUserWalletsRepository) {
+            userWalletsListRepository.userWalletsSync().find { it.walletId == userWalletId }
+        } else {
+            userWalletsListManager.userWalletsSync.find { it.walletId == userWalletId }
+        }
+    }
+
+    private fun totalUserWallets(): Int {
+        return if (useNewUserWalletsRepository) {
+            userWalletsListRepository.userWallets.value?.size ?: 0
+        } else {
+            userWalletsListManager.walletsCount
+        }
+    }
 }
--- a/data/feedback/src/main/java/com/tangem/data/feedback/converters/CardInfoConverter.kt
+++ b/data/feedback/src/main/java/com/tangem/data/feedback/converters/CardInfoConverter.kt
@ -1,41 +0,0 @@
-package com.tangem.data.feedback.converters
-
-import com.tangem.domain.card.common.TapWorkarounds.isStart2Coin
-import com.tangem.domain.card.common.TapWorkarounds.isVisa
-import com.tangem.domain.card.common.util.getBackupCardsCount
-import com.tangem.domain.feedback.models.CardInfo
-import com.tangem.domain.models.scan.CardDTO
-import com.tangem.domain.models.scan.ScanResponse
-import com.tangem.domain.models.wallet.UserWalletId
-import com.tangem.domain.wallets.builder.UserWalletIdBuilder
-import com.tangem.utils.converter.Converter
-
-/**
- * Converter from [ScanResponse] to [CardInfo]
- *
-[REDACTED_AUTHOR]
- */
-internal object CardInfoConverter : Converter<ScanResponse, CardInfo> {
-
-    override fun convert(value: ScanResponse): CardInfo {
-        return with(value) {
-            CardInfo(
-                userWalletId = createUserWalletId(scanResponse = value),
-                cardId = card.cardId,
-                cardsCount = value.getBackupCardsCount()?.toString() ?: "0",
-                firmwareVersion = card.firmwareVersion.stringValue,
-                cardBlockchain = walletData?.blockchain,
-                signedHashesList = card.wallets.map {
-                    CardInfo.SignedHashes(curve = it.curve.curve, total = it.totalSignedHashes?.toString())
-                },
-                isImported = value.card.wallets.any(CardDTO.Wallet::isImported),
-                isStart2Coin = value.card.isStart2Coin,
-                isVisa = value.card.isVisa,
-            )
-        }
-    }
-
-    private fun createUserWalletId(scanResponse: ScanResponse): UserWalletId? {
-        return UserWalletIdBuilder.scanResponse(scanResponse = scanResponse).build()
-    }
-}
--- a/data/feedback/src/main/java/com/tangem/data/feedback/converters/WalletMetaInfoConverter.kt
+++ b/data/feedback/src/main/java/com/tangem/data/feedback/converters/WalletMetaInfoConverter.kt
@ -0,0 +1,66 @@
+package com.tangem.data.feedback.converters
+
+import com.tangem.domain.card.common.TapWorkarounds.isStart2Coin
+import com.tangem.domain.card.common.TapWorkarounds.isVisa
+import com.tangem.domain.card.common.util.getBackupCardsCount
+import com.tangem.domain.feedback.models.WalletMetaInfo
+import com.tangem.domain.models.scan.CardDTO
+import com.tangem.domain.models.scan.ScanResponse
+import com.tangem.domain.models.wallet.UserWallet
+import com.tangem.domain.models.wallet.UserWalletId
+import com.tangem.domain.wallets.builder.UserWalletIdBuilder
+import com.tangem.utils.converter.Converter
+
+/**
+ * Converter from [UserWallet] to [WalletMetaInfo]
+ *
+[REDACTED_AUTHOR]
+ */
+internal object WalletMetaInfoConverter : Converter<UserWallet, WalletMetaInfo> {
+
+    override fun convert(value: UserWallet): WalletMetaInfo {
+        return when (value) {
+            is UserWallet.Cold -> {
+                WalletMetaInfo(
+                    userWalletId = value.walletId,
+                    cardId = value.scanResponse.card.cardId,
+                    cardsCount = value.getBackupCardsCount()?.toString() ?: "0",
+                    firmwareVersion = value.scanResponse.card.firmwareVersion.stringValue,
+                    cardBlockchain = value.scanResponse.walletData?.blockchain,
+                    signedHashesList = value.scanResponse.card.wallets.map {
+                        WalletMetaInfo.SignedHashes(curve = it.curve.curve, total = it.totalSignedHashes?.toString())
+                    },
+                    isImported = value.scanResponse.card.wallets.any(CardDTO.Wallet::isImported),
+                    isStart2Coin = value.scanResponse.card.isStart2Coin,
+                    isVisa = value.scanResponse.card.isVisa,
+                )
+            }
+            is UserWallet.Hot -> {
+                WalletMetaInfo(
+                    userWalletId = value.walletId,
+                    hotWalletIsBackedUp = value.backedUp,
+                )
+            }
+        }
+    }
+
+    fun convert(value: ScanResponse): WalletMetaInfo {
+        return WalletMetaInfo(
+            userWalletId = createUserWalletId(value),
+            cardId = value.card.cardId,
+            cardsCount = value.getBackupCardsCount()?.toString() ?: "0",
+            firmwareVersion = value.card.firmwareVersion.stringValue,
+            cardBlockchain = value.walletData?.blockchain,
+            signedHashesList = value.card.wallets.map {
+                WalletMetaInfo.SignedHashes(curve = it.curve.curve, total = it.totalSignedHashes?.toString())
+            },
+            isImported = value.card.wallets.any(CardDTO.Wallet::isImported),
+            isStart2Coin = value.card.isStart2Coin,
+            isVisa = value.card.isVisa,
+        )
+    }
+
+    private fun createUserWalletId(scanResponse: ScanResponse): UserWalletId? {
+        return UserWalletIdBuilder.scanResponse(scanResponse = scanResponse).build()
+    }
+}
--- a/data/feedback/src/main/java/com/tangem/data/feedback/di/FeedbackModule.kt
+++ b/data/feedback/src/main/java/com/tangem/data/feedback/di/FeedbackModule.kt
@ -6,10 +6,12 @@ import com.tangem.data.feedback.DefaultFeedbackFeatureToggles
 import com.tangem.data.feedback.DefaultFeedbackRepository
 import com.tangem.datasource.local.logs.AppLogsStore
 import com.tangem.datasource.local.walletmanager.WalletManagersStore
+import com.tangem.domain.core.wallets.UserWalletsListRepository
 import com.tangem.domain.feedback.repository.FeedbackFeatureToggles
 import com.tangem.domain.feedback.repository.FeedbackRepository
 import com.tangem.domain.wallets.legacy.UserWalletsListManager
 import com.tangem.domain.wallets.usecase.GetSelectedWalletUseCase
+import com.tangem.features.hotwallet.HotWalletFeatureToggles
 import com.tangem.utils.version.AppVersionProvider
 import dagger.Module
 import dagger.Provides
@ -26,6 +28,8 @@ internal object FeedbackModule {
    fun provideFeedbackRepository(
        appLogsStore: AppLogsStore,
        userWalletsListManager: UserWalletsListManager,
+        userWalletsListRepository: UserWalletsListRepository,
+        hotWalletFeatureToggles: HotWalletFeatureToggles,
        walletManagersStore: WalletManagersStore,
        emailSender: EmailSender,
        appVersionProvider: AppVersionProvider,
@ -37,6 +41,8 @@ internal object FeedbackModule {
            walletManagersStore = walletManagersStore,
            emailSender = emailSender,
            appVersionProvider = appVersionProvider,
+            userWalletsListRepository = userWalletsListRepository,
+            useNewUserWalletsRepository = hotWalletFeatureToggles.isHotWalletEnabled,
            getSelectedWalletUseCase = getSelectedWalletUseCase,
        )
    }