From b89f55dd02f3341960cfbc012bf3672272a3aa6b Mon Sep 17 00:00:00 2001
From: Brice-W <brice@loki.network>
Date: Tue, 27 Jul 2021 12:01:11 +1000
Subject: [PATCH 1/4] update displayed buttons on groups

---
 ts/components/session/conversation/SessionRightPanel.tsx | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/ts/components/session/conversation/SessionRightPanel.tsx b/ts/components/session/conversation/SessionRightPanel.tsx
index 33bf1e699..972e0ecde 100644
--- a/ts/components/session/conversation/SessionRightPanel.tsx
+++ b/ts/components/session/conversation/SessionRightPanel.tsx
@@ -131,7 +131,7 @@ const HeaderItem = () => {
     name,
   } = selectedConversation;
 
-  const showInviteContacts = (isPublic || weAreAdmin) && !isKickedFromGroup && !isBlocked && !left;
+  const showInviteContacts = !isKickedFromGroup && !isBlocked && !left;
   const userName = name || profileName || phoneNumber;
 
   return (
@@ -249,9 +249,10 @@ export const SessionRightPanelWithDetails = () => {
     };
   });
 
-  const showUpdateGroupNameButton = weAreAdmin && !commonNoShow;
+  const showUpdateGroupNameButton = (!isPublic || isPublic && weAreAdmin) && !commonNoShow;
   const showAddRemoveModeratorsButton = weAreAdmin && !commonNoShow && isPublic;
 
+
   const showUpdateGroupMembersButton = !isPublic && isGroup && !commonNoShow;
 
   const deleteConvoAction = isPublic

From bfa68fc9b57b9215c0be9c1a705a612deeeab782 Mon Sep 17 00:00:00 2001
From: Brice-W <brice@loki.network>
Date: Tue, 27 Jul 2021 12:05:49 +1000
Subject: [PATCH 2/4] add isGroup test

---
 ts/components/session/conversation/SessionRightPanel.tsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ts/components/session/conversation/SessionRightPanel.tsx b/ts/components/session/conversation/SessionRightPanel.tsx
index 972e0ecde..30e47cb45 100644
--- a/ts/components/session/conversation/SessionRightPanel.tsx
+++ b/ts/components/session/conversation/SessionRightPanel.tsx
@@ -122,7 +122,7 @@ const HeaderItem = () => {
     avatarPath,
     isPublic,
     id,
-    weAreAdmin,
+    isGroup,
     isKickedFromGroup,
     profileName,
     phoneNumber,
@@ -131,7 +131,7 @@ const HeaderItem = () => {
     name,
   } = selectedConversation;
 
-  const showInviteContacts = !isKickedFromGroup && !isBlocked && !left;
+  const showInviteContacts = isGroup && !isKickedFromGroup && !isBlocked && !left;
   const userName = name || profileName || phoneNumber;
 
   return (
@@ -249,7 +249,7 @@ export const SessionRightPanelWithDetails = () => {
     };
   });
 
-  const showUpdateGroupNameButton = (!isPublic || isPublic && weAreAdmin) && !commonNoShow;
+  const showUpdateGroupNameButton = isGroup && (!isPublic || isPublic && weAreAdmin) && !commonNoShow;
   const showAddRemoveModeratorsButton = weAreAdmin && !commonNoShow && isPublic;
 
 

From a6aed4d7d147917bc986b6b438b204f366e1c202 Mon Sep 17 00:00:00 2001
From: Brice-W <brice@loki.network>
Date: Tue, 27 Jul 2021 13:54:38 +1000
Subject: [PATCH 3/4] fix isAdmin to return the right value for closed groups

---
 ts/models/conversation.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ts/models/conversation.ts b/ts/models/conversation.ts
index 2bfb47f22..5ccfa93bd 100644
--- a/ts/models/conversation.ts
+++ b/ts/models/conversation.ts
@@ -1110,7 +1110,7 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
   }
 
   public isAdmin(pubKey?: string) {
-    if (!this.isPublic()) {
+    if (!this.isPublic() && !this.isGroup()) {
       return false;
     }
     if (!pubKey) {

From eb3851592cdc6e4d9def39097c1c1ebc66b13822 Mon Sep 17 00:00:00 2001
From: Brice-W <brice@loki.network>
Date: Tue, 27 Jul 2021 14:02:22 +1000
Subject: [PATCH 4/4] lint

---
 ts/components/session/conversation/SessionRightPanel.tsx | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/ts/components/session/conversation/SessionRightPanel.tsx b/ts/components/session/conversation/SessionRightPanel.tsx
index 30e47cb45..192e29534 100644
--- a/ts/components/session/conversation/SessionRightPanel.tsx
+++ b/ts/components/session/conversation/SessionRightPanel.tsx
@@ -249,10 +249,9 @@ export const SessionRightPanelWithDetails = () => {
     };
   });
 
-  const showUpdateGroupNameButton = isGroup && (!isPublic || isPublic && weAreAdmin) && !commonNoShow;
+  const showUpdateGroupNameButton =
+    isGroup && (!isPublic || (isPublic && weAreAdmin)) && !commonNoShow;
   const showAddRemoveModeratorsButton = weAreAdmin && !commonNoShow && isPublic;
-
-
   const showUpdateGroupMembersButton = !isPublic && isGroup && !commonNoShow;
 
   const deleteConvoAction = isPublic