feat: Delete group as admin

wireapp · Oct 29, 2024 · c943144 · c943144
1 parent ab9ac3c
commit c943144
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 20 deletions.
diff --git a/src/script/page/RightSidebar/ConversationDetails/utils/getConversationActions.ts b/src/script/page/RightSidebar/ConversationDetails/utils/getConversationActions.ts
@@ -151,11 +151,7 @@ const getConversationActions = ({
       },
     },
     {
-      condition:
-        !isSingleUser &&
-        isTeam &&
-        roleRepository.canDeleteGroup(conversationEntity) &&
-        conversationEntity.isCreatedBySelf(),
+      condition: !isSingleUser && isTeam && roleRepository.canDeleteGroup(conversationEntity),
       item: {
         click: async () => actionsViewModel.deleteConversation(conversationEntity),
         Icon: Icon.DeleteIcon,

diff --git a/src/script/view_model/ActionsViewModel.ts b/src/script/view_model/ActionsViewModel.ts
@@ -303,22 +303,18 @@ export class ActionsViewModel {
   };
 
   readonly deleteConversation = (conversationEntity: Conversation): Promise<void> => {
-    if (conversationEntity && conversationEntity.isCreatedBySelf()) {
-      return new Promise(() => {
-        PrimaryModal.show(PrimaryModal.type.CONFIRM, {
-          primaryAction: {
-            action: () => this.conversationRepository.deleteConversation(conversationEntity),
-            text: t('modalConversationDeleteGroupAction'),
-          },
-          text: {
-            message: t('modalConversationDeleteGroupMessage'),
-            title: t('modalConversationDeleteGroupHeadline', conversationEntity.display_name()),
-          },
-        });
+    return new Promise(() => {
+      PrimaryModal.show(PrimaryModal.type.CONFIRM, {
+        primaryAction: {
+          action: () => this.conversationRepository.deleteConversation(conversationEntity),
+          text: t('modalConversationDeleteGroupAction'),
+        },
+        text: {
+          message: t('modalConversationDeleteGroupMessage'),
+          title: t('modalConversationDeleteGroupHeadline', conversationEntity.display_name()),
+        },
       });
-    }
-
-    return Promise.reject();
+    });
   };
 
   getConversationById = async (conversation: QualifiedId): Promise<Conversation> => {