From f7982141a76f6eaef8fda09ba6b75a46fba34db8 Mon Sep 17 00:00:00 2001
From: Jamie Kyle <113370520+jamiebuilds-signal@users.noreply.github.com>
Date: Fri, 29 Mar 2024 11:34:44 -0700
Subject: [PATCH] Hide nicknames and notes on note to self

---
 ts/components/conversation/AboutContactModal.tsx    |  7 +++++--
 ts/components/conversation/ContactModal.tsx         |  4 ++--
 .../conversation-details/ConversationDetails.tsx    |  4 ++--
 ts/util/nicknames.ts                                | 13 +++++++++++++
 4 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/ts/components/conversation/AboutContactModal.tsx b/ts/components/conversation/AboutContactModal.tsx
index 8aa4559ce9..bc4ff35052 100644
--- a/ts/components/conversation/AboutContactModal.tsx
+++ b/ts/components/conversation/AboutContactModal.tsx
@@ -12,7 +12,10 @@ import { UserText } from '../UserText';
 import { SharedGroupNames } from '../SharedGroupNames';
 import { About } from './About';
 import { Intl } from '../Intl';
-import { areNicknamesEnabled } from '../../util/nicknames';
+import {
+  areNicknamesEnabled,
+  canHaveNicknameAndNote,
+} from '../../util/nicknames';
 
 function muted(parts: Array<string | JSX.Element>) {
   return (
@@ -146,7 +149,7 @@ export function AboutContactModal({
       <div className="AboutContactModal__row">
         <i className="AboutContactModal__row__icon AboutContactModal__row__icon--profile" />
 
-        {areNicknamesEnabled() &&
+        {canHaveNicknameAndNote(conversation) &&
         conversation.nicknameGivenName &&
         conversation.titleNoNickname ? (
           <span>
diff --git a/ts/components/conversation/ContactModal.tsx b/ts/components/conversation/ContactModal.tsx
index d617a33a47..0678fbfa34 100644
--- a/ts/components/conversation/ContactModal.tsx
+++ b/ts/components/conversation/ContactModal.tsx
@@ -23,7 +23,7 @@ import { RemoveGroupMemberConfirmationDialog } from './RemoveGroupMemberConfirma
 import { missingCaseError } from '../../util/missingCaseError';
 import { UserText } from '../UserText';
 import { Button, ButtonIconType, ButtonVariant } from '../Button';
-import { areNicknamesEnabled } from '../../util/nicknames';
+import { canHaveNicknameAndNote } from '../../util/nicknames';
 
 export type PropsDataType = {
   areWeASubscriber: boolean;
@@ -296,7 +296,7 @@ export function ContactModal({
             )}
             <div className="ContactModal__divider" />
             <div className="ContactModal__button-container">
-              {areNicknamesEnabled() && !contact.isMe && (
+              {canHaveNicknameAndNote(contact) && (
                 <button
                   type="button"
                   className="ContactModal__button ContactModal__block"
diff --git a/ts/components/conversation/conversation-details/ConversationDetails.tsx b/ts/components/conversation/conversation-details/ConversationDetails.tsx
index 51bad5b56d..e40f559914 100644
--- a/ts/components/conversation/conversation-details/ConversationDetails.tsx
+++ b/ts/components/conversation/conversation-details/ConversationDetails.tsx
@@ -64,7 +64,7 @@ import {
 import { formatDate, formatTime } from '../../../util/timestamp';
 import { NavTab } from '../../../state/ducks/nav';
 import { ContextMenu } from '../../ContextMenu';
-import { areNicknamesEnabled } from '../../../util/nicknames';
+import { canHaveNicknameAndNote } from '../../../util/nicknames';
 
 function describeCallHistory(
   i18n: LocalizerType,
@@ -566,7 +566,7 @@ export function ConversationDetails({
             }
           />
         ) : null}
-        {areNicknamesEnabled() && !isGroup && (
+        {canHaveNicknameAndNote(conversation) && (
           <PanelRow
             icon={
               <ConversationDetailsIcon
diff --git a/ts/util/nicknames.ts b/ts/util/nicknames.ts
index e9a3305329..d322d75991 100644
--- a/ts/util/nicknames.ts
+++ b/ts/util/nicknames.ts
@@ -2,7 +2,20 @@
 // SPDX-License-Identifier: AGPL-3.0-only
 
 import * as RemoteConfig from '../RemoteConfig';
+import type { ConversationType } from '../state/ducks/conversations';
+import { isSignalConnection } from './getSignalConnections';
 
 export function areNicknamesEnabled(): boolean {
   return RemoteConfig.getValue('desktop.nicknames') === 'TRUE';
 }
+
+export function canHaveNicknameAndNote(
+  conversation: ConversationType
+): boolean {
+  return (
+    areNicknamesEnabled() &&
+    conversation.type === 'group' &&
+    !isSignalConnection(conversation) &&
+    !conversation.isMe
+  );
+}