mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Hide nicknames and notes on note to self

Browse source
This commit is contained in:
Jamie Kyle 2024-03-28 15:28:50 -07:00 committed by GitHub
parent c14f5c4712
commit fc65917fc3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 22 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ts/components/conversation/AboutContactModal.tsx
View file

@ -12,7 +12,10 @@ import { UserText } from '../UserText';
import { SharedGroupNames } from '../SharedGroupNames'; import { SharedGroupNames } from '../SharedGroupNames';
import { About } from './About'; import { About } from './About';
import { Intl } from '../Intl'; import { Intl } from '../Intl';
import { areNicknamesEnabled } from '../../util/nicknames'; import {
areNicknamesEnabled,
canHaveNicknameAndNote,
} from '../../util/nicknames';
function muted(parts: Array<string | JSX.Element>) { function muted(parts: Array<string | JSX.Element>) {
return ( return (
@ -146,7 +149,7 @@ export function AboutContactModal({
<div className="AboutContactModal__row"> <div className="AboutContactModal__row">
<i className="AboutContactModal__row__icon AboutContactModal__row__icon--profile" /> <i className="AboutContactModal__row__icon AboutContactModal__row__icon--profile" />
{areNicknamesEnabled() && {canHaveNicknameAndNote(conversation) &&
conversation.nicknameGivenName && conversation.nicknameGivenName &&
conversation.titleNoNickname ? ( conversation.titleNoNickname ? (
<span> <span>

4
ts/components/conversation/ContactModal.tsx
View file

@ -25,7 +25,7 @@ import { UserText } from '../UserText';
import { Button, ButtonIconType, ButtonVariant } from '../Button'; import { Button, ButtonIconType, ButtonVariant } from '../Button';
import { isInSystemContacts } from '../../util/isInSystemContacts'; import { isInSystemContacts } from '../../util/isInSystemContacts';
import { InContactsIcon } from '../InContactsIcon'; import { InContactsIcon } from '../InContactsIcon';
import { areNicknamesEnabled } from '../../util/nicknames'; import { canHaveNicknameAndNote } from '../../util/nicknames';
export type PropsDataType = { export type PropsDataType = {
areWeASubscriber: boolean; areWeASubscriber: boolean;
@ -306,7 +306,7 @@ export function ContactModal({
)} )}
<div className="ContactModal__divider" /> <div className="ContactModal__divider" />
<div className="ContactModal__button-container"> <div className="ContactModal__button-container">
{areNicknamesEnabled() && !contact.isMe && ( {canHaveNicknameAndNote(contact) && (
<button <button
type="button" type="button"
className="ContactModal__button ContactModal__block" className="ContactModal__button ContactModal__block"

4
ts/components/conversation/conversation-details/ConversationDetails.tsx
View file

@ -64,7 +64,7 @@ import {
import { formatDate, formatTime } from '../../../util/timestamp'; import { formatDate, formatTime } from '../../../util/timestamp';
import { NavTab } from '../../../state/ducks/nav'; import { NavTab } from '../../../state/ducks/nav';
import { ContextMenu } from '../../ContextMenu'; import { ContextMenu } from '../../ContextMenu';
import { areNicknamesEnabled } from '../../../util/nicknames'; import { canHaveNicknameAndNote } from '../../../util/nicknames';
function describeCallHistory( function describeCallHistory(
i18n: LocalizerType, i18n: LocalizerType,
@ -566,7 +566,7 @@ export function ConversationDetails({
} }
/> />
) : null} ) : null}
{areNicknamesEnabled() && !isGroup && ( {canHaveNicknameAndNote(conversation) && (
<PanelRow <PanelRow
icon={ icon={
<ConversationDetailsIcon <ConversationDetailsIcon

13
ts/util/nicknames.ts
View file

@ -2,7 +2,20 @@
// SPDX-License-Identifier: AGPL-3.0-only // SPDX-License-Identifier: AGPL-3.0-only
import * as RemoteConfig from '../RemoteConfig'; import * as RemoteConfig from '../RemoteConfig';
import type { ConversationType } from '../state/ducks/conversations';
import { isSignalConnection } from './getSignalConnections';
export function areNicknamesEnabled(): boolean { export function areNicknamesEnabled(): boolean {
return RemoteConfig.getValue('desktop.nicknames') === 'TRUE'; return RemoteConfig.getValue('desktop.nicknames') === 'TRUE';
} }
export function canHaveNicknameAndNote(
conversation: ConversationType
): boolean {
return (
areNicknamesEnabled() &&
conversation.type === 'group' &&
!isSignalConnection(conversation) &&
!conversation.isMe
);
}