fix: keep timed sheets behind transaction sheet

Author: ovitrif

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

@@ -11,7 +11,14 @@ data class NewTransactionSheetDetails(
     val paymentHashOrTxId: String? = null,
     val sats: Long = 0,
     val isLoadingDetails: Boolean = false,
-)
+) {
+    companion object {
+        val EMPTY = NewTransactionSheetDetails(
+            type = NewTransactionSheetType.LIGHTNING,
+            direction = NewTransactionSheetDirection.RECEIVED,
+        )
+    }
+}
 
 @Serializable
 enum class NewTransactionSheetType {

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

@@ -30,6 +30,7 @@ import kotlinx.coroutines.launch
 import kotlinx.serialization.Serializable
 import to.bitkit.androidServices.LightningNodeService
 import to.bitkit.androidServices.LightningNodeService.Companion.CHANNEL_ID_NODE
+import to.bitkit.models.NewTransactionSheetDetails
 import to.bitkit.ui.components.AuthCheckView
 import to.bitkit.ui.components.InactivityTracker
 import to.bitkit.ui.components.IsOnlineTracker
@@ -168,8 +169,8 @@ class MainActivity : FragmentActivity() {
                     }
                 )
 
-                val showNewTransaction by appViewModel.showNewTransaction.collectAsStateWithLifecycle()
-                if (showNewTransaction) {
+                val transactionSheetDetails by appViewModel.transactionSheet.collectAsStateWithLifecycle()
+                if (transactionSheetDetails != NewTransactionSheetDetails.EMPTY) {
                     NewTransactionSheet(
                         appViewModel = appViewModel,
                         currencyViewModel = currencyViewModel,

app/src/main/java/to/bitkit/ui/screens/transfer/SettingUpScreen.kt

@@ -69,9 +69,9 @@ fun SettingUpScreen(
 
     // Effect to disable new transaction sheet for channel purchase
     DisposableEffect(Unit) {
-        app.setNewTransactionSheetEnabled(false)
+        app.enabledTransactionSheet(false)
         onDispose {
-            app.setNewTransactionSheetEnabled(true)
+            app.enabledTransactionSheet(true)
         }
     }
 

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

@@ -33,7 +33,7 @@ fun GiftSheet(
 
     val onSuccessState = rememberUpdatedState { details: NewTransactionSheetDetails ->
         appViewModel.hideSheet()
-        appViewModel.showNewTransactionSheet(details)
+        appViewModel.showTransactionSheet(details)
     }
 
     LaunchedEffect(Unit) {

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

@@ -57,7 +57,7 @@ fun NewTransactionSheet(
     modifier: Modifier = Modifier,
 ) {
     val currencies by currencyViewModel.uiState.collectAsState()
-    val newTransaction by appViewModel.newTransaction.collectAsState()
+    val details by appViewModel.transactionSheet.collectAsState()
 
     CompositionLocalProvider(
         LocalCurrencyViewModel provides currencyViewModel,
@@ -68,7 +68,7 @@ fun NewTransactionSheet(
             onDismissRequest = { appViewModel.hideNewTransactionSheet() },
         ) {
             NewTransactionSheetView(
-                details = newTransaction,
+                details = details,
                 onCloseClick = { appViewModel.hideNewTransactionSheet() },
                 onDetailClick = {
                     appViewModel.onClickActivityDetail()

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

@@ -37,7 +37,6 @@ import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.SharingStarted
-import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asSharedFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.first
@@ -316,7 +315,7 @@ class AppViewModel @Inject constructor(
         val cjitEntry = channel?.let { blocktankRepo.getCjitEntry(it) }
         if (cjitEntry != null) {
             val amount = channel.amountOnClose.toLong()
-            showNewTransactionSheet(
+            showTransactionSheet(
                 NewTransactionSheetDetails(
                     type = NewTransactionSheetType.LIGHTNING,
                     direction = NewTransactionSheetDirection.RECEIVED,
@@ -359,7 +358,7 @@ class AppViewModel @Inject constructor(
         val result = notifyPaymentReceivedHandler(command).getOrNull()
         if (result !is NotifyPaymentReceived.Result.ShowSheet) return
 
-        showNewTransactionSheet(result.sheet)
+        showTransactionSheet(result.sheet)
     }
 
     private fun notifyTransactionUnconfirmed() = toast(
@@ -1223,10 +1222,10 @@ class AppViewModel @Inject constructor(
     }
 
     fun onClickActivityDetail() {
-        val activityType = _newTransaction.value.type.toActivityFilter()
-        val txType = _newTransaction.value.direction.toTxType()
-        val paymentHashOrTxId = _newTransaction.value.paymentHashOrTxId ?: return
-        _newTransaction.update { it.copy(isLoadingDetails = true) }
+        val activityType = _transactionSheet.value.type.toActivityFilter()
+        val txType = _transactionSheet.value.direction.toTxType()
+        val paymentHashOrTxId = _transactionSheet.value.paymentHashOrTxId ?: return
+        _transactionSheet.update { it.copy(isLoadingDetails = true) }
         viewModelScope.launch {
             activityRepo.findActivityByPaymentId(
                 paymentHashOrTxId = paymentHashOrTxId,
@@ -1235,13 +1234,13 @@ class AppViewModel @Inject constructor(
                 retry = true
             ).onSuccess { activity ->
                 hideNewTransactionSheet()
-                _newTransaction.update { it.copy(isLoadingDetails = false) }
+                _transactionSheet.update { it.copy(isLoadingDetails = false) }
                 val nextRoute = Routes.ActivityDetail(activity.rawId())
                 mainScreenEffect(MainScreenEffect.Navigate(nextRoute))
             }.onFailure { e ->
                 Logger.error(msg = "Activity not found", context = TAG)
                 toast(e)
-                _newTransaction.update { it.copy(isLoadingDetails = false) }
+                _transactionSheet.update { it.copy(isLoadingDetails = false) }
             }
         }
     }
@@ -1446,18 +1445,10 @@ class AppViewModel @Inject constructor(
     // endregion
 
     // region TxSheet
-    private var _isNewTransactionSheetEnabled = true
-    private val _showNewTransaction = MutableStateFlow(false)
-    val showNewTransaction: StateFlow<Boolean> = _showNewTransaction.asStateFlow()
+    private var _isTransactionSheetEnabled = true
 
-    private val _newTransaction = MutableStateFlow(
-        NewTransactionSheetDetails(
-            type = NewTransactionSheetType.LIGHTNING,
-            direction = NewTransactionSheetDirection.RECEIVED,
-        )
-    )
-
-    val newTransaction = _newTransaction.asStateFlow()
+    private val _transactionSheet = MutableStateFlow(NewTransactionSheetDetails.EMPTY)
+    val transactionSheet = _transactionSheet.asStateFlow()
 
     private val _successSendUiState = MutableStateFlow(
         NewTransactionSheetDetails(
@@ -1468,32 +1459,31 @@ class AppViewModel @Inject constructor(
 
     val successSendUiState = _successSendUiState.asStateFlow()
 
-    fun setNewTransactionSheetEnabled(enabled: Boolean) {
-        _isNewTransactionSheetEnabled = enabled
+    fun enabledTransactionSheet(enabled: Boolean) {
+        _isTransactionSheetEnabled = enabled
     }
 
-    fun showNewTransactionSheet(
+    fun showTransactionSheet(
         details: NewTransactionSheetDetails,
     ) = viewModelScope.launch {
         if (backupRepo.isRestoring.value) return@launch
 
-        if (!_isNewTransactionSheetEnabled) {
+        if (!_isTransactionSheetEnabled) {
             Logger.verbose("NewTransactionSheet blocked by isNewTransactionSheetEnabled=false", context = TAG)
             return@launch
         }
 
-        hideSheet()
-
-        _showNewTransaction.update { true }
-        _newTransaction.update { details }
+        _transactionSheet.update { details }
     }
 
-    fun hideNewTransactionSheet() = _showNewTransaction.update { false }
+    fun hideNewTransactionSheet() {
+        _transactionSheet.update { NewTransactionSheetDetails.EMPTY }
+    }
 
     fun consumePaymentReceivedInBackground() = viewModelScope.launch(bgDispatcher) {
         val details = cacheStore.data.first().backgroundReceive ?: return@launch
         cacheStore.clearBackgroundReceive()
-        showNewTransactionSheet(details)
+        showTransactionSheet(details)
     }
     // endregion
 
@@ -1714,8 +1704,6 @@ class AppViewModel @Inject constructor(
             return
         }
 
-        if (backupRepo.isRestoring.value) return
-
         timedSheetsScope?.cancel()
         timedSheetsScope = CoroutineScope(bgDispatcher + SupervisorJob())
         timedSheetsScope?.launch {