Skip to content

Commit 90aedea

Browse files
committed
fix: skip queue check
1 parent c367549 commit 90aedea

File tree

2 files changed

+11
-4
lines changed

2 files changed

+11
-4
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,7 @@ fun ContentView(
379379
TimedSheetType.NOTIFICATIONS -> {
380380
BackgroundPaymentsIntroSheet(
381381
onContinue = {
382-
appViewModel.dismissTimedSheet()
382+
appViewModel.dismissTimedSheet(skipQueue = true)
383383
navController.navigate(Routes.BackgroundPaymentsSettings)
384384
settingsViewModel.setBgPaymentsIntroSeen(true)
385385
},
@@ -389,7 +389,7 @@ fun ContentView(
389389
TimedSheetType.QUICK_PAY -> {
390390
QuickPayIntroSheet(
391391
onContinue = {
392-
appViewModel.dismissTimedSheet()
392+
appViewModel.dismissTimedSheet(skipQueue = true)
393393
navController.navigate(Routes.QuickPaySettings)
394394
},
395395
)
@@ -401,7 +401,7 @@ fun ContentView(
401401
learnMoreClick = {
402402
val intent = Intent(Intent.ACTION_VIEW, Env.STORING_BITCOINS_URL.toUri())
403403
context.startActivity(intent)
404-
appViewModel.dismissTimedSheet()
404+
appViewModel.dismissTimedSheet(skipQueue = true)
405405
}
406406
)
407407
}

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

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1612,7 +1612,9 @@ class AppViewModel @Inject constructor(
16121612
timedSheetsScope = null
16131613
}
16141614

1615-
fun dismissTimedSheet() {
1615+
fun dismissTimedSheet(skipQueue: Boolean = false) {
1616+
Logger.debug("dismissTimedSheet called", context = "Timed sheet")
1617+
16161618
val currentQueue = timedSheetQueue
16171619
val currentSheet = currentTimedSheet
16181620

@@ -1650,6 +1652,11 @@ class AppViewModel @Inject constructor(
16501652
}
16511653
}
16521654

1655+
if (skipQueue) {
1656+
clearTimedSheets()
1657+
return
1658+
}
1659+
16531660
val currentIndex = currentQueue.indexOf(currentSheet)
16541661
val nextIndex = currentIndex + 1
16551662

0 commit comments

Comments
 (0)