feat: use x icon for dropped tx activities

Author: ovitrif

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

@@ -60,6 +60,8 @@ fun Activity.matchesPaymentId(paymentHashOrTxId: String): Boolean = when (this)
 
 fun Activity.isTransfer() = this is Activity.Onchain && this.v1.isTransfer
 
+fun Activity.doesExist() = this is Activity.Onchain && this.v1.doesExist
+
 fun Activity.Onchain.boostType() = when (this.v1.txType) {
     PaymentType.SENT -> BoostType.RBF
     PaymentType.RECEIVED -> BoostType.CPFP

app/src/main/java/to/bitkit/ui/screens/wallets/activity/components/ActivityIcon.kt

@@ -3,7 +3,7 @@ package to.bitkit.ui.screens.wallets.activity.components
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.shape.CircleShape
@@ -24,6 +24,7 @@ import com.synonym.bitkitcore.OnchainActivity
 import com.synonym.bitkitcore.PaymentState
 import com.synonym.bitkitcore.PaymentType
 import to.bitkit.R
+import to.bitkit.ext.doesExist
 import to.bitkit.ext.isBoosted
 import to.bitkit.ext.isFinished
 import to.bitkit.ext.isTransfer
@@ -46,7 +47,7 @@ fun ActivityIcon(
     val arrowIcon = painterResource(if (txType == PaymentType.SENT) R.drawable.ic_sent else R.drawable.ic_received)
 
     when {
-        activity.isBoosted() && !activity.isFinished() -> {
+        activity.isBoosted() && !activity.isFinished() && activity.doesExist() -> {
             CircularIcon(
                 icon = painterResource(R.drawable.ic_timer_alt),
                 iconColor = Colors.Yellow,
@@ -90,9 +91,14 @@ fun ActivityIcon(
             }
         }
 
+        // onchain
         else -> {
             CircularIcon(
-                icon = if (activity.isTransfer()) painterResource(R.drawable.ic_transfer) else arrowIcon,
+                icon = when {
+                    !activity.doesExist() -> painterResource(R.drawable.ic_x)
+                    activity.isTransfer() -> painterResource(R.drawable.ic_transfer)
+                    else -> arrowIcon
+                },
                 iconColor = Colors.Brand,
                 backgroundColor = Colors.Brand16,
                 size = size,
@@ -129,8 +135,8 @@ fun CircularIcon(
 @Composable
 private fun Preview() {
     AppThemeSurface {
-        Row(
-            horizontalArrangement = Arrangement.spacedBy(16.dp),
+        Column(
+            verticalArrangement = Arrangement.spacedBy(16.dp),
             modifier = Modifier.padding(16.dp),
         ) {
             // Lightning Sent Succeeded
@@ -293,6 +299,32 @@ private fun Preview() {
                     )
                 )
             )
+
+            // Onchain Removed
+            ActivityIcon(
+                activity = Activity.Onchain(
+                    v1 = OnchainActivity(
+                        id = "test-onchain-2",
+                        txType = PaymentType.SENT,
+                        txId = "abc123",
+                        value = 100000uL,
+                        fee = 500uL,
+                        feeRate = 8uL,
+                        address = "bc1...",
+                        confirmed = true,
+                        timestamp = (System.currentTimeMillis() / 1000).toULong(),
+                        isBoosted = true,
+                        boostTxIds = emptyList(),
+                        isTransfer = false,
+                        doesExist = false,
+                        confirmTimestamp = (System.currentTimeMillis() / 1000).toULong(),
+                        channelId = null,
+                        transferTxId = "transferTxId",
+                        createdAt = null,
+                        updatedAt = null,
+                    )
+                )
+            )
         }
     }
 }

app/src/main/java/to/bitkit/ui/screens/wallets/activity/components/ActivityRow.kt

@@ -99,31 +99,23 @@ fun ActivityRow(
                 is Activity.Lightning -> item.v1.message.ifEmpty { formattedTime(timestamp) }
                 is Activity.Onchain -> {
                     when {
-                        !item.v1.doesExist -> {
-                            stringResource(R.string.wallet__activity_removed)
-                        }
+                        !item.v1.doesExist -> stringResource(R.string.wallet__activity_removed)
 
-                        isTransfer && isSent -> {
-                            if (item.v1.confirmed) {
-                                stringResource(R.string.wallet__activity_transfer_spending_done)
-                            } else {
-                                stringResource(R.string.wallet__activity_transfer_spending_pending)
-                                    .replace("{duration}", "1h") // TODO: calculate confirmsIn text
-                            }
+                        isTransfer && isSent -> if (item.v1.confirmed) {
+                            stringResource(R.string.wallet__activity_transfer_spending_done)
+                        } else {
+                            stringResource(R.string.wallet__activity_transfer_spending_pending)
+                                .replace("{duration}", "1h") // TODO: calculate confirmsIn text
                         }
 
-                        isTransfer && !isSent -> {
-                            if (item.v1.confirmed) {
-                                stringResource(R.string.wallet__activity_transfer_savings_done)
-                            } else {
-                                stringResource(R.string.wallet__activity_transfer_savings_pending)
-                                    .replace("{duration}", "1h") // TODO: calculate confirmsIn text
-                            }
+                        isTransfer && !isSent -> if (item.v1.confirmed) {
+                            stringResource(R.string.wallet__activity_transfer_savings_done)
+                        } else {
+                            stringResource(R.string.wallet__activity_transfer_savings_pending)
+                                .replace("{duration}", "1h") // TODO: calculate confirmsIn text
                         }
 
-                        confirmed == true -> {
-                            formattedTime(timestamp)
-                        }
+                        confirmed == true -> formattedTime(timestamp)
 
                         else -> {
                             // TODO: calculate confirmsIn text

app/src/main/java/to/bitkit/ui/screens/wallets/activity/utils/PreviewItems.kt

@@ -23,20 +23,20 @@ val previewActivityItems = buildList {
                 id = "1",
                 txType = PaymentType.RECEIVED,
                 txId = "01",
-                value = 42_000_000_u,
+                value = 42_000_u,
                 fee = 200_u,
                 feeRate = 1_u,
                 address = "bc1",
                 confirmed = true,
                 timestamp = today.epochSecond(),
-                isBoosted = false,
-                boostTxIds = emptyList(),
-                isTransfer = true,
-                doesExist = true,
+                isBoosted = true,
+                boostTxIds = listOf("02", "03"),
+                isTransfer = false,
+                doesExist = false,
                 confirmTimestamp = today.epochSecond(),
                 channelId = "channelId",
                 transferTxId = "transferTxId",
-                createdAt = today.epochSecond(),
+                createdAt = today.epochSecond() - 30_000u,
                 updatedAt = today.epochSecond(),
             )
         )