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

Initial move towards new ESLint config supporting TS

Browse source 
Co-authored-by: Sidney Keese <sidney@carbonfive.com>
This commit is contained in:
Chris Svenningsen 2020-08-31 17:09:28 -07:00 • committed by Josh Perez
parent c2aa8eb82b
commit 5b1536cc02
22 changed files with 3300 additions and 597 deletions
Download patch file Download diff file Expand all files Collapse all files

12
ts/components/emoji/Emoji.tsx
View file

@ -33,11 +33,13 @@ export const Emoji = React.memo(
}: Props,
ref
) => {
const image = shortName
? getImagePath(shortName, skinTone)
: emoji
? emojiToImage(emoji)
: '';
let image = '';
if (shortName) {
image = getImagePath(shortName, skinTone);
} else if (emoji) {
image = emojiToImage(emoji) || '';
}
const backgroundStyle = inline
? { backgroundImage: `url('${image}')` }
: {};