refactor: move force close duration calculation to TransferRepo.kt

app/src/main/java/to/bitkit/models/BalanceState.kt

@@ -1,7 +1,6 @@
 package to.bitkit.models
 
 import kotlinx.serialization.Serializable
-import kotlinx.serialization.Transient
 
 @Serializable
 data class BalanceState(
@@ -11,7 +10,6 @@ data class BalanceState(
     val maxSendOnchainSats: ULong = 0uL,
     val balanceInTransferToSavings: ULong = 0uL,
     val balanceInTransferToSpending: ULong = 0uL,
-    @Transient val forceCloseRemainingDuration: String? = null,
 ) {
     val totalSats get() = totalOnchainSats + totalLightningSats
 }

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

@@ -5,6 +5,7 @@ import com.synonym.bitkitcore.ActivityFilter
 import com.synonym.bitkitcore.SortDirection
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.withContext
 import org.lightningdevkit.ldknode.ChannelDetails
@@ -16,6 +17,7 @@ import to.bitkit.ext.channelId
 import to.bitkit.ext.latestSpendingTxid
 import to.bitkit.models.TransferType
 import to.bitkit.services.CoreService
+import to.bitkit.utils.BlockTimeHelpers
 import to.bitkit.utils.Logger
 import java.util.UUID
 import javax.inject.Inject
@@ -35,6 +37,19 @@ class TransferRepo @Inject constructor(
 ) {
     val activeTransfers: Flow<List<TransferEntity>> = transferDao.getActiveTransfers()
 
+    val forceCloseRemainingDuration: Flow<String?> = combine(
+        activeTransfers,
+        lightningRepo.lightningState,
+    ) { transfers, lightningState ->
+        val forceClose = transfers.firstOrNull { it.type == TransferType.FORCE_CLOSE }
+            ?: return@combine null
+        val targetHeight = forceClose.claimableAtHeight?.toUInt() ?: return@combine null
+        val currentHeight = lightningState.block()?.height ?: return@combine null
+        val remaining = BlockTimeHelpers.blocksRemaining(targetHeight, currentHeight)
+        if (remaining <= 0) return@combine null
+        BlockTimeHelpers.getDurationForBlocks(remaining)
+    }
+
     @Suppress("LongParameterList")
     suspend fun createTransfer(
         type: TransferType,

app/src/main/java/to/bitkit/ui/ContentView.kt

@@ -809,6 +809,7 @@ private fun NavGraphBuilder.home(
         val hasSeenSpendingIntro by settingsViewModel.hasSeenSpendingIntro.collectAsStateWithLifecycle()
         val isGeoBlocked by appViewModel.isGeoBlocked.collectAsStateWithLifecycle()
         val onchainActivities by activityListViewModel.onchainActivities.collectAsStateWithLifecycle()
+        val forceCloseRemainingDuration by appViewModel.forceCloseRemainingDuration.collectAsStateWithLifecycle()
 
         SavingsWalletScreen(
             isGeoBlocked = isGeoBlocked,
@@ -824,6 +825,7 @@ private fun NavGraphBuilder.home(
                 }
             },
             onBackClick = { navController.popBackStack() },
+            forceCloseRemainingDuration = forceCloseRemainingDuration,
         )
     }
     composable<Routes.Spending>(

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

@@ -222,10 +222,10 @@ class HomeViewModel @Inject constructor(
     private suspend fun createBannersFlow() {
         combine(
             transferRepo.activeTransfers,
-            walletRepo.balanceState,
-        ) { transfers, balanceState ->
+            transferRepo.forceCloseRemainingDuration,
+        ) { transfers, remainingDuration ->
             val defaultTitle = context.getString(R.string.lightning__transfer_in_progress)
-            val savingsTitle = balanceState.forceCloseRemainingDuration?.let {
+            val savingsTitle = remainingDuration?.let {
                 context.getString(R.string.lightning__transfer_ready_in, it)
             } ?: defaultTitle
 

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

@@ -52,6 +52,7 @@ fun SavingsWalletScreen(
     onActivityItemClick: (String) -> Unit,
     onTransferToSpendingClick: () -> Unit,
     onBackClick: () -> Unit,
+    forceCloseRemainingDuration: String? = null,
     balances: BalanceState = LocalBalances.current,
 ) {
     val showEmptyState by remember(balances.totalOnchainSats, onchainActivities.size) {
@@ -102,7 +103,7 @@ fun SavingsWalletScreen(
                 if (balances.balanceInTransferToSavings > 0u) {
                     IncomingTransfer(
                         amount = balances.balanceInTransferToSavings,
-                        remainingDuration = balances.forceCloseRemainingDuration,
+                        remainingDuration = forceCloseRemainingDuration,
                         modifier = Modifier.padding(vertical = 8.dp),
                     )
                 }

app/src/main/java/to/bitkit/usecases/DeriveBalanceStateUseCase.kt

@@ -13,7 +13,6 @@ import to.bitkit.models.TransferType
 import to.bitkit.models.safe
 import to.bitkit.repositories.LightningRepo
 import to.bitkit.repositories.TransferRepo
-import to.bitkit.utils.BlockTimeHelpers
 import to.bitkit.utils.Logger
 import to.bitkit.utils.jsonLogOf
 import javax.inject.Inject
@@ -40,16 +39,13 @@ class DeriveBalanceStateUseCase @Inject constructor(
         val afterPendingChannels = balanceDetails.totalLightningBalanceSats.safe() - pendingChannelsSats.safe()
         val totalLightningSats = afterPendingChannels.safe() - toSavingsAmount.safe()
 
-        val forceCloseRemainingDuration = getForceCloseRemainingDuration(activeTransfers)
-
         val balanceState = BalanceState(
             totalOnchainSats = totalOnchainSats,
             totalLightningSats = totalLightningSats,
             maxSendLightningSats = lightningRepo.getChannels().totalNextOutboundHtlcLimitSats(),
             maxSendOnchainSats = getMaxSendAmount(balanceDetails),
             balanceInTransferToSavings = toSavingsAmount,
             balanceInTransferToSpending = toSpendingAmount,
-            forceCloseRemainingDuration = forceCloseRemainingDuration,
         )
 
         val height = lightningRepo.lightningState.value.block()?.height
@@ -120,16 +116,6 @@ class DeriveBalanceStateUseCase @Inject constructor(
         return spendableOnchainSats.safe() - fee.safe()
     }
 
-    private fun getForceCloseRemainingDuration(transfers: List<TransferEntity>): String? {
-        val forceClose = transfers.firstOrNull { it.type == TransferType.FORCE_CLOSE }
-            ?: return null
-        val targetHeight = forceClose.claimableAtHeight?.toUInt() ?: return null
-        val currentHeight = lightningRepo.lightningState.value.block()?.height ?: return null
-        val remaining = BlockTimeHelpers.blocksRemaining(targetHeight, currentHeight)
-        if (remaining <= 0) return null
-        return BlockTimeHelpers.getDurationForBlocks(remaining)
-    }
-
     companion object {
         const val TAG = "DeriveBalanceStateUseCase"
         const val FALLBACK_FEE_PERCENT = 0.1

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

@@ -176,6 +176,9 @@ class AppViewModel @Inject constructor(
     val isGeoBlocked = lightningRepo.lightningState.map { it.isGeoBlocked }
         .stateIn(viewModelScope, SharingStarted.WhileSubscribed(5000), false)
 
+    val forceCloseRemainingDuration = transferRepo.forceCloseRemainingDuration
+        .stateIn(viewModelScope, SharingStarted.WhileSubscribed(5000), null)
+
     private val _sendUiState = MutableStateFlow(SendUiState())
     val sendUiState = _sendUiState.asStateFlow()