Merge pull request #562 from synonymdev/fix/remove-next-item-trigger

fix: remove next item trigger from timed sheet dismiss

Author: ovitrif

app/src/main/java/to/bitkit/ui/nav/entries/SheetEntries.kt

@@ -745,7 +745,7 @@ private fun EntryProviderScope<NavKey>.sheetFlowEntries(
         }
         BackgroundPaymentsIntroSheet(
             onContinue = {
-                appViewModel.dismissTimedSheet(skipQueue = true)
+                appViewModel.dismissTimedSheet()
                 navigator.navigate(Routes.BackgroundPayments.Settings)
             },
         )
@@ -759,7 +759,7 @@ private fun EntryProviderScope<NavKey>.sheetFlowEntries(
         }
         QuickPayIntroSheet(
             onContinue = {
-                appViewModel.dismissTimedSheet(skipQueue = true)
+                appViewModel.dismissTimedSheet()
                 navigator.navigate(Routes.QuickPay.Settings)
             },
         )
@@ -777,7 +777,7 @@ private fun EntryProviderScope<NavKey>.sheetFlowEntries(
             learnMoreClick = {
                 val intent = Intent(Intent.ACTION_VIEW, Env.STORING_BITCOINS_URL.toUri())
                 context.startActivity(intent)
-                appViewModel.dismissTimedSheet(skipQueue = true)
+                appViewModel.dismissTimedSheet()
                 navigator.goBack()
             },
         )

app/src/main/java/to/bitkit/utils/timedsheets/TimedSheetManager.kt

@@ -42,20 +42,15 @@ class TimedSheetManager(private val scope: CoroutineScope) {
         checkJob = null
     }
 
-    fun dismissCurrentSheet(skipQueue: Boolean = false) {
+    fun dismissCurrentSheet() {
         if (currentTimedSheet == null) return
 
         scope.launch {
             currentTimedSheet?.onDismissed()
             _currentSheet.value = null
             currentTimedSheet = null
 
-            if (skipQueue) {
-                Logger.debug("Clearing timed sheet queue", context = TAG)
-            } else {
-                delay(CHECK_DELAY_MILLIS)
-                checkAndShowNextSheet()
-            }
+            Logger.debug("Clearing timed sheet queue", context = TAG)
         }
     }
 

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

@@ -1736,8 +1736,7 @@ class AppViewModel @Inject constructor(
 
     fun onLeftHome() = timedSheetManager.onHomeScreenExited()
 
-    fun dismissTimedSheet(skipQueue: Boolean = false) =
-        timedSheetManager.dismissCurrentSheet(skipQueue)
+    fun dismissTimedSheet() = timedSheetManager.dismissCurrentSheet()
 
     private suspend fun checkCriticalAppUpdate() = withContext(bgDispatcher) {
         delay(SCREEN_TRANSITION_DELAY_MS)

app/src/test/java/to/bitkit/utils/timedsheets/TimedSheetManagerTest.kt

@@ -103,7 +103,7 @@ class TimedSheetManagerTest : BaseUnitTest() {
 
         assertEquals(TimedSheetType.APP_UPDATE, sut.currentSheet.value)
 
-        sut.dismissCurrentSheet(skipQueue = true)
+        sut.dismissCurrentSheet()
         testScope.advanceTimeBy(100)
 
         assertNull(sut.currentSheet.value)
@@ -139,7 +139,7 @@ class TimedSheetManagerTest : BaseUnitTest() {
 
         assertEquals(TimedSheetType.BACKUP, sut.currentSheet.value)
 
-        sut.dismissCurrentSheet(skipQueue = false)
+        sut.dismissCurrentSheet()
         testScope.advanceTimeBy(100)
 
         assertNull(sut.currentSheet.value)