mirrors/vector-im-hydrogen-web
1
0
Fork 0
mirror of https://github.com/vector-im/hydrogen-web.git synced 2024-11-20 03:25:52 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #410 from vector-im/invite-avatar-fix

Browse Source 
Fix error on invites in room list panel.
This commit is contained in:
Bruno Windels 2021-07-18 11:14:54 +00:00 committed by GitHub
commit 934e7e6f71
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/matrix/room/Invite.js
View File

@ -58,7 +58,7 @@ export class Invite extends EventEmitter {
/** @see BaseRoom.avatarColorId */
get avatarColorId() {
return this._inviteData.avatarColorId;
return this._inviteData.avatarColorId || this.id;
}
get timestamp() {
@ -180,7 +180,7 @@ export class Invite extends EventEmitter {
_createData(inviteState, myInvite, inviter, summaryData, heroes) {
const name = heroes ? heroes.roomName : summaryData.name;
const avatarUrl = heroes ? heroes.roomAvatarUrl : summaryData.avatarUrl;
const avatarColorId = heroes ? heroes.roomAvatarColorId : this.id;
const avatarColorId = heroes?.roomAvatarColorId || this.id;
return {
roomId: this.id,
isEncrypted: !!summaryData.encryption,