jonny
/
Signal-Desktop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adding some <Emojify/> that were missing

This commit is contained in:
Alvaro 2022-08-10 15:46:43 -06:00 committed by GitHub
parent 2cfa4b72da
commit 4f1613e82e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ts/components/AvatarPopup.tsx
View File

@ -9,6 +9,7 @@ import { Avatar } from './Avatar';
import { useRestoreFocus } from '../hooks/useRestoreFocus'; import { useRestoreFocus } from '../hooks/useRestoreFocus';
import type { LocalizerType, ThemeType } from '../types/Util'; import type { LocalizerType, ThemeType } from '../types/Util';
import { Emojify } from './conversation/Emojify';
export type Props = { export type Props = {
readonly i18n: LocalizerType; readonly i18n: LocalizerType;
@ -59,7 +60,7 @@ export const AvatarPopup = (props: Props): JSX.Element => {
<Avatar {...props} size={52} /> <Avatar {...props} size={52} />
<div className="module-avatar-popup__profile__text"> <div className="module-avatar-popup__profile__text">
<div className="module-avatar-popup__profile__name"> <div className="module-avatar-popup__profile__name">
{profileName || title} <Emojify text={profileName || title} />
</div> </div>
{shouldShowNumber ? ( {shouldShowNumber ? (
<div className="module-avatar-popup__profile__number"> <div className="module-avatar-popup__profile__number">

7
ts/components/ProfileEditor.tsx
View File

@ -39,6 +39,7 @@ import { Spinner } from './Spinner';
import { UsernameSaveState } from '../state/ducks/conversationsEnums'; import { UsernameSaveState } from '../state/ducks/conversationsEnums';
import { MAX_USERNAME, MIN_USERNAME } from '../types/Username'; import { MAX_USERNAME, MIN_USERNAME } from '../types/Username';
import { isWhitespace, trim } from '../util/whitespaceStringUtil'; import { isWhitespace, trim } from '../util/whitespaceStringUtil';
import { Emojify } from './conversation/Emojify';
export enum EditState { export enum EditState {
None = 'None', None = 'None',
@ -736,7 +737,7 @@ export const ProfileEditor = ({
icon={ icon={
<i className="ProfileEditor__icon--container ProfileEditor__icon ProfileEditor__icon--name" /> <i className="ProfileEditor__icon--container ProfileEditor__icon ProfileEditor__icon--name" />
} }
label={getFullNameText()} label={<Emojify text={getFullNameText()} />}
onClick={() => { onClick={() => {
setEditState(EditState.ProfileName); setEditState(EditState.ProfileName);
}} }}
@ -786,7 +787,9 @@ export const ProfileEditor = ({
<i className="ProfileEditor__icon--container ProfileEditor__icon ProfileEditor__icon--bio" /> <i className="ProfileEditor__icon--container ProfileEditor__icon ProfileEditor__icon--bio" />
) )
} }
label={fullBio.aboutText || i18n('ProfileEditor--about')} label={
<Emojify text={fullBio.aboutText || i18n('ProfileEditor--about')} />
}
onClick={() => { onClick={() => {
setEditState(EditState.Bio); setEditState(EditState.Bio);
}} }}