diff --git a/ts/RemoteConfig.ts b/ts/RemoteConfig.ts index 448cce1b4..c7aa45d50 100644 --- a/ts/RemoteConfig.ts +++ b/ts/RemoteConfig.ts @@ -9,7 +9,6 @@ import * as log from './logging/log'; export type ConfigKeyType = | 'desktop.announcementGroup' | 'desktop.clientExpiration' - | 'desktop.customizePreferredReactions' | 'desktop.disableGV1' | 'desktop.groupCallOutboundRing' | 'desktop.groupCalling' diff --git a/ts/components/conversation/ReactionPicker.tsx b/ts/components/conversation/ReactionPicker.tsx index 7e8b69148..9a23d35a1 100644 --- a/ts/components/conversation/ReactionPicker.tsx +++ b/ts/components/conversation/ReactionPicker.tsx @@ -6,7 +6,6 @@ import { convertShortName } from '../emoji/lib'; import { Props as EmojiPickerProps } from '../emoji/EmojiPicker'; import { useRestoreFocus } from '../../hooks/useRestoreFocus'; import { LocalizerType } from '../../types/Util'; -import { canCustomizePreferredReactions } from '../../util/canCustomizePreferredReactions'; import { ReactionPickerPicker, ReactionPickerPickerEmojiButton, @@ -80,9 +79,7 @@ export const ReactionPicker = React.forwardRef( if (pickingOther) { return renderEmojiPicker({ - onClickSettings: canCustomizePreferredReactions() - ? openCustomizePreferredReactionsModal - : undefined, + onClickSettings: openCustomizePreferredReactionsModal, onClose, onPickEmoji, onSetSkinTone, diff --git a/ts/util/canCustomizePreferredReactions.ts b/ts/util/canCustomizePreferredReactions.ts deleted file mode 100644 index 53d8b10d3..000000000 --- a/ts/util/canCustomizePreferredReactions.ts +++ /dev/null @@ -1,11 +0,0 @@ -// Copyright 2021 Signal Messenger, LLC -// SPDX-License-Identifier: AGPL-3.0-only - -import * as RemoteConfig from '../RemoteConfig'; - -export function canCustomizePreferredReactions(): boolean { - return Boolean( - RemoteConfig.isEnabled('desktop.internalUser') || - RemoteConfig.isEnabled('desktop.customizePreferredReactions') - ); -}