@@ -3,6 +3,7 @@ package to.bitkit.ui.nav.entries
33import android.content.Intent
44import androidx.compose.foundation.layout.fillMaxSize
55import androidx.compose.foundation.layout.navigationBarsPadding
6+ import androidx.compose.runtime.DisposableEffect
67import androidx.compose.runtime.LaunchedEffect
78import androidx.compose.runtime.getValue
89import androidx.compose.runtime.remember
@@ -799,30 +800,33 @@ private fun EntryProviderScope<NavKey>.sheetFlowEntries(
799800 entry<Routes .Sheet .Update >(
800801 metadata = SheetSceneStrategy .sheet()
801802 ) {
803+ DisposableEffect (Unit ) {
804+ onDispose { appViewModel.dismissTimedSheet() }
805+ }
802806 UpdateSheet (
803- onCancel = {
804- appViewModel.dismissTimedSheet()
805- navigator.goBack()
806- },
807+ onCancel = { navigator.goBack() },
807808 )
808809 }
809810
810811 entry<Routes .Sheet .Backup >(
811812 metadata = SheetSceneStrategy .sheet()
812813 ) {
814+ DisposableEffect (Unit ) {
815+ onDispose { appViewModel.dismissTimedSheet() }
816+ }
813817 BackupIntroScreen (
814818 hasFunds = LocalBalances .current.totalSats > 0u ,
815- onClose = {
816- appViewModel.dismissTimedSheet()
817- navigator.goBack()
818- },
819+ onClose = { navigator.goBack() },
819820 onConfirm = { navigator.navigate(Routes .Backup .ShowMnemonic ) },
820821 )
821822 }
822823
823824 entry<Routes .Sheet .Notifications >(
824825 metadata = SheetSceneStrategy .sheet()
825826 ) {
827+ DisposableEffect (Unit ) {
828+ onDispose { appViewModel.dismissTimedSheet() }
829+ }
826830 BackgroundPaymentsIntroSheet (
827831 onContinue = {
828832 appViewModel.dismissTimedSheet(skipQueue = true )
@@ -834,6 +838,9 @@ private fun EntryProviderScope<NavKey>.sheetFlowEntries(
834838 entry<Routes .Sheet .QuickPay >(
835839 metadata = SheetSceneStrategy .sheet()
836840 ) {
841+ DisposableEffect (Unit ) {
842+ onDispose { appViewModel.dismissTimedSheet() }
843+ }
837844 QuickPayIntroSheet (
838845 onContinue = {
839846 appViewModel.dismissTimedSheet(skipQueue = true )
@@ -845,12 +852,12 @@ private fun EntryProviderScope<NavKey>.sheetFlowEntries(
845852 entry<Routes .Sheet .HighBalance >(
846853 metadata = SheetSceneStrategy .sheet()
847854 ) {
855+ DisposableEffect (Unit ) {
856+ onDispose { appViewModel.dismissTimedSheet() }
857+ }
848858 val context = LocalContext .current
849859 HighBalanceWarningSheet (
850- understoodClick = {
851- appViewModel.dismissTimedSheet()
852- navigator.goBack()
853- },
860+ understoodClick = { navigator.goBack() },
854861 learnMoreClick = {
855862 val intent = Intent (Intent .ACTION_VIEW , Env .STORING_BITCOINS_URL .toUri())
856863 context.startActivity(intent)
0 commit comments