From 9414da7d126f6491bd87c7ac1c6677cc77e59f40 Mon Sep 17 00:00:00 2001 From: Vitor Pamplona Date: Tue, 29 Sep 2026 13:47:37 -0400 Subject: [PATCH] fix(concord): drop the create form from the back stack after creating newStack only popped up to the new community's route, which was never on the stack, so Back from a just-created community reopened the filled-in form. Pop the form like the Marmot and relay-group creators do. Co-Authored-By: Claude Opus 5.5 --- .../chats/publicChannels/concord/ConcordCreateScreen.kt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/publicChannels/concord/ConcordCreateScreen.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/publicChannels/concord/ConcordCreateScreen.kt index 5f7549b8fe..5429ace9f9 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/publicChannels/concord/ConcordCreateScreen.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/publicChannels/concord/ConcordCreateScreen.kt @@ -136,7 +136,10 @@ fun ConcordCreateScreen( // Always re-enable — a thrown create would otherwise strand the button. working = false } - if (communityId != null) nav.newStack(Route.ConcordServer(communityId)) + // Replace this form with the new community, as the Marmot and relay-group creators + // do. newStack only popped up to the community route itself, which was not on the + // stack, so Back from the new community reopened a filled-in create form. + if (communityId != null) nav.popUpTo(Route.ConcordServer(communityId), Route.ConcordCreate::class) } }, enabled = name.value.isNotBlank() && !working,