Merge branch 'fix-wrong-emoji-display' into 'main'
fix: show correct emoji selected See merge request soapbox-pub/soapbox!3296
This commit is contained in:
commit
4031de3f52
|
@ -661,9 +661,12 @@ const StatusActionBar: React.FC<IStatusActionBar> = ({
|
||||||
const emojiReactCount = status.reactions?.reduce((acc, reaction) => acc + (reaction.count ?? 0), 0) ?? 0; // allow all emojis
|
const emojiReactCount = status.reactions?.reduce((acc, reaction) => acc + (reaction.count ?? 0), 0) ?? 0; // allow all emojis
|
||||||
|
|
||||||
const meEmojiReact = status.reactions?.find((emojiReact) => emojiReact.me) // allow all emojis
|
const meEmojiReact = status.reactions?.find((emojiReact) => emojiReact.me) // allow all emojis
|
||||||
?? (account && status.favourited)
|
?? (
|
||||||
? { count: 1, me: status.account.id === account!.id, name: '👍' }
|
status.favourited && account
|
||||||
: undefined;
|
? { count: 1, me: status.account.id === account.id, name: '👍' }
|
||||||
|
: undefined
|
||||||
|
);
|
||||||
|
|
||||||
const meEmojiName = meEmojiReact?.name as keyof typeof reactMessages | undefined;
|
const meEmojiName = meEmojiReact?.name as keyof typeof reactMessages | undefined;
|
||||||
|
|
||||||
const reactMessages = {
|
const reactMessages = {
|
||||||
|
|
Loading…
Reference in New Issue