popUntil SecVault

shade-sdev · Oct 28, 2024 · a4599d8 · a4599d8
1 parent 77833fa
commit a4599d8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/main/kotlin/ui/components/forms/passwordmgnt/CreditCardForm.kt b/src/main/kotlin/ui/components/forms/passwordmgnt/CreditCardForm.kt
@@ -20,6 +20,7 @@ import cafe.adriel.voyager.koin.koinScreenModel
 import cafe.adriel.voyager.navigator.LocalNavigator
 import ui.components.FormTextArea
 import ui.components.FormTextField
+import ui.screens.SecVaultScreen
 import ui.theme.Font
 import ui.theme.primary
 import ui.theme.secondary
@@ -200,7 +201,7 @@ class CreditCardForm : Screen {
             ) {
                 Footer(
                     { },
-                    { navigator?.pop() },
+                    { navigator?.popUntil { screen: Screen -> screen.key == SecVaultScreen().key } },
                     isFormValid
                 )
             }

diff --git a/src/main/kotlin/ui/components/forms/passwordmgnt/NoteForm.kt b/src/main/kotlin/ui/components/forms/passwordmgnt/NoteForm.kt
@@ -11,6 +11,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
 import cafe.adriel.voyager.core.screen.Screen
 import cafe.adriel.voyager.navigator.LocalNavigator
+import ui.screens.SecVaultScreen
 import ui.theme.primary
 import ui.theme.secondary
 import ui.theme.tertiary
@@ -60,7 +61,7 @@ class NoteForm : Screen {
             ) {
                 Footer(
                     { },
-                    { navigator?.pop() },
+                    { navigator?.popUntil {screen: Screen -> screen.key == SecVaultScreen().key } },
                     true
                 )
             }