DROID-3194 Navigation | Fix | Should not crash after converting an ob…

…ject to collection and returning to home screen (#1938)
anyproto · Dec 18, 2024 · 7a6b8f7 · 7a6b8f7
1 parent b0c79c5
commit 7a6b8f7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/app/src/main/java/com/anytypeio/anytype/navigation/Navigator.kt b/app/src/main/java/com/anytypeio/anytype/navigation/Navigator.kt
@@ -192,7 +192,9 @@ class Navigator : AppNavigation {
                     view = view
                 ),
                 navOptions {
-                    popUpTo(R.id.main_navigation) { inclusive = true }
+                    popUpTo(R.id.homeScreen) {
+                        inclusive = false
+                    }
                 }
             )
         } else {

diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/EditorViewModel.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/EditorViewModel.kt
@@ -4536,7 +4536,7 @@ class EditorViewModel(
                     Timber.e(it, "Error while closing object")
                     navigate(
                         EventWrapper(
-                            AppNavigation.Command.OpenSetOrCollection(
+                            OpenSetOrCollection(
                                 target = target,
                                 space = space.id,
                                 isPopUpToDashboard
@@ -4547,7 +4547,7 @@ class EditorViewModel(
                 onSuccess = {
                     navigate(
                         EventWrapper(
-                            AppNavigation.Command.OpenSetOrCollection(
+                            OpenSetOrCollection(
                                 target = target,
                                 space = space.id,
                                 isPopUpToDashboard