Merge branch 'dev' into file_transfer_ui

Satellite-im · Mar 4, 2024 · 3bc1aa8 · 3bc1aa8
2 parents e78a375 + 830f315
commit 3bc1aa8
Showing 1 changed file with 6 additions and 4 deletions.
diff --git 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);
+                }
             }
         }
     }