Merge pull request #1908 from vector-im/rav/silence_warning

Fix a warning from RoomSubList
2016-08-01 14:27:35 +01:00 · 2016-08-01 14:27:35 +01:00 · d21e4fb86a
parent 2123fec8ed 0d4f35bed1
commit d21e4fb86a
1 changed files with 5 additions and 1 deletions
--- a/src/components/structures/RoomSubList.js
+++ b/src/components/structures/RoomSubList.js
@ -61,8 +61,12 @@ var RoomSubList = React.createClass({
        label: React.PropTypes.string.isRequired,
        tagName: React.PropTypes.string,
        editable: React.PropTypes.bool,
+
        order: React.PropTypes.string.isRequired,
-        selectedRoom: React.PropTypes.string.isRequired,
+
+        // undefined if no room is selected (eg we are showing settings)
+        selectedRoom: React.PropTypes.string,
+
        startAsHidden: React.PropTypes.bool,
        showSpinner: React.PropTypes.bool, // true to show a spinner if 0 elements when expanded
        collapsed: React.PropTypes.bool.isRequired, // is LeftPanel collapsed?