allow removing note to self contact

this does not actually remove it as we need it for our avatar and
stuffs.

Fixes #1973
pull/1975/head
Audric Ackermann 4 years ago
parent 4d72f24fd5
commit 1eff39c3ba
No known key found for this signature in database
GPG Key ID: 999F434D76324AD4

@ -77,7 +77,7 @@ const ConversationHeaderMenu = (props: PropsConversationHeaderMenu) => {
{getLeaveGroupMenuItem(isKickedFromGroup, left, isGroup, isPublic, conversationId)} {getLeaveGroupMenuItem(isKickedFromGroup, left, isGroup, isPublic, conversationId)}
{/* TODO: add delete group */} {/* TODO: add delete group */}
{getInviteContactMenuItem(isGroup, isPublic, conversationId)} {getInviteContactMenuItem(isGroup, isPublic, conversationId)}
{getDeleteContactMenuItem(isMe, isGroup, isPublic, left, isKickedFromGroup, conversationId)} {getDeleteContactMenuItem(isGroup, isPublic, left, isKickedFromGroup, conversationId)}
</Menu> </Menu>
); );
}; };

@ -69,7 +69,7 @@ const ConversationListItemContextMenu = (props: PropsContextConversationItem) =>
{getClearNicknameMenuItem(isMe, hasNickname, isGroup, conversationId)} {getClearNicknameMenuItem(isMe, hasNickname, isGroup, conversationId)}
{getDeleteMessagesMenuItem(isPublic, conversationId)} {getDeleteMessagesMenuItem(isPublic, conversationId)}
{getInviteContactMenuItem(isGroup, isPublic, conversationId)} {getInviteContactMenuItem(isGroup, isPublic, conversationId)}
{getDeleteContactMenuItem(isMe, isGroup, isPublic, left, isKickedFromGroup, conversationId)} {getDeleteContactMenuItem(isGroup, isPublic, left, isKickedFromGroup, conversationId)}
{getLeaveGroupMenuItem(isKickedFromGroup, left, isGroup, isPublic, conversationId)} {getLeaveGroupMenuItem(isKickedFromGroup, left, isGroup, isPublic, conversationId)}
</Menu> </Menu>
); );

@ -75,14 +75,13 @@ function showCopyId(isPublic: boolean, isGroup: boolean): boolean {
} }
function showDeleteContact( function showDeleteContact(
isMe: boolean,
isGroup: boolean, isGroup: boolean,
isPublic: boolean, isPublic: boolean,
isGroupLeft: boolean, isGroupLeft: boolean,
isKickedFromGroup: boolean isKickedFromGroup: boolean
): boolean { ): boolean {
// you need to have left a closed group first to be able to delete it completely. // you need to have left a closed group first to be able to delete it completely.
return (!isMe && !isGroup) || (isGroup && (isGroupLeft || isKickedFromGroup || isPublic)); return !isGroup || (isGroup && (isGroupLeft || isKickedFromGroup || isPublic));
} }
function showAddModerators( function showAddModerators(
@ -170,7 +169,6 @@ export const getPinConversationMenuItem = (conversationId: string): JSX.Element
}; };
export function getDeleteContactMenuItem( export function getDeleteContactMenuItem(
isMe: boolean | undefined,
isGroup: boolean | undefined, isGroup: boolean | undefined,
isPublic: boolean | undefined, isPublic: boolean | undefined,
isLeft: boolean | undefined, isLeft: boolean | undefined,
@ -181,7 +179,6 @@ export function getDeleteContactMenuItem(
if ( if (
showDeleteContact( showDeleteContact(
Boolean(isMe),
Boolean(isGroup), Boolean(isGroup),
Boolean(isPublic), Boolean(isPublic),
Boolean(isLeft), Boolean(isLeft),

Loading…
Cancel
Save