diff --git a/app/src/main/java/com/tangem/tap/common/analytics/paramsInterceptor/CardContextInterceptor.kt b/app/src/main/java/com/tangem/tap/common/analytics/paramsInterceptor/CardContextInterceptor.kt
index 0db51098a3..6db15ac882 100644
--- a/app/src/main/java/com/tangem/tap/common/analytics/paramsInterceptor/CardContextInterceptor.kt
+++ b/app/src/main/java/com/tangem/tap/common/analytics/paramsInterceptor/CardContextInterceptor.kt
@@ -45,6 +45,7 @@ class CardContextInterceptor(
             ProductType.Note -> "Note"
             ProductType.Twins -> "Twin"
             ProductType.Wallet -> "Wallet"
+            ProductType.Wallet2 -> "Wallet 2.0"
             ProductType.Start2Coin -> "Start2Coin"
             else -> if (DemoHelper.isDemoCard(scanResponse)) {
                 if (DemoHelper.isTestDemoCard(scanResponse)) {
diff --git a/app/src/main/java/com/tangem/tap/domain/tasks/product/ScanProductTask.kt b/app/src/main/java/com/tangem/tap/domain/tasks/product/ScanProductTask.kt
index 31a7a1ade4..b587dee326 100644
--- a/app/src/main/java/com/tangem/tap/domain/tasks/product/ScanProductTask.kt
+++ b/app/src/main/java/com/tangem/tap/domain/tasks/product/ScanProductTask.kt
@@ -216,7 +216,7 @@ private class ScanWalletProcessor(
         session: CardSession,
         callback: (result: CompletionResult<ScanResponse>) -> Unit,
     ) {
-        val productType = ProductType.Wallet
+        val productType = getWalletProductType(card)
         val config = CardConfig.createConfig(card)
         scope.launch {
             val scanResponse = ScanResponse(
@@ -280,6 +280,14 @@ private class ScanWalletProcessor(
         return blockchainsToDerive.distinct()
     }
 
+    private fun getWalletProductType(card: CardDTO): ProductType {
+        return if (card.firmwareVersion >= FirmwareVersion.Ed25519Slip0010Available) {
+            ProductType.Wallet2
+        } else {
+            ProductType.Wallet
+        }
+    }
+
     private fun getDefaultBlockchains(
         derivationStyleProvider: DerivationStyleProvider,
     ): MutableList<BlockchainNetwork> {
diff --git a/domain/legacy/src/main/java/com/tangem/domain/common/extensions/Blockchain.kt b/domain/legacy/src/main/java/com/tangem/domain/common/extensions/Blockchain.kt
index 0970e85d77..3d315d3d8e 100644
--- a/domain/legacy/src/main/java/com/tangem/domain/common/extensions/Blockchain.kt
+++ b/domain/legacy/src/main/java/com/tangem/domain/common/extensions/Blockchain.kt
@@ -175,7 +175,6 @@ fun Blockchain.toCoinId(): String {
         Blockchain.Dash -> "dash"
         Blockchain.Kaspa -> "kaspa"
         Blockchain.TON, Blockchain.TONTestnet -> "the-open-network"
-        Blockchain.Unknown -> "unknown"
         Blockchain.Kava, Blockchain.KavaTestnet -> "kava"
         Blockchain.Ravencoin, Blockchain.RavencoinTestnet -> "ravencoin"
         Blockchain.Cosmos, Blockchain.CosmosTestnet -> "cosmos"
@@ -185,8 +184,8 @@ fun Blockchain.toCoinId(): String {
         Blockchain.Telos, Blockchain.TelosTestnet -> "telos"
         Blockchain.AlephZero, Blockchain.AlephZeroTestnet -> "aleph-zero"
         Blockchain.OctaSpace, Blockchain.OctaSpaceTestnet -> "octaspace"
-        Blockchain.Chia -> "chia"
-        Blockchain.ChiaTestnet -> "chia/test"
+        Blockchain.Chia, Blockchain.ChiaTestnet -> "chia"
+        Blockchain.Unknown -> "unknown"
     }
 }
 
diff --git a/domain/models/src/main/kotlin/com/tangem/domain/models/scan/ScanResponse.kt b/domain/models/src/main/kotlin/com/tangem/domain/models/scan/ScanResponse.kt
index c6f1d9f75c..74a552e520 100644
--- a/domain/models/src/main/kotlin/com/tangem/domain/models/scan/ScanResponse.kt
+++ b/domain/models/src/main/kotlin/com/tangem/domain/models/scan/ScanResponse.kt
@@ -21,5 +21,5 @@ data class ScanResponse(
 typealias KeyWalletPublicKey = ByteArrayKey
 
 enum class ProductType {
-    Note, Twins, Wallet, Start2Coin
+    Note, Twins, Wallet, Start2Coin, Wallet2
 }
\ No newline at end of file