hide blocking option from UI for blocking groups

pull/1277/head
Audric Ackermann 5 years ago
parent 3e23039adb
commit ffbba2480f
No known key found for this signature in database
GPG Key ID: 999F434D76324AD4

@ -163,6 +163,7 @@ export class ConversationListItem extends React.PureComponent<Props> {
isRss,
isPublic,
hasNickname,
type,
onDeleteContact,
onDeleteMessages,
onBlockContact,
@ -174,10 +175,11 @@ export class ConversationListItem extends React.PureComponent<Props> {
const blockTitle = isBlocked ? i18n('unblockUser') : i18n('blockUser');
const blockHandler = isBlocked ? onUnblockContact : onBlockContact;
const isPrivate = type === 'direct';
return (
<ContextMenu id={triggerId}>
{!isPublic && !isRss && !isMe ? (
{!isPublic && !isRss && !isMe && isPrivate ? (
<MenuItem onClick={blockHandler}>{blockTitle}</MenuItem>
) : null}
{/* {!isPublic && !isRss && !isMe ? (

@ -480,7 +480,7 @@ export class ConversationHeader extends React.Component<Props> {
const resetSessionMenuItem = !isGroup && (
<MenuItem onClick={onResetSession}>{i18n('resetSession')}</MenuItem>
);
const blockHandlerMenuItem = !isMe && !isRss && (
const blockHandlerMenuItem = !isMe && !isRss && !isGroup && (
<MenuItem onClick={blockHandler}>{blockTitle}</MenuItem>
);

Loading…
Cancel
Save