Merge pull request #6047 from robintown/fix-notification-panel

t3chguy · web-flow · commit 9182bff86eae · 2021-05-17T17:46:50.000+01:00
Fix crash on opening notification panel
diff --git a/src/components/structures/MessagePanel.js b/src/components/structures/MessagePanel.js
@@ -473,7 +473,7 @@ export default class MessagePanel extends React.Component {
     }
 
     get _roomHasPendingEdit() {
-        return localStorage.getItem(`mx_edit_room_${this.props.room.roomId}`);
+        return this.props.room && localStorage.getItem(`mx_edit_room_${this.props.room.roomId}`);
     }
 
     _getEventTiles() {

Original file line number	Diff line number	Diff line change
`@@ -473,7 +473,7 @@ export default class MessagePanel extends React.Component {`
`473`	`473`	`}`
`474`	`474`
`475`	`475`	`get _roomHasPendingEdit() {`
`476`		- return localStorage.getItem(`mx_edit_room_${this.props.room.roomId}`);
	`476`	+ return this.props.room && localStorage.getItem(`mx_edit_room_${this.props.room.roomId}`);
`477`	`477`	`}`
`478`	`478`
`479`	`479`	`_getEventTiles() {`