OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity

[Backport staging] Fix EventTile avatars being rendered with a size of 0 instead of hidden (#11577) 

Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
pull/28217/head
ElementRobot 2023-09-07 09:36:42 +02:00 committed by GitHub
parent 87272fc3c6
commit 708537d615
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/components/views/rooms/EventTile.tsx
View File

@ -1003,7 +1003,7 @@ export class UnwrappedEventTile extends React.Component<EventTileProps, IState>
let avatar: JSX.Element | null = null; let avatar: JSX.Element | null = null;
let sender: JSX.Element | null = null; let sender: JSX.Element | null = null;
let avatarSize: string; let avatarSize: string | null;
let needsSenderProfile: boolean; let needsSenderProfile: boolean;
if (isRenderingNotification) { if (isRenderingNotification) {
@ -1021,7 +1021,7 @@ export class UnwrappedEventTile extends React.Component<EventTileProps, IState>
avatarSize = "32px"; avatarSize = "32px";
needsSenderProfile = true; needsSenderProfile = true;
} else if (eventType === EventType.RoomCreate || isBubbleMessage) { } else if (eventType === EventType.RoomCreate || isBubbleMessage) {
avatarSize = "0"; avatarSize = null;
needsSenderProfile = false; needsSenderProfile = false;
} else if (this.props.layout == Layout.IRC) { } else if (this.props.layout == Layout.IRC) {
avatarSize = "14px"; avatarSize = "14px";
@ -1032,14 +1032,14 @@ export class UnwrappedEventTile extends React.Component<EventTileProps, IState>
ElementCall.CALL_EVENT_TYPE.matches(eventType) ElementCall.CALL_EVENT_TYPE.matches(eventType)
) { ) {
// no avatar or sender profile for continuation messages and call tiles // no avatar or sender profile for continuation messages and call tiles
avatarSize = "0"; avatarSize = null;
needsSenderProfile = false; needsSenderProfile = false;
} else { } else {
avatarSize = "30px"; avatarSize = "30px";
needsSenderProfile = true; needsSenderProfile = true;
} }
if (this.props.mxEvent.sender && avatarSize) { if (this.props.mxEvent.sender && avatarSize !== null) {
let member: RoomMember | null = null; let member: RoomMember | null = null;
// set member to receiver (target) if it is a 3PID invite // set member to receiver (target) if it is a 3PID invite
// so that the correct avatar is shown as the text is // so that the correct avatar is shown as the text is