Remove a remote config flag
This commit is contained in:
parent
8c555a9b28
commit
5d3de4ed5d
5 changed files with 3 additions and 20 deletions
|
@ -25,7 +25,6 @@ export type ConfigKeyType =
|
|||
| 'desktop.internalUser'
|
||||
| 'desktop.mediaQuality.levels'
|
||||
| 'desktop.messageCleanup'
|
||||
| 'desktop.nicknames'
|
||||
| 'desktop.retryRespondMaxAge'
|
||||
| 'desktop.senderKey.retry'
|
||||
| 'desktop.senderKeyMaxAge'
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue