Merge pull request #19266 from Ithanil/fix_raise-hand_away_reactions

Fix: away and raiseHands 'reactions' being hidden by avatar image
This commit is contained in:
Anton Georgiev 2024-01-15 12:29:08 -05:00 committed by GitHub
commit 792add0a3d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -636,7 +636,9 @@ class UserListItem extends PureComponent {
size: '1.3rem', size: '1.3rem',
}; };
let userAvatarFiltered = user.avatar; const userAvatarFiltered = (user.raiseHand === true || user.away === true || user.reaction !== 'none')
? ''
: user.avatar;
const emojiIcons = [ const emojiIcons = [
{ {
@ -661,7 +663,6 @@ class UserListItem extends PureComponent {
} if (user.emoji !== 'none' && user.emoji !== 'notAway') { } if (user.emoji !== 'none' && user.emoji !== 'notAway') {
return <Icon iconName={normalizeEmojiName(user.emoji)} />; return <Icon iconName={normalizeEmojiName(user.emoji)} />;
} if (user.reaction !== 'none') { } if (user.reaction !== 'none') {
userAvatarFiltered = '';
return user.reaction; return user.reaction;
} if (user.name) { } if (user.name) {
return user.name.toLowerCase().slice(0, 2); return user.name.toLowerCase().slice(0, 2);