@@ -200,6 +200,7 @@ import to.bitkit.ui.sheets.UpdateSheet
200200import to.bitkit.ui.sheets.WidgetsSheet
201201import to.bitkit.ui.sheets.hardware.HardwareSheet
202202import to.bitkit.ui.theme.Colors
203+ import to.bitkit.ui.theme.TRANSITION_SCREEN_MS
203204import to.bitkit.ui.utils.AutoReadClipboardHandler
204205import to.bitkit.ui.utils.RequestNotificationPermissions
205206import to.bitkit.ui.utils.composableWithDefaultTransitions
@@ -408,10 +409,15 @@ fun ContentView(
408409 val currentSheet by appViewModel.currentSheet.collectAsStateWithLifecycle()
409410 var homeWalletPageRequest by remember { mutableIntStateOf(0 ) }
410411 var homeWidgetsPageRequest by remember { mutableIntStateOf(0 ) }
412+ var navigateHomeWalletAfterSheetDismiss by remember { mutableStateOf(false ) }
411413 val navigateToHomeWallet = {
412414 homeWalletPageRequest++
413415 navController.navigateToHome()
414416 }
417+ val finishHardwareFlow = {
418+ navigateHomeWalletAfterSheetDismiss = true
419+ appViewModel.hideSheet()
420+ }
415421 val navigateToHomeWidgets = {
416422 homeWidgetsPageRequest++
417423 navController.navigateToHome()
@@ -423,6 +429,14 @@ fun ContentView(
423429 homeWidgetsPageRequest = 0
424430 }
425431
432+ LaunchedEffect (currentSheet, navigateHomeWalletAfterSheetDismiss) {
433+ if (! navigateHomeWalletAfterSheetDismiss || currentSheet != null ) return @LaunchedEffect
434+
435+ delay(TRANSITION_SCREEN_MS )
436+ navigateHomeWalletAfterSheetDismiss = false
437+ navigateToHomeWallet()
438+ }
439+
426440 Box (
427441 modifier = modifier.fillMaxSize()
428442 ) {
@@ -471,7 +485,7 @@ fun ContentView(
471485 is Sheet .Hardware -> HardwareSheet (
472486 sheet = sheet,
473487 appViewModel = appViewModel,
474- onFinish = navigateToHomeWallet ,
488+ onFinish = finishHardwareFlow ,
475489 )
476490 is Sheet .Widgets -> {
477491 WidgetsSheet (
0 commit comments