From 830f315ede0ffb6c6626ce25dc7fe0af2f8c9eb8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lucas=20Gon=C3=A7alves=20Marchi?= Date: Mon, 4 Mar 2024 17:09:32 -0300 Subject: [PATCH] fix(Group): Fix crash on remove and add same member to the group (#1886) --- ui/src/layouts/chats/presentation/chat/mod.rs | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/ui/src/layouts/chats/presentation/chat/mod.rs b/ui/src/layouts/chats/presentation/chat/mod.rs index e75346cdc49..2efe70d25b8 100644 --- a/ui/src/layouts/chats/presentation/chat/mod.rs +++ b/ui/src/layouts/chats/presentation/chat/mod.rs @@ -113,11 +113,13 @@ pub fn Compose(cx: Scope) -> Element { let metadata = data::Metadata::new(&state.read(), &chat); if chat_data.read().active_chat.metadata_changed(&metadata) { // If the metadata has changed, we should cancel out all actions to modify it. - show_rename_group.set(false); - show_group_users.set(None); - show_manage_members.set(None); + if *show_rename_group.get() { + show_rename_group.set(false); + } // Now we can continue - chat_data.write().active_chat.set_metadata(metadata); + if !*show_group_settings.get() && show_manage_members.get().is_none() { + chat_data.write().active_chat.set_metadata(metadata); + } } } }