Merge pull request #285 from synonymdev/feat/transfer-activities-text

Transfer activity title and subtitle

Author: ovitrif

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

@@ -68,6 +68,11 @@ fun ActivityRow(
         is Activity.Lightning -> null
         is Activity.Onchain -> item.v1.confirmed
     }
+    val isTransfer = when (item) {
+        is Activity.Lightning -> false
+        is Activity.Onchain -> item.v1.isTransfer
+    }
+
     Row(
         verticalAlignment = Alignment.CenterVertically,
         modifier = Modifier
@@ -85,16 +90,41 @@ fun ActivityRow(
                 txType = txType,
                 isLightning = isLightning,
                 status = status,
-                confirmed = confirmed,
+                isTransfer = isTransfer
             )
             val subtitleText = when (item) {
                 is Activity.Lightning -> item.v1.message.ifEmpty { formattedTime(timestamp) }
                 is Activity.Onchain -> {
-                    if (confirmed == true) {
-                        formattedTime(timestamp)
-                    } else {
-                        // TODO: calculate confirmsIn text
-                        stringResource(R.string.wallet__activity_confirms_in).replace("{feeRateDescription}", "± 1h")
+                    when {
+                        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
+                            }
+                        }
+
+                        confirmed == true -> {
+                            formattedTime(timestamp)
+                        }
+
+                        else -> {
+                            // TODO: calculate confirmsIn text
+                            stringResource(R.string.wallet__activity_confirms_in).replace(
+                                "{feeRateDescription}",
+                                "± 1h"
+                            )
+                        }
                     }
                 }
             }
@@ -117,9 +147,10 @@ private fun TransactionStatusText(
     txType: PaymentType,
     isLightning: Boolean,
     status: PaymentState?,
-    confirmed: Boolean?,
+    isTransfer: Boolean,
 ) {
     when {
+        isTransfer -> BodyMSB(text = stringResource(R.string.wallet__activity_transfer))
         isLightning -> {
             when (txType) {
                 PaymentType.SENT -> when (status) {

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

@@ -84,7 +84,7 @@ val previewActivityItems = buildList {
         Activity.Onchain(
             OnchainActivity(
                 id = "4",
-                txType = PaymentType.RECEIVED,
+                txType = PaymentType.SENT,
                 txId = "04",
                 value = 950_000_u,
                 fee = 110_u,