Merge pull request #1398 from matrix-org/luke/fix-ugly-manage-integs-button

Only show the integ management button if user is joined
This commit is contained in:
David Baker 2017-09-18 13:42:11 +01:00 committed by GitHub
commit 0958689d25
2 changed files with 2 additions and 2 deletions

View file

@ -48,7 +48,7 @@ export default class ManageIntegsButton extends React.Component {
this.forceUpdate(); this.forceUpdate();
}, (err) => { }, (err) => {
this.setState({ scalarError: err}); this.setState({ scalarError: err});
console.error(err); console.error('Error whilst initialising scalarClient for ManageIntegsButton', err);
}); });
} }
} }

View file

@ -324,7 +324,7 @@ module.exports = React.createClass({
let rightRow; let rightRow;
let manageIntegsButton; let manageIntegsButton;
if(this.props.room && this.props.room.roomId) { if(this.props.room && this.props.room.roomId && this.props.inRoom) {
manageIntegsButton = <ManageIntegsButton manageIntegsButton = <ManageIntegsButton
roomId={this.props.room.roomId} roomId={this.props.room.roomId}
/>; />;