Merge branch 'develop' into travis/sourcemaps

This commit is contained in:
Travis Ralston 2020-01-13 11:19:41 -07:00
commit 5fd27a10bb
24 changed files with 722 additions and 41 deletions

View file

@ -74,7 +74,7 @@ export default class HeaderButtons extends React.Component {
const rps = RightPanelStore.getSharedInstance();
if (this.state.headerKind === HEADER_KIND_ROOM) {
this.setState({phase: rps.visibleRoomPanelPhase});
} else if (this.state.head === HEADER_KIND_GROUP) {
} else if (this.state.headerKind === HEADER_KIND_GROUP) {
this.setState({phase: rps.visibleGroupPanelPhase});
}
}