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

Merge pull request #2006 from matrix-org/t3chguy/notif_panel_fixes 

notif panel fixes
pull/21833/head
Luke Barnard 2018-06-25 09:53:24 +01:00 committed by GitHub
parent 5b027c6410 f7a0ad3aa0
commit 383dccebb4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/components/views/messages/SenderProfile.js
View File

@ -72,14 +72,12 @@ export default React.createClass({
_updateRelatedGroups() { _updateRelatedGroups() {
if (this.unmounted) return; if (this.unmounted) return;
const relatedGroupsEvent = this.context.matrixClient const room = this.context.matrixClient.getRoom(this.props.mxEvent.getRoomId());
.getRoom(this.props.mxEvent.getRoomId()) if (!room) return;
.currentState
.getStateEvents('m.room.related_groups', ''); const relatedGroupsEvent = room.currentState.getStateEvents('m.room.related_groups', '');
this.setState({ this.setState({
relatedGroups: relatedGroupsEvent ? relatedGroups: relatedGroupsEvent ? relatedGroupsEvent.getContent().groups || [] : [],
relatedGroupsEvent.getContent().groups || []
: [],
}); });
}, },

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

@ -621,13 +621,14 @@ module.exports = withMatrixClient(React.createClass({
switch (this.props.tileShape) { switch (this.props.tileShape) {
case 'notif': { case 'notif': {
const EmojiText = sdk.getComponent('elements.EmojiText');
const room = this.props.matrixClient.getRoom(this.props.mxEvent.getRoomId()); const room = this.props.matrixClient.getRoom(this.props.mxEvent.getRoomId());
return ( return (
<div className={classes}> <div className={classes}>
<div className="mx_EventTile_roomName"> <div className="mx_EventTile_roomName">
<a href={permalink} onClick={this.onPermalinkClicked}> <EmojiText element="a" href={permalink} onClick={this.onPermalinkClicked}>
{ room ? room.name : '' } { room ? room.name : '' }
</a> </EmojiText>
</div> </div>
<div className="mx_EventTile_senderDetails"> <div className="mx_EventTile_senderDetails">
{ avatar } { avatar }