Merge pull request #3787 from matrix-org/travis/membership-tile

turt2live · web-flow · commit 6ef6b5909f73 · 2019-12-27T11:37:38.000-07:00
Fix NPE when filtering the room list
diff --git a/src/components/views/rooms/RoomTile.js b/src/components/views/rooms/RoomTile.js
@@ -380,7 +380,8 @@ module.exports = createReactClass({
             />;
 
             const { room } = this.props;
-            if (room.getMember(dmUserId).membership === "join" && room.getJoinedMemberCount() === 2) {
+            const member = room.getMember(dmUserId);
+            if (member && member.membership === "join" && room.getJoinedMemberCount() === 2) {
                 const UserOnlineDot = sdk.getComponent('rooms.UserOnlineDot');
                 dmOnline = <UserOnlineDot userId={dmUserId} />;
             }

Original file line number	Diff line number	Diff line change
`@@ -380,7 +380,8 @@ module.exports = createReactClass({`
`380`	`380`	`/>;`
`381`	`381`
`382`	`382`	`const { room } = this.props;`
`383`		`- if (room.getMember(dmUserId).membership === "join" && room.getJoinedMemberCount() === 2) {`
	`383`	`+ const member = room.getMember(dmUserId);`
	`384`	`+ if (member && member.membership === "join" && room.getJoinedMemberCount() === 2) {`
`384`	`385`	`const UserOnlineDot = sdk.getComponent('rooms.UserOnlineDot');`
`385`	`386`	`dmOnline = <UserOnlineDot userId={dmUserId} />;`
`386`	`387`	`}`