Skip to content

Commit 708ce95

Browse files
committed
fix: Disable new transaction sheet in channel purchase flow
1 parent 6f1de1b commit 708ce95

File tree

3 files changed

+23
-1
lines changed

3 files changed

+23
-1
lines changed

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package to.bitkit.models
33
import android.content.Context
44
import android.content.SharedPreferences
55
import kotlinx.serialization.Serializable
6-
import kotlinx.serialization.encodeToString
76
import to.bitkit.data.APP_PREFS
87
import to.bitkit.di.json
98
import to.bitkit.utils.Logger

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

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import androidx.compose.material3.ExperimentalMaterial3Api
1515
import androidx.compose.material3.Icon
1616
import androidx.compose.material3.IconButton
1717
import androidx.compose.runtime.Composable
18+
import androidx.compose.runtime.DisposableEffect
1819
import androidx.compose.runtime.LaunchedEffect
1920
import androidx.compose.runtime.collectAsState
2021
import androidx.compose.runtime.getValue
@@ -31,6 +32,7 @@ import kotlinx.coroutines.delay
3132
import org.lightningdevkit.ldknode.Network
3233
import to.bitkit.R
3334
import to.bitkit.env.Env
35+
import to.bitkit.ui.appViewModel
3436
import to.bitkit.ui.components.BodyM
3537
import to.bitkit.ui.components.Display
3638
import to.bitkit.ui.components.PrimaryButton
@@ -52,6 +54,7 @@ fun SettingUpScreen(
5254
onContinueClick: () -> Unit = {},
5355
onCloseClick: () -> Unit = {},
5456
) {
57+
val app = appViewModel ?: return
5558
val lightningSetupStep by viewModel.lightningSetupStep.collectAsState()
5659

5760
LaunchedEffect(Unit) {
@@ -71,6 +74,14 @@ fun SettingUpScreen(
7174
}
7275
}
7376

77+
// Effect to disable new transaction sheet for channel purchase
78+
DisposableEffect(Unit) {
79+
app.setNewTransactionSheetEnabled(false)
80+
onDispose {
81+
app.setNewTransactionSheetEnabled(true)
82+
}
83+
}
84+
7485
SettingUpScreen(
7586
lightningSetupStep = lightningSetupStep,
7687
onContinueClick = {

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -618,6 +618,9 @@ class AppViewModel @Inject constructor(
618618
// endregion
619619

620620
// region TxSheet
621+
var isNewTransactionSheetEnabled = true
622+
private set
623+
621624
var showNewTransaction by mutableStateOf(false)
622625
private set
623626

@@ -629,7 +632,16 @@ class AppViewModel @Inject constructor(
629632
)
630633
)
631634

635+
fun setNewTransactionSheetEnabled(enabled: Boolean) {
636+
isNewTransactionSheetEnabled = enabled
637+
}
638+
632639
fun showNewTransactionSheet(details: NewTransactionSheetDetails) {
640+
if (!isNewTransactionSheetEnabled) {
641+
Logger.debug("NewTransactionSheet display blocked by isNewTransactionSheetEnabled=false")
642+
return
643+
}
644+
633645
newTransaction = details
634646
showNewTransaction = true
635647
}

0 commit comments

Comments
 (0)