From 20325a2e882006d46219b26f7a0952969fc425d5 Mon Sep 17 00:00:00 2001
From: Bill <billsonnn@live.com>
Date: Sun, 27 Mar 2022 22:41:47 -0400
Subject: [PATCH] Close group settings on delete

---
 src/components/groups/views/GroupCreatorView.tsx          | 2 +-
 src/components/groups/views/GroupManagerView.tsx          | 2 +-
 src/components/groups/views/tabs/GroupTabIdentityView.tsx | 5 ++++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/components/groups/views/GroupCreatorView.tsx b/src/components/groups/views/GroupCreatorView.tsx
index 059e71f1..56893477 100644
--- a/src/components/groups/views/GroupCreatorView.tsx
+++ b/src/components/groups/views/GroupCreatorView.tsx
@@ -150,7 +150,7 @@ export const GroupCreatorView: FC<GroupCreatorViewProps> = props =>
                     </Flex>
                     <Column overflow="hidden">
                         { (currentTab === 1) &&
-                            <GroupTabIdentityView groupData={ groupData } setGroupData={ setGroupData } setCloseAction={ setCloseAction } isCreator={ true } availableRooms={ availableRooms } /> }
+                            <GroupTabIdentityView groupData={ groupData } setGroupData={ setGroupData } setCloseAction={ setCloseAction } close={ null } isCreator={ true } availableRooms={ availableRooms } /> }
                         { (currentTab === 2) &&
                             <GroupTabBadgeView groupData={ groupData } setGroupData={ setGroupData } setCloseAction={ setCloseAction } /> }
                         { (currentTab === 3) &&
diff --git a/src/components/groups/views/GroupManagerView.tsx b/src/components/groups/views/GroupManagerView.tsx
index 4d23e8af..3433ae48 100644
--- a/src/components/groups/views/GroupManagerView.tsx
+++ b/src/components/groups/views/GroupManagerView.tsx
@@ -110,7 +110,7 @@ export const GroupManagerView: FC<{}> = props =>
                 </Flex>
                 <Column grow overflow="hidden">
                     { currentTab === 1 &&
-                        <GroupTabIdentityView groupData={ groupData } setGroupData={ setGroupData } setCloseAction={ setCloseAction } /> }
+                        <GroupTabIdentityView groupData={ groupData } setGroupData={ setGroupData } setCloseAction={ setCloseAction } close={ close } /> }
                     { currentTab === 2 &&
                         <GroupTabBadgeView groupData={ groupData } setGroupData={ setGroupData } setCloseAction={ setCloseAction } skipDefault={ true } /> }
                     { currentTab === 3 &&
diff --git a/src/components/groups/views/tabs/GroupTabIdentityView.tsx b/src/components/groups/views/tabs/GroupTabIdentityView.tsx
index 24f1af33..9934736f 100644
--- a/src/components/groups/views/tabs/GroupTabIdentityView.tsx
+++ b/src/components/groups/views/tabs/GroupTabIdentityView.tsx
@@ -10,13 +10,14 @@ interface GroupTabIdentityViewProps
     groupData: IGroupData;
     setGroupData: Dispatch<SetStateAction<IGroupData>>;
     setCloseAction: Dispatch<SetStateAction<{ action: () => boolean }>>;
+    close: () => void;
     isCreator?: boolean;
     availableRooms?: { id: number, name: string }[];
 }
 
 export const GroupTabIdentityView: FC<GroupTabIdentityViewProps> = props =>
 {
-    const { groupData = null, setGroupData = null, setCloseAction = null, isCreator = false, availableRooms = [] } = props;
+    const { groupData = null, setGroupData = null, setCloseAction = null, close = null, isCreator = false, availableRooms = [] } = props;
     const [ groupName, setGroupName ] = useState<string>('');
     const [ groupDescription, setGroupDescription ] = useState<string>('');
     const [ groupHomeroomId, setGroupHomeroomId ] = useState<number>(-1);
@@ -28,6 +29,8 @@ export const GroupTabIdentityView: FC<GroupTabIdentityViewProps> = props =>
         NotificationUtilities.confirm(LocalizeText('group.deleteconfirm.desc'), () =>
             {
                 SendMessageComposer(new GroupDeleteComposer(groupData.groupId));
+                
+                if(close) close();
             }, null, null, null, LocalizeText('group.deleteconfirm.title'));
     }