chore: cleanup

Author: ovitrif

app/src/main/java/to/bitkit/services/CoreService.kt

@@ -38,7 +38,6 @@ import com.synonym.bitkitcore.getOrders
 import com.synonym.bitkitcore.getTags
 import com.synonym.bitkitcore.initDb
 import com.synonym.bitkitcore.insertActivity
-import com.synonym.bitkitcore.isAddressUsed
 import com.synonym.bitkitcore.openChannel
 import com.synonym.bitkitcore.refreshActiveCjitEntries
 import com.synonym.bitkitcore.refreshActiveOrders
@@ -366,20 +365,6 @@ class ActivityService(
         getAllClosedChannels(sortDirection)
     }
 
-    /**
-     * Maps all `PaymentDetails` from LDK Node to bitkit-core [Activity] records.
-     *
-     * Payments are parallelly processed in chunks, handling both on-chain and Lightning payments
-     * to create new activity records or updating existing ones based on the payment's status and details.
-     *
-     * It's designed to be idempotent, meaning it can be called multiple times with the same payment
-     * list without creating duplicate entries. It checks the `updatedAt` timestamp to avoid overwriting
-     * newer local data with older data from LDK.
-     *
-     * @param payments The list of `PaymentDetails` from the LDK node to be processed.
-     * @param forceUpdate If true, it will also update activities previously marked as deleted.
-     * @param channelIdsByTxId Map of transaction IDs to channel IDs for identifying transfer activities.
-     */
     suspend fun handlePaymentEvent(paymentHash: String) {
         ServiceQueue.CORE.background {
             val payments = lightningService.payments ?: run {
@@ -555,7 +540,7 @@ class ActivityService(
         val timestamp: ULong,
     )
 
-    private suspend fun getConfirmationStatus(
+    private fun getConfirmationStatus(
         kind: PaymentKind.Onchain,
         timestamp: ULong,
     ): ConfirmationData {
@@ -575,7 +560,7 @@ class ActivityService(
         return ConfirmationData(isConfirmed, confirmedTimestamp, timestamp)
     }
 
-    private suspend fun buildUpdatedOnchainActivity(
+    private fun buildUpdatedOnchainActivity(
         existingActivity: Activity.Onchain,
         confirmationData: ConfirmationData,
         channelId: String? = null,
@@ -602,7 +587,7 @@ class ActivityService(
         return updatedOnChain
     }
 
-    private suspend fun buildNewOnchainActivity(
+    private fun buildNewOnchainActivity(
         payment: PaymentDetails,
         kind: PaymentKind.Onchain,
         confirmationData: ConfirmationData,
@@ -876,7 +861,7 @@ class ActivityService(
         }
     }
 
-    private suspend fun markReplacedActivity(
+    private fun markReplacedActivity(
         txid: String,
         replacedActivity: OnchainActivity?,
         conflicts: List<String>,
@@ -1144,7 +1129,7 @@ class ActivityService(
         channels: List<ChannelDetails>,
     ): String? {
         return runCatching {
-            val blocktank = coreService.blocktank ?: return null
+            val blocktank = coreService.blocktank
             val orders = blocktank.orders(orderIds = null, filter = null, refresh = false)
             val matchingOrder = orders.firstOrNull { order ->
                 order.payment?.onchain?.transactions?.any { transaction -> transaction.txId == txid } == true

app/src/main/java/to/bitkit/services/LightningService.kt

@@ -33,6 +33,7 @@ import org.lightningdevkit.ldknode.PaymentDetails
 import org.lightningdevkit.ldknode.PaymentId
 import org.lightningdevkit.ldknode.PeerDetails
 import org.lightningdevkit.ldknode.SpendableUtxo
+import org.lightningdevkit.ldknode.TransactionDetails
 import org.lightningdevkit.ldknode.Txid
 import org.lightningdevkit.ldknode.defaultConfig
 import to.bitkit.async.BaseCoroutineScope
@@ -695,7 +696,7 @@ class LightningService @Inject constructor(
     // endregion
 
     // region transaction details
-    suspend fun getTransactionDetails(txid: Txid): org.lightningdevkit.ldknode.TransactionDetails? {
+    suspend fun getTransactionDetails(txid: Txid): TransactionDetails? {
         val node = this.node ?: return null
         return ServiceQueue.LDK.background {
             try {

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

@@ -20,6 +20,7 @@ import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.Icon
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.ReadOnlyComposable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
@@ -45,7 +46,6 @@ import com.synonym.bitkitcore.PaymentState
 import com.synonym.bitkitcore.PaymentType
 import to.bitkit.R
 import to.bitkit.ext.ellipsisMiddle
-import to.bitkit.ext.isBoosted
 import to.bitkit.ext.isSent
 import to.bitkit.ext.isTransfer
 import to.bitkit.ext.rawId
@@ -109,10 +109,10 @@ fun ActivityDetailScreen(
         detailViewModel.setActivity(item)
         if (item is Activity.Onchain) {
             isCpfpChild = detailViewModel.isCpfpChildTransaction(item.v1.txId)
-            if (item.v1.boostTxIds.isNotEmpty()) {
-                boostTxDoesExist = detailViewModel.getBoostTxDoesExist(item.v1.boostTxIds)
+            boostTxDoesExist = if (item.v1.boostTxIds.isNotEmpty()) {
+                detailViewModel.getBoostTxDoesExist(item.v1.boostTxIds)
             } else {
-                boostTxDoesExist = emptyMap()
+                emptyMap()
             }
         } else {
             isCpfpChild = false
@@ -864,20 +864,19 @@ private fun PreviewSheetSmallScreen() {
     }
 }
 
+@ReadOnlyComposable
 @Composable
 private fun shouldEnableBoostButton(
     item: Activity,
     isCpfpChild: Boolean,
-    boostTxDoesExist: Map<String, Boolean>
+    boostTxDoesExist: Map<String, Boolean>,
 ): Boolean {
     if (item !is Activity.Onchain) return false
 
     val activity = item.v1
 
     // Check all disable conditions
-    val shouldDisable = isCpfpChild ||
-        !activity.doesExist ||
-        activity.confirmed == true ||
+    val shouldDisable = isCpfpChild || !activity.doesExist || activity.confirmed ||
         (activity.isBoosted && isBoostCompleted(activity, boostTxDoesExist))
 
     if (shouldDisable) return false
@@ -886,10 +885,11 @@ private fun shouldEnableBoostButton(
     return !activity.isTransfer && activity.value > 0uL
 }
 
+@ReadOnlyComposable
 @Composable
 private fun isBoostCompleted(
     activity: OnchainActivity,
-    boostTxDoesExist: Map<String, Boolean>
+    boostTxDoesExist: Map<String, Boolean>,
 ): Boolean {
     // If boostTxIds is empty, boost is in progress (RBF case)
     if (activity.boostTxIds.isEmpty()) return true

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

@@ -83,10 +83,10 @@ fun ActivityRow(
     var isCpfpChild by remember { mutableStateOf(false) }
 
     LaunchedEffect(item) {
-        if (item is Activity.Onchain && activityListViewModel != null) {
-            isCpfpChild = activityListViewModel.isCpfpChildTransaction(item.v1.txId)
+        isCpfpChild = if (item is Activity.Onchain && activityListViewModel != null) {
+            activityListViewModel.isCpfpChildTransaction(item.v1.txId)
         } else {
-            isCpfpChild = false
+            false
         }
     }