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

Don't show name collisions for system contacts

Browse source
This commit is contained in:
Evan Hahn 2021-06-02 12:24:22 -05:00 • committed by GitHub
parent 84be8288e9
commit 6c6eed0b1e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 121 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ts/components/conversation/ConversationHeader.tsx
View file

@ -23,6 +23,7 @@ import { MuteOption, getMuteOptions } from '../../util/getMuteOptions';
import * as expirationTimer from '../../util/expirationTimer';
import { isMuted } from '../../util/isMuted';
import { missingCaseError } from '../../util/missingCaseError';
import { isInSystemContacts } from '../../util/isInSystemContacts';
export enum OutgoingCallButtonStyle {
None,
@ -155,12 +156,10 @@ export class ConversationHeader extends React.Component<PropsType, StateType> {
);
}
const shouldShowIcon = Boolean(name && type === 'direct');
return (
<div className="module-ConversationHeader__header__info__title">
<Emojify text={title} />
{shouldShowIcon ? (
{isInSystemContacts({ name, type }) ? (
<InContactsIcon
className="module-ConversationHeader__header__info__title__in-contacts-icon"
i18n={i18n}