Merge pull request #410 from vector-im/invite-avatar-fix
Fix error on invites in room list panel.
This commit is contained in:
commit
934e7e6f71
1 changed files with 2 additions and 2 deletions
|
@ -58,7 +58,7 @@ export class Invite extends EventEmitter {
|
||||||
|
|
||||||
/** @see BaseRoom.avatarColorId */
|
/** @see BaseRoom.avatarColorId */
|
||||||
get avatarColorId() {
|
get avatarColorId() {
|
||||||
return this._inviteData.avatarColorId;
|
return this._inviteData.avatarColorId || this.id;
|
||||||
}
|
}
|
||||||
|
|
||||||
get timestamp() {
|
get timestamp() {
|
||||||
|
@ -180,7 +180,7 @@ export class Invite extends EventEmitter {
|
||||||
_createData(inviteState, myInvite, inviter, summaryData, heroes) {
|
_createData(inviteState, myInvite, inviter, summaryData, heroes) {
|
||||||
const name = heroes ? heroes.roomName : summaryData.name;
|
const name = heroes ? heroes.roomName : summaryData.name;
|
||||||
const avatarUrl = heroes ? heroes.roomAvatarUrl : summaryData.avatarUrl;
|
const avatarUrl = heroes ? heroes.roomAvatarUrl : summaryData.avatarUrl;
|
||||||
const avatarColorId = heroes ? heroes.roomAvatarColorId : this.id;
|
const avatarColorId = heroes?.roomAvatarColorId || this.id;
|
||||||
return {
|
return {
|
||||||
roomId: this.id,
|
roomId: this.id,
|
||||||
isEncrypted: !!summaryData.encryption,
|
isEncrypted: !!summaryData.encryption,
|
||||||
|
|
Reference in a new issue