Skip to content

Commit cc74a6e

Browse files
committed
fix: receive flow sheet navigation
1 parent c31269f commit cc74a6e

File tree

1 file changed

+9
-25
lines changed

1 file changed

+9
-25
lines changed

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

Lines changed: 9 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -579,9 +579,7 @@ private fun EntryProviderScope<NavKey>.receiveFlowEntries(
579579
)
580580
}
581581

582-
entry<Routes.Receive.Amount>(
583-
metadata = SheetSceneStrategy.sheet()
584-
) {
582+
entry<Routes.Receive.Amount> {
585583
ReceiveAmountScreen(
586584
onCjitCreated = { entry ->
587585
walletViewModel.setPendingCjitEntry(entry)
@@ -591,18 +589,14 @@ private fun EntryProviderScope<NavKey>.receiveFlowEntries(
591589
)
592590
}
593591

594-
entry<Routes.Receive.GeoBlock>(
595-
metadata = SheetSceneStrategy.sheet()
596-
) {
592+
entry<Routes.Receive.GeoBlock> {
597593
LocationBlockScreen(
598594
onBackPressed = { navigator.goBack() },
599595
navigateAdvancedSetup = { navigator.navigate(Routes.External.Connection()) },
600596
)
601597
}
602598

603-
entry<Routes.Receive.Confirm>(
604-
metadata = SheetSceneStrategy.sheet()
605-
) {
599+
entry<Routes.Receive.Confirm> {
606600
val entry by walletViewModel.pendingCjitEntry.collectAsStateWithLifecycle()
607601
entry?.let { entryDetails ->
608602
ReceiveConfirmScreen(
@@ -617,9 +611,7 @@ private fun EntryProviderScope<NavKey>.receiveFlowEntries(
617611
}
618612
}
619613

620-
entry<Routes.Receive.ConfirmInbound>(
621-
metadata = SheetSceneStrategy.sheet()
622-
) {
614+
entry<Routes.Receive.ConfirmInbound> {
623615
val entry by walletViewModel.pendingCjitEntry.collectAsStateWithLifecycle()
624616
entry?.let { entryDetails ->
625617
ReceiveConfirmScreen(
@@ -635,9 +627,7 @@ private fun EntryProviderScope<NavKey>.receiveFlowEntries(
635627
}
636628
}
637629

638-
entry<Routes.Receive.Liquidity>(
639-
metadata = SheetSceneStrategy.sheet()
640-
) {
630+
entry<Routes.Receive.Liquidity> {
641631
val entry by walletViewModel.pendingCjitEntry.collectAsStateWithLifecycle()
642632
val settingsViewModel = hiltViewModel<SettingsViewModel>()
643633
val notificationsGranted by settingsViewModel.notificationsGranted.collectAsStateWithLifecycle()
@@ -654,9 +644,7 @@ private fun EntryProviderScope<NavKey>.receiveFlowEntries(
654644
}
655645
}
656646

657-
entry<Routes.Receive.LiquidityAdditional>(
658-
metadata = SheetSceneStrategy.sheet()
659-
) {
647+
entry<Routes.Receive.LiquidityAdditional> {
660648
val entry by walletViewModel.pendingCjitEntry.collectAsStateWithLifecycle()
661649
val settingsViewModel = hiltViewModel<SettingsViewModel>()
662650
val notificationsGranted by settingsViewModel.notificationsGranted.collectAsStateWithLifecycle()
@@ -674,13 +662,11 @@ private fun EntryProviderScope<NavKey>.receiveFlowEntries(
674662
}
675663
}
676664

677-
entry<Routes.Receive.EditInvoice>(
678-
metadata = SheetSceneStrategy.sheet()
679-
) {
665+
entry<Routes.Receive.EditInvoice> {
680666
val walletState by walletViewModel.walletState.collectAsStateWithLifecycle()
681667
EditInvoiceScreen(
682668
walletUiState = walletState,
683-
onBack = { navigator.popBackTo(Routes.Receive.Qr, inclusive = true) },
669+
onBack = { navigator.goBack() },
684670
updateInvoice = walletViewModel::updateBip21Invoice,
685671
onClickAddTag = { navigator.navigate(Routes.Receive.AddTag) },
686672
onClickTag = walletViewModel::removeTag,
@@ -692,9 +678,7 @@ private fun EntryProviderScope<NavKey>.receiveFlowEntries(
692678
)
693679
}
694680

695-
entry<Routes.Receive.AddTag>(
696-
metadata = SheetSceneStrategy.sheet()
697-
) {
681+
entry<Routes.Receive.AddTag> {
698682
AddTagScreen(
699683
onBack = { navigator.goBack() },
700684
onTagSelected = { tag ->

0 commit comments

Comments
 (0)