Update code to reduce duplication

Author: ben-kaufman

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

@@ -39,6 +39,13 @@ fun List<ChannelDetails>?.totalNextOutboundHtlcLimitSats(): ULong {
         ?: 0u
 }
 
+/** Calculates the total remote balance (inbound capacity) from open channels. */
+fun List<ChannelDetails>.calculateRemoteBalance(): ULong {
+    return this
+        .filterOpen()
+        .sumOf { it.inboundCapacityMsat / 1000u }
+}
+
 fun createChannelDetails(): ChannelDetails {
     return ChannelDetails(
         channelId = "channelId",

app/src/main/java/to/bitkit/repositories/LightningRepo.kt

@@ -94,7 +94,7 @@ class LightningRepo @Inject constructor(
      * @param operation Lambda to execute when the node is running
      * @return Result of the operation, or failure if node isn't running or operation fails
      */
-    private suspend fun <T> executeWhenNodeRunning(
+    suspend fun <T> executeWhenNodeRunning(
         operationName: String,
         waitTimeout: Duration = 1.minutes,
         operation: suspend () -> Result<T>,

app/src/main/java/to/bitkit/ui/settings/lightning/LightningConnectionsViewModel.kt

@@ -21,6 +21,7 @@ import org.lightningdevkit.ldknode.OutPoint
 import to.bitkit.R
 import to.bitkit.di.BgDispatcher
 import to.bitkit.ext.amountOnClose
+import to.bitkit.ext.calculateRemoteBalance
 import to.bitkit.ext.createChannelDetails
 import to.bitkit.ext.filterOpen
 import to.bitkit.ext.filterPending
@@ -82,7 +83,7 @@ class LightningConnectionsViewModel @Inject constructor(
                         .map { it.mapToUiModel() },
                     failedOrders = getFailedOrdersAsChannels(blocktankState.paidOrders).map { it.mapToUiModel() },
                     localBalance = calculateLocalBalance(channels),
-                    remoteBalance = calculateRemoteBalance(channels),
+                    remoteBalance = channels.calculateRemoteBalance(),
                 )
             }.collect { newState ->
                 _uiState.update { newState }
@@ -263,12 +264,6 @@ class LightningConnectionsViewModel @Inject constructor(
             .sumOf { it.amountOnClose }
     }
 
-    private fun calculateRemoteBalance(channels: List<ChannelDetails>): ULong {
-        return channels
-            .filterOpen()
-            .sumOf { it.inboundCapacityMsat / 1000u }
-    }
-
     fun zipLogsForSharing(onReady: (Uri) -> Unit) {
         viewModelScope.launch {
             logsRepo.zipLogsForSharing()

app/src/main/java/to/bitkit/ui/sheets/GiftLoading.kt

@@ -3,7 +3,6 @@ package to.bitkit.ui.sheets
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.aspectRatio
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.navigationBarsPadding
@@ -24,6 +23,7 @@ import to.bitkit.models.formatToModernDisplay
 import to.bitkit.ui.LocalCurrencies
 import to.bitkit.ui.components.BodyM
 import to.bitkit.ui.components.Display
+import to.bitkit.ui.components.FillHeight
 import to.bitkit.ui.components.MoneySSB
 import to.bitkit.ui.components.SheetSize
 import to.bitkit.ui.components.VerticalSpacer
@@ -127,7 +127,7 @@ private fun Content(
             color = Colors.White64,
         )
 
-        Spacer(modifier = Modifier.weight(1f))
+        FillHeight()
 
         Image(
             painter = painterResource(R.drawable.gift),

app/src/main/java/to/bitkit/ui/sheets/GiftViewModel.kt

@@ -14,23 +14,25 @@ import kotlinx.coroutines.flow.asSharedFlow
 import kotlinx.coroutines.launch
 import to.bitkit.async.ServiceQueue
 import to.bitkit.di.BgDispatcher
+import to.bitkit.ext.calculateRemoteBalance
 import to.bitkit.models.NewTransactionSheetDetails
 import to.bitkit.models.NewTransactionSheetDirection
 import to.bitkit.models.NewTransactionSheetType
+import to.bitkit.repositories.ActivityRepo
 import to.bitkit.repositories.BlocktankRepo
 import to.bitkit.repositories.LightningRepo
-import to.bitkit.services.CoreService
 import to.bitkit.services.LightningService
 import to.bitkit.utils.Logger
 import javax.inject.Inject
+import kotlin.time.Duration.Companion.milliseconds
 
 @HiltViewModel
 class GiftViewModel @Inject constructor(
     @BgDispatcher private val bgDispatcher: CoroutineDispatcher,
     private val lightningRepo: LightningRepo,
     private val lightningService: LightningService,
-    private val coreService: CoreService,
     private val blocktankRepo: BlocktankRepo,
+    private val activityRepo: ActivityRepo,
 ) : ViewModel() {
 
     private val _navigationEvent = MutableSharedFlow<GiftRoute>(extraBufferCapacity = 1)
@@ -62,10 +64,17 @@ class GiftViewModel @Inject constructor(
 
         isClaiming = true
         runCatching {
-            waitForPeers()
+            lightningRepo.executeWhenNodeRunning(
+                operationName = "waitForNodeRunning",
+                waitTimeout = NODE_STARTUP_TIMEOUT_MS.milliseconds,
+            ) {
+                Result.success(Unit)
+            }.getOrThrow()
+
+            delay(PEER_CONNECTION_DELAY_MS)
 
             val channels = lightningRepo.lightningState.value.channels
-            val maxInboundCapacity = channels.sumOf { it.inboundCapacityMsat / 1000u }
+            val maxInboundCapacity = channels.calculateRemoteBalance()
 
             if (maxInboundCapacity >= amount) {
                 claimWithLiquidity()
@@ -78,22 +87,6 @@ class GiftViewModel @Inject constructor(
         }
     }
 
-    private suspend fun waitForPeers() {
-        val nodeLifecycleState = lightningRepo.lightningState.value.nodeLifecycleState
-        if (!nodeLifecycleState.isRunning()) {
-            val startTime = System.currentTimeMillis()
-            while (!lightningRepo.lightningState.value.nodeLifecycleState.isRunning()) {
-                if (System.currentTimeMillis() - startTime > NODE_STARTUP_TIMEOUT_MS) {
-                    Logger.warn("Timeout waiting for node to be running", context = TAG)
-                    error("Timeout waiting for node to be running")
-                }
-                delay(NODE_STATE_CHECK_INTERVAL_MS)
-            }
-        }
-
-        delay(PEER_CONNECTION_DELAY_MS)
-    }
-
     private suspend fun claimWithLiquidity() {
         runCatching {
             val invoice = lightningService.receive(
@@ -144,7 +137,7 @@ class GiftViewModel @Inject constructor(
                 updatedAt = null,
             )
 
-            coreService.activity.insert(Activity.Lightning(lightningActivity))
+            activityRepo.insertActivity(Activity.Lightning(lightningActivity)).getOrThrow()
 
             isClaiming = false
             _successEvent.emit(
@@ -190,6 +183,5 @@ class GiftViewModel @Inject constructor(
         private const val TAG = "GiftViewModel"
         private const val NODE_STARTUP_TIMEOUT_MS = 30_000L
         private const val PEER_CONNECTION_DELAY_MS = 2_000L
-        private const val NODE_STATE_CHECK_INTERVAL_MS = 500L
     }
 }