From 5d3de4ed5de463f432d5131630df1622d5735b87 Mon Sep 17 00:00:00 2001
From: Fedor Indutny <79877362+indutny-signal@users.noreply.github.com>
Date: Thu, 20 Jun 2024 14:39:40 -0400
Subject: [PATCH] Remove a remote config flag

---
 ts/RemoteConfig.ts                                       | 1 -
 ts/components/conversation/AboutContactModal.tsx         | 7 ++-----
 ts/components/conversation/ProfileChangeNotification.tsx | 2 --
 ts/util/getTitle.ts                                      | 7 +------
 ts/util/nicknames.ts                                     | 6 ------
 5 files changed, 3 insertions(+), 20 deletions(-)

diff --git a/ts/RemoteConfig.ts b/ts/RemoteConfig.ts
index 9e8e1bd4ec4..f2262db5e1b 100644
--- a/ts/RemoteConfig.ts
+++ b/ts/RemoteConfig.ts
@@ -25,7 +25,6 @@ export type ConfigKeyType =
   | 'desktop.internalUser'
   | 'desktop.mediaQuality.levels'
   | 'desktop.messageCleanup'
-  | 'desktop.nicknames'
   | 'desktop.retryRespondMaxAge'
   | 'desktop.senderKey.retry'
   | 'desktop.senderKeyMaxAge'
diff --git a/ts/components/conversation/AboutContactModal.tsx b/ts/components/conversation/AboutContactModal.tsx
index 97f9c6f2e5d..d08e3adee18 100644
--- a/ts/components/conversation/AboutContactModal.tsx
+++ b/ts/components/conversation/AboutContactModal.tsx
@@ -12,10 +12,7 @@ import { UserText } from '../UserText';
 import { SharedGroupNames } from '../SharedGroupNames';
 import { About } from './About';
 import { I18n } from '../I18n';
-import {
-  areNicknamesEnabled,
-  canHaveNicknameAndNote,
-} from '../../util/nicknames';
+import { canHaveNicknameAndNote } from '../../util/nicknames';
 import { Tooltip, TooltipPlacement } from '../Tooltip';
 
 function muted(parts: Array<string | JSX.Element>) {
@@ -255,7 +252,7 @@ export function AboutContactModal({
         </div>
       )}
 
-      {areNicknamesEnabled() && conversation.note && (
+      {conversation.note && (
         <div className="AboutContactModal__row">
           <i className="AboutContactModal__row__icon AboutContactModal__row__icon--note" />
           <button
diff --git a/ts/components/conversation/ProfileChangeNotification.tsx b/ts/components/conversation/ProfileChangeNotification.tsx
index f849a2bca90..cb5d9845ba2 100644
--- a/ts/components/conversation/ProfileChangeNotification.tsx
+++ b/ts/components/conversation/ProfileChangeNotification.tsx
@@ -10,7 +10,6 @@ import { Emojify } from './Emojify';
 import type { ProfileNameChangeType } from '../../util/getStringForProfileChange';
 import { getStringForProfileChange } from '../../util/getStringForProfileChange';
 import { Button, ButtonSize, ButtonVariant } from '../Button';
-import { areNicknamesEnabled } from '../../util/nicknames';
 
 export type PropsType = {
   change: ProfileNameChangeType;
@@ -37,7 +36,6 @@ export function ProfileChangeNotification({
       icon="profile"
       contents={<Emojify text={message} />}
       button={
-        areNicknamesEnabled() &&
         (changedContact.nicknameGivenName != null ||
           changedContact.nicknameFamilyName != null) && (
           <Button
diff --git a/ts/util/getTitle.ts b/ts/util/getTitle.ts
index 8d358289c0b..bfc2041d09b 100644
--- a/ts/util/getTitle.ts
+++ b/ts/util/getTitle.ts
@@ -9,7 +9,6 @@ import { combineNames } from './combineNames';
 import { getRegionCodeForNumber } from './libphonenumberUtil';
 import { isDirectConversation } from './whatTypeOfConversation';
 import { getE164 } from './getE164';
-import { areNicknamesEnabled } from './nicknames';
 
 type TitleOptions = {
   isShort?: boolean;
@@ -42,7 +41,7 @@ export function getTitleNoDefault(
   const { username } = attributes;
 
   let nicknameValue: string | undefined;
-  if (areNicknamesEnabled() && !ignoreNickname) {
+  if (!ignoreNickname) {
     nicknameValue =
       (isShort ? attributes.nicknameGivenName : undefined) ||
       getNicknameName(attributes);
@@ -114,10 +113,6 @@ export function getNicknameName(
     'nicknameGivenName' | 'nicknameFamilyName' | 'type'
   >
 ): string | undefined {
-  if (!areNicknamesEnabled()) {
-    return undefined;
-  }
-
   if (isDirectConversation(attributes)) {
     return combineNames(
       attributes.nicknameGivenName ?? undefined,
diff --git a/ts/util/nicknames.ts b/ts/util/nicknames.ts
index 1a626e308e9..3e7ceed361a 100644
--- a/ts/util/nicknames.ts
+++ b/ts/util/nicknames.ts
@@ -1,19 +1,13 @@
 // Copyright 2024 Signal Messenger, LLC
 // SPDX-License-Identifier: AGPL-3.0-only
 
-import * as RemoteConfig from '../RemoteConfig';
 import type { ConversationType } from '../state/ducks/conversations';
 import { isSignalConversation } from './isSignalConversation';
 
-export function areNicknamesEnabled(): boolean {
-  return RemoteConfig.getValue('desktop.nicknames') === 'TRUE';
-}
-
 export function canHaveNicknameAndNote(
   conversation: ConversationType
 ): boolean {
   return (
-    areNicknamesEnabled() &&
     conversation.type !== 'group' &&
     !isSignalConversation(conversation) &&
     !conversation.isMe