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

Attempt to fix soft crash on some pinned events by null guarding member

pull/21833/head
Michael Telatynski 2019-10-31 11:21:58 +00:00
parent 41792a23a6
commit ffb6054eac
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/components/views/rooms/PinnedEventTile.js
View File

@ -61,7 +61,9 @@ module.exports = createReactClass({
return this.props.mxRoom.currentState.mayClientSendStateEvent('m.room.pinned_events', MatrixClientPeg.get()); return this.props.mxRoom.currentState.mayClientSendStateEvent('m.room.pinned_events', MatrixClientPeg.get());
}, },
render: function() { render: function() {
const sender = this.props.mxRoom.getMember(this.props.mxEvent.getSender()); const sender = this.props.mxEvent.getSender();
// Get the latest sender profile rather than historical
const senderProfile = this.props.mxRoom.getMember(sender);
const avatarSize = 40; const avatarSize = 40;
let unpinButton = null; let unpinButton = null;
@ -83,10 +85,10 @@ module.exports = createReactClass({
</div> </div>
<span className="mx_PinnedEventTile_senderAvatar"> <span className="mx_PinnedEventTile_senderAvatar">
<MemberAvatar member={sender} width={avatarSize} height={avatarSize} /> <MemberAvatar member={senderProfile} width={avatarSize} height={avatarSize} fallbackUserId={sender} />
</span> </span>
<span className="mx_PinnedEventTile_sender"> <span className="mx_PinnedEventTile_sender">
{ sender.name } { senderProfile ? senderProfile.name : sender }
</span> </span>
<span className="mx_PinnedEventTile_timestamp"> <span className="mx_PinnedEventTile_timestamp">
{ formatFullDate(new Date(this.props.mxEvent.getTs())) } { formatFullDate(new Date(this.props.mxEvent.getTs())) }