From 7cc53dc8ba487739896f2bce5c668354c4f5598f Mon Sep 17 00:00:00 2001 From: Claude Date: Wed, 22 Apr 2026 20:40:53 +0000 Subject: [PATCH] fix: pop Create Group screen when navigating to new Marmot group After creating a Marmot group, the Create Group screen stays on the back stack, so pressing back from the new group chat returns to the empty creation form instead of the Messages screen. Swap `nav.nav` for `nav.popUpTo(..., Route.CreateMarmotGroup::class)` so the creation screen is removed inclusively as we navigate into the group. --- .../ui/screen/loggedIn/chats/marmotGroup/CreateGroupScreen.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/marmotGroup/CreateGroupScreen.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/marmotGroup/CreateGroupScreen.kt index 2c390e93a..7178a3e3c 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/marmotGroup/CreateGroupScreen.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/marmotGroup/CreateGroupScreen.kt @@ -80,7 +80,7 @@ fun CreateGroupScreen( name = groupName.trim(), description = "", ) - nav.nav(Route.MarmotGroupChat(nostrGroupId)) + nav.popUpTo(Route.MarmotGroupChat(nostrGroupId), Route.CreateMarmotGroup::class) } catch (e: Exception) { isCreating = false launch(Dispatchers.Main) {