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

Emojify note and add non-nickname tooltip

Browse source
This commit is contained in:
Jamie Kyle 2024-04-03 15:41:13 -07:00 • committed by GitHub
parent 4d794eaf14
commit b6afa47126
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
9 changed files with 47 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -16,6 +16,7 @@ import {
areNicknamesEnabled,
canHaveNicknameAndNote,
} from '../../util/nicknames';
import { Tooltip, TooltipPlacement } from '../Tooltip';
function muted(parts: Array<string | JSX.Element>) {
return (
@ -150,7 +151,7 @@ export function AboutContactModal({
<i className="AboutContactModal__row__icon AboutContactModal__row__icon--profile" />
{canHaveNicknameAndNote(conversation) &&
conversation.nicknameGivenName &&
(conversation.nicknameGivenName || conversation.nicknameFamilyName) &&
conversation.titleNoNickname ? (
<span>
<Intl
@ -159,7 +160,24 @@ export function AboutContactModal({
components={{
nickname: <UserText text={conversation.title} />,
titleNoNickname: (
<UserText text={conversation.titleNoNickname} />
<Tooltip
className="AboutContactModal__TitleWithoutNickname__Tooltip"
direction={TooltipPlacement.Top}
content={
<Intl
i18n={i18n}
id="icu:AboutContactModal__TitleWithoutNickname__Tooltip"
components={{
title: (
<UserText text={conversation.titleNoNickname} />
),
}}
/>
}
delay={0}
>
<UserText text={conversation.titleNoNickname} />
</Tooltip>
),
muted,
}}