imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into hs/purge-irc-hack

Browse source
This commit is contained in:
Will Hunt 2018-10-03 19:39:14 +01:00 • committed by GitHub
commit 17915b5082
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
199 changed files with 11956 additions and 10603 deletions
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() {
if (this.unmounted) return;
const relatedGroupsEvent = this.context.matrixClient
.getRoom(this.props.mxEvent.getRoomId())
.currentState
.getStateEvents('m.room.related_groups', '');
const room = this.context.matrixClient.getRoom(this.props.mxEvent.getRoomId());
if (!room) return;
const relatedGroupsEvent = room.currentState.getStateEvents('m.room.related_groups', '');
this.setState({
relatedGroups: relatedGroupsEvent ?
relatedGroupsEvent.getContent().groups || []
: [],
relatedGroups: relatedGroupsEvent ? relatedGroupsEvent.getContent().groups || [] : [],
});
},