Clean up conversation options for groups

pull/565/head
Maxim Shishmarev 6 years ago
parent 9f81f67460
commit 0490e5c668

@ -1917,6 +1917,10 @@
"Button action that the user can click to copy their public keys" "Button action that the user can click to copy their public keys"
}, },
"copyChatId": {
"message": "Copy Chat ID"
},
"updateGroup": { "updateGroup": {
"message": "Update Group", "message": "Update Group",
"description": "description":

@ -222,6 +222,7 @@ export class ConversationHeader extends React.Component<Props> {
isMe, isMe,
isClosable, isClosable,
isPublic, isPublic,
isGroup,
onDeleteMessages, onDeleteMessages,
onDeleteContact, onDeleteContact,
onCopyPublicKey, onCopyPublicKey,
@ -229,14 +230,23 @@ export class ConversationHeader extends React.Component<Props> {
onLeaveGroup, onLeaveGroup,
} = this.props; } = this.props;
const isPrivateGroup = isGroup && !isPublic;
const copyIdLabel = isGroup ? i18n('copyChatId') : i18n('copyPublicKey');
return ( return (
<ContextMenu id={triggerId}> <ContextMenu id={triggerId}>
{this.renderPublicMenuItems()} {this.renderPublicMenuItems()}
<MenuItem onClick={onCopyPublicKey}>{i18n('copyPublicKey')}</MenuItem> <MenuItem onClick={onCopyPublicKey}>{copyIdLabel}</MenuItem>
<MenuItem onClick={onDeleteMessages}>{i18n('deleteMessages')}</MenuItem> <MenuItem onClick={onDeleteMessages}>{i18n('deleteMessages')}</MenuItem>
<MenuItem onClick={onUpdateGroup}>{i18n('updateGroup')}</MenuItem> {isPrivateGroup ? (
<MenuItem onClick={onLeaveGroup}>{i18n('leaveGroup')}</MenuItem> <MenuItem onClick={onUpdateGroup}>{i18n('updateGroup')}</MenuItem>
{!isMe && isClosable ? ( ) : null}
{isPrivateGroup ? (
<MenuItem onClick={onLeaveGroup}>{i18n('leaveGroup')}</MenuItem>
) : null}
{/* TODO: add delete group */}
{!isMe && isClosable && !isPrivateGroup ? (
!isPublic ? ( !isPublic ? (
<MenuItem onClick={onDeleteContact}> <MenuItem onClick={onDeleteContact}>
{i18n('deleteContact')} {i18n('deleteContact')}
@ -329,13 +339,14 @@ export class ConversationHeader extends React.Component<Props> {
const resetSessionMenuItem = !isGroup && ( const resetSessionMenuItem = !isGroup && (
<MenuItem onClick={onResetSession}>{i18n('resetSession')}</MenuItem> <MenuItem onClick={onResetSession}>{i18n('resetSession')}</MenuItem>
); );
const blockHandlerMenuItem = !isMe && ( const blockHandlerMenuItem = !isMe &&
<MenuItem onClick={blockHandler}>{blockTitle}</MenuItem> !isGroup && <MenuItem onClick={blockHandler}>{blockTitle}</MenuItem>;
); const changeNicknameMenuItem = !isMe &&
const changeNicknameMenuItem = !isMe && ( !isGroup && (
<MenuItem onClick={onChangeNickname}>{i18n('changeNickname')}</MenuItem> <MenuItem onClick={onChangeNickname}>{i18n('changeNickname')}</MenuItem>
); );
const clearNicknameMenuItem = !isMe && const clearNicknameMenuItem = !isMe &&
!isGroup &&
hasNickname && ( hasNickname && (
<MenuItem onClick={onClearNickname}>{i18n('clearNickname')}</MenuItem> <MenuItem onClick={onClearNickname}>{i18n('clearNickname')}</MenuItem>
); );

Loading…
Cancel
Save