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

Merge pull request #5442 from RinkiyaKeDad/avatar-fix 

Fixed Avatar for 3PID invites
pull/21833/head
Michael Telatynski 2020-11-30 09:49:05 +00:00 committed by GitHub
parent bb1d52919a cb3b8b6c77
commit d4ed4a135c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/components/views/rooms/EventTile.js
View File

@ -745,13 +745,22 @@ export default class EventTile extends React.Component {
} }
if (this.props.mxEvent.sender && avatarSize) { if (this.props.mxEvent.sender && avatarSize) {
let member;
// set member to receiver (target) if it is a 3PID invite
// so that the correct avatar is shown as the text is
// `$target accepted the invitation for $email`
if (this.props.mxEvent.getContent().third_party_invite) {
member = this.props.mxEvent.target;
} else {
member = this.props.mxEvent.sender;
}
avatar = ( avatar = (
<div className="mx_EventTile_avatar"> <div className="mx_EventTile_avatar">
<MemberAvatar member={this.props.mxEvent.sender} <MemberAvatar member={member}
width={avatarSize} height={avatarSize} width={avatarSize} height={avatarSize}
viewUserOnClick={true} viewUserOnClick={true}
/> />
</div> </div>
); );
} }