From 1eff39c3ba06b7cd4bf76adfa562785e7b4c3343 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Mon, 18 Oct 2021 16:48:03 +1100
Subject: [PATCH] allow removing note to self contact

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

Fixes #1973
---
 ts/components/session/menu/ConversationHeaderMenu.tsx        | 2 +-
 .../session/menu/ConversationListItemContextMenu.tsx         | 2 +-
 ts/components/session/menu/Menu.tsx                          | 5 +----
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/ts/components/session/menu/ConversationHeaderMenu.tsx b/ts/components/session/menu/ConversationHeaderMenu.tsx
index 144bd4213..283212798 100644
--- a/ts/components/session/menu/ConversationHeaderMenu.tsx
+++ b/ts/components/session/menu/ConversationHeaderMenu.tsx
@@ -77,7 +77,7 @@ const ConversationHeaderMenu = (props: PropsConversationHeaderMenu) => {
       {getLeaveGroupMenuItem(isKickedFromGroup, left, isGroup, isPublic, conversationId)}
       {/* TODO: add delete group */}
       {getInviteContactMenuItem(isGroup, isPublic, conversationId)}
-      {getDeleteContactMenuItem(isMe, isGroup, isPublic, left, isKickedFromGroup, conversationId)}
+      {getDeleteContactMenuItem(isGroup, isPublic, left, isKickedFromGroup, conversationId)}
     </Menu>
   );
 };
diff --git a/ts/components/session/menu/ConversationListItemContextMenu.tsx b/ts/components/session/menu/ConversationListItemContextMenu.tsx
index 0796eb452..0cf88923c 100644
--- a/ts/components/session/menu/ConversationListItemContextMenu.tsx
+++ b/ts/components/session/menu/ConversationListItemContextMenu.tsx
@@ -69,7 +69,7 @@ const ConversationListItemContextMenu = (props: PropsContextConversationItem) =>
       {getClearNicknameMenuItem(isMe, hasNickname, isGroup, conversationId)}
       {getDeleteMessagesMenuItem(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)}
     </Menu>
   );
diff --git a/ts/components/session/menu/Menu.tsx b/ts/components/session/menu/Menu.tsx
index 0409e0ddb..a781c8355 100644
--- a/ts/components/session/menu/Menu.tsx
+++ b/ts/components/session/menu/Menu.tsx
@@ -75,14 +75,13 @@ function showCopyId(isPublic: boolean, isGroup: boolean): boolean {
 }
 
 function showDeleteContact(
-  isMe: boolean,
   isGroup: boolean,
   isPublic: boolean,
   isGroupLeft: boolean,
   isKickedFromGroup: boolean
 ): boolean {
   // 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(
@@ -170,7 +169,6 @@ export const getPinConversationMenuItem = (conversationId: string): JSX.Element
 };
 
 export function getDeleteContactMenuItem(
-  isMe: boolean | undefined,
   isGroup: boolean | undefined,
   isPublic: boolean | undefined,
   isLeft: boolean | undefined,
@@ -181,7 +179,6 @@ export function getDeleteContactMenuItem(
 
   if (
     showDeleteContact(
-      Boolean(isMe),
       Boolean(isGroup),
       Boolean(isPublic),
       Boolean(isLeft),