From 0490e5c6683f89de5c9a83685de337424d82a938 Mon Sep 17 00:00:00 2001
From: Maxim Shishmarev <maxim@loki.network>
Date: Mon, 21 Oct 2019 14:47:09 +1100
Subject: [PATCH] Clean up conversation options for groups

---
 _locales/en/messages.json                     |  4 +++
 .../conversation/ConversationHeader.tsx       | 31 +++++++++++++------
 2 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index 6ff8d244f..ff3f6e59b 100644
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -1917,6 +1917,10 @@
       "Button action that the user can click to copy their public keys"
   },
 
+  "copyChatId": {
+    "message": "Copy Chat ID"
+  },
+
   "updateGroup": {
     "message": "Update Group",
     "description":
diff --git a/ts/components/conversation/ConversationHeader.tsx b/ts/components/conversation/ConversationHeader.tsx
index 4a7223b5c..41f737e69 100644
--- a/ts/components/conversation/ConversationHeader.tsx
+++ b/ts/components/conversation/ConversationHeader.tsx
@@ -222,6 +222,7 @@ export class ConversationHeader extends React.Component<Props> {
       isMe,
       isClosable,
       isPublic,
+      isGroup,
       onDeleteMessages,
       onDeleteContact,
       onCopyPublicKey,
@@ -229,14 +230,23 @@ export class ConversationHeader extends React.Component<Props> {
       onLeaveGroup,
     } = this.props;
 
+    const isPrivateGroup = isGroup && !isPublic;
+
+    const copyIdLabel = isGroup ? i18n('copyChatId') : i18n('copyPublicKey');
+
     return (
       <ContextMenu id={triggerId}>
         {this.renderPublicMenuItems()}
-        <MenuItem onClick={onCopyPublicKey}>{i18n('copyPublicKey')}</MenuItem>
+        <MenuItem onClick={onCopyPublicKey}>{copyIdLabel}</MenuItem>
         <MenuItem onClick={onDeleteMessages}>{i18n('deleteMessages')}</MenuItem>
-        <MenuItem onClick={onUpdateGroup}>{i18n('updateGroup')}</MenuItem>
-        <MenuItem onClick={onLeaveGroup}>{i18n('leaveGroup')}</MenuItem>
-        {!isMe && isClosable ? (
+        {isPrivateGroup ? (
+          <MenuItem onClick={onUpdateGroup}>{i18n('updateGroup')}</MenuItem>
+        ) : null}
+        {isPrivateGroup ? (
+          <MenuItem onClick={onLeaveGroup}>{i18n('leaveGroup')}</MenuItem>
+        ) : null}
+        {/* TODO: add delete group */}
+        {!isMe && isClosable && !isPrivateGroup ? (
           !isPublic ? (
             <MenuItem onClick={onDeleteContact}>
               {i18n('deleteContact')}
@@ -329,13 +339,14 @@ export class ConversationHeader extends React.Component<Props> {
     const resetSessionMenuItem = !isGroup && (
       <MenuItem onClick={onResetSession}>{i18n('resetSession')}</MenuItem>
     );
-    const blockHandlerMenuItem = !isMe && (
-      <MenuItem onClick={blockHandler}>{blockTitle}</MenuItem>
-    );
-    const changeNicknameMenuItem = !isMe && (
-      <MenuItem onClick={onChangeNickname}>{i18n('changeNickname')}</MenuItem>
-    );
+    const blockHandlerMenuItem = !isMe &&
+      !isGroup && <MenuItem onClick={blockHandler}>{blockTitle}</MenuItem>;
+    const changeNicknameMenuItem = !isMe &&
+      !isGroup && (
+        <MenuItem onClick={onChangeNickname}>{i18n('changeNickname')}</MenuItem>
+      );
     const clearNicknameMenuItem = !isMe &&
+      !isGroup &&
       hasNickname && (
         <MenuItem onClick={onClearNickname}>{i18n('clearNickname')}</MenuItem>
       );