refactor: use core hw activities

app/src/main/java/to/bitkit/ext/Activities.kt

@@ -5,13 +5,24 @@ import com.synonym.bitkitcore.LightningActivity
 import com.synonym.bitkitcore.OnchainActivity
 import com.synonym.bitkitcore.PaymentState
 import com.synonym.bitkitcore.PaymentType
-import to.bitkit.models.WalletScope
+import to.bitkit.models.ActivityWalletType
+
+val DEFAULT_WALLET_ID: String get() = ActivityWalletType.BITKIT.id()
 
 fun Activity.rawId(): String = when (this) {
     is Activity.Lightning -> v1.id
     is Activity.Onchain -> v1.id
 }
 
+fun Activity.walletId(): String = when (this) {
+    is Activity.Lightning -> v1.walletId
+    is Activity.Onchain -> v1.walletId
+}
+
+fun Activity.scopedId(): String = "${walletId()}:${rawId()}"
+
+fun Activity.isFromHardwareWallet(): Boolean = ActivityWalletType.TREZOR.owns(walletId())
+
 fun Activity.txType(): PaymentType = when (this) {
     is Activity.Lightning -> v1.txType
     is Activity.Onchain -> v1.txType
@@ -95,7 +106,6 @@ enum class BoostType { RBF, CPFP }
 
 @Suppress("LongParameterList")
 fun LightningActivity.Companion.create(
-    walletId: String = WalletScope.default,
     id: String,
     txType: PaymentType,
     status: PaymentState,
@@ -109,6 +119,7 @@ fun LightningActivity.Companion.create(
     createdAt: ULong? = timestamp,
     updatedAt: ULong? = createdAt,
     seenAt: ULong? = null,
+    walletId: String = DEFAULT_WALLET_ID,
 ) = LightningActivity(
     walletId = walletId,
     id = id,
@@ -128,7 +139,6 @@ fun LightningActivity.Companion.create(
 
 @Suppress("LongParameterList")
 fun OnchainActivity.Companion.create(
-    walletId: String = WalletScope.default,
     id: String,
     txType: PaymentType,
     txId: String,
@@ -149,6 +159,7 @@ fun OnchainActivity.Companion.create(
     createdAt: ULong? = timestamp,
     updatedAt: ULong? = createdAt,
     seenAt: ULong? = null,
+    walletId: String = DEFAULT_WALLET_ID,
 ) = OnchainActivity(
     walletId = walletId,
     id = id,

app/src/main/java/to/bitkit/models/ActivityWalletType.kt

@@ -0,0 +1,15 @@
+package to.bitkit.models
+
+import java.util.Locale
+
+enum class ActivityWalletType {
+    BITKIT, TREZOR;
+
+    fun id(): String = name.lowercase(Locale.US)
+
+    fun idPrefixed(value: String): String = "${prefix()}$value"
+
+    fun owns(walletId: String): Boolean = walletId == id() || walletId.startsWith(prefix())
+
+    private fun prefix(): String = "${id()}:"
+}

app/src/main/java/to/bitkit/models/HardwareWallet.kt

@@ -37,6 +37,7 @@ data class HwWalletBalance(
 data class HwWalletReceivedTx(
     val txid: String,
     val sats: ULong,
+    val walletId: String,
 )
 
 sealed interface HwFundingAccount {

app/src/main/java/to/bitkit/models/HwWalletIdentity.kt

@@ -0,0 +1,33 @@
+package to.bitkit.models
+
+val KnownDevice.identityKey: String
+    get() = identityKey(xpubs, id)
+
+fun identityKey(xpubs: Map<String, String>, fallback: String): String =
+    xpubs.values.sorted().joinToString().ifEmpty { fallback }
+
+fun List<KnownDevice>.findWalletId(
+    deviceId: String,
+    xpubs: Map<String, String>,
+    deriveWalletId: (Collection<String>) -> String,
+): String {
+    val targetIdentityKey = identityKey(xpubs, deviceId)
+    firstOrNull { it.identityKey == targetIdentityKey }?.walletId?.takeIf { it.isNotBlank() }?.let { return it }
+    if (xpubs.values.any { it.isNotBlank() }) return deriveWalletId(xpubs.values)
+
+    return firstOrNull { it.id == deviceId }?.walletId?.takeIf { it.isNotBlank() }.orEmpty()
+}
+
+fun List<KnownDevice>.withWalletIds(
+    deriveWalletId: (Collection<String>) -> String,
+): List<KnownDevice> {
+    val existingByIdentity = filter { it.walletId.isNotBlank() }
+        .associate { it.identityKey to it.walletId }
+    val generatedByIdentity = mutableMapOf<String, String>()
+
+    return map {
+        val walletId = existingByIdentity[it.identityKey]
+            ?: generatedByIdentity.getOrPut(it.identityKey) { deriveWalletId(it.xpubs.values) }
+        if (it.walletId == walletId) it else it.copy(walletId = walletId)
+    }
+}

app/src/main/java/to/bitkit/models/NewTransactionSheetDetails.kt

@@ -10,6 +10,7 @@ data class NewTransactionSheetDetails(
     val direction: NewTransactionSheetDirection,
     val paymentHashOrTxId: String? = null,
     val activityId: String? = null,
+    val activityWalletId: String? = null,
     val sats: Long = 0,
     val isLoadingDetails: Boolean = false,
 ) {