Merge pull request #273 from synonymdev/feat/self-send

Activity self-send UI

Author: jvsena42

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

@@ -28,7 +28,7 @@ fun Activity.totalValue() = when(this) {
 }
 
 fun Activity.canBeBoosted() = when (this) {
-    is Activity.Onchain -> !v1.confirmed && v1.doesExist && !v1.isBoosted && !v1.isTransfer
+    is Activity.Onchain -> !v1.confirmed && v1.doesExist && !v1.isBoosted && !v1.isTransfer && v1.value > 0uL
     else -> false
 }
 

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

@@ -157,7 +157,7 @@ fun ActivityDetailScreen(
                         app.toast(
                             type = Toast.ToastType.ERROR,
                             title = context.getString(R.string.wallet__send_fee_error),
-                            description = "Unable to increase the fee any further. Otherwise, it will exceed half the current input balance" //TODO CREATE STRING RESOURCE
+                            description = "Unable to increase the fee any further. Otherwise, it will exceed half the current input balance" // TODO CREATE STRING RESOURCE
                         )
                     },
                     onMinFee = {
@@ -206,6 +206,7 @@ private fun ActivityDetailContent(
         is Activity.Lightning -> item.v1.fee
         is Activity.Onchain -> item.v1.fee
     }
+    val isSelfSend = isSent && paymentValue == 0uL
 
     Column(
         modifier = Modifier
@@ -226,7 +227,7 @@ private fun ActivityDetailContent(
                 forceShowBalance = true,
                 modifier = Modifier.weight(1f)
             )
-            ActivityIcon(activity = item, size = 48.dp)
+            ActivityIcon(activity = item, size = 48.dp) // TODO Display the user avatar when selfsend
         }
 
         Spacer(modifier = Modifier.height(16.dp))
@@ -289,7 +290,11 @@ private fun ActivityDetailContent(
             ) {
                 Column(modifier = Modifier.weight(1f)) {
                     Caption13Up(
-                        text = stringResource(R.string.wallet__activity_payment),
+                        text = if (isSelfSend) {
+                            "Sent to myself" // TODO translation
+                        } else {
+                            stringResource(R.string.wallet__activity_payment)
+                        },
                         color = Colors.White64,
                         modifier = Modifier.padding(top = 16.dp, bottom = 8.dp)
                     )
@@ -406,6 +411,7 @@ private fun ActivityDetailContent(
                     text = stringResource(R.string.wallet__activity_assign),
                     size = ButtonSize.Small,
                     onClick = { /* TODO: Implement assign functionality */ },
+                    enabled = !isSelfSend,
                     icon = {
                         Icon(
                             painter = painterResource(R.drawable.ic_user_plus),
@@ -436,7 +442,13 @@ private fun ActivityDetailContent(
                 modifier = Modifier.fillMaxWidth()
             ) {
                 PrimaryButton(
-                    text = stringResource(if (item.isBoosted()) R.string.wallet__activity_boosted else R.string.wallet__activity_boost),
+                    text = stringResource(
+                        if (item.isBoosted()) {
+                            R.string.wallet__activity_boosted
+                        } else {
+                            R.string.wallet__activity_boost
+                        }
+                    ),
                     size = ButtonSize.Small,
                     onClick = onClickBoost,
                     enabled = item.canBeBoosted(),

app/src/main/java/to/bitkit/viewmodels/ActivityDetailViewModel.kt

@@ -24,7 +24,6 @@ class ActivityDetailViewModel @Inject constructor(
     @BgDispatcher private val bgDispatcher: CoroutineDispatcher,
     private val addressChecker: AddressChecker,
     private val coreService: CoreService,
-    private val lightningRepo: LightningRepo,
     private val settingsStore: SettingsStore,
 ) : ViewModel() {
     private val _txDetails = MutableStateFlow<TxDetails?>(null)