mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-10-26 20:55:56 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #932 from matrix-org/luke/new-guest-access-no-notif-bar-if-is-guest

Browse source 
Don't show notif nag bar if guest
This commit is contained in:
Luke Barnard 2017-05-26 16:42:12 +01:00 committed by GitHub
commit 9f902c1190
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/components/structures/LoggedInView.js
View file

@ -253,6 +253,7 @@ export default React.createClass({
break; break;
} }
const isGuest = this.props.matrixClient.isGuest();
var topBar; var topBar;
if (this.props.hasNewVersion) { if (this.props.hasNewVersion) {
topBar = <NewVersionBar version={this.props.version} newVersion={this.props.newVersion} topBar = <NewVersionBar version={this.props.version} newVersion={this.props.newVersion}
@ -260,7 +261,7 @@ export default React.createClass({
/>; />;
} else if (this.state.userHasGeneratedPassword) { } else if (this.state.userHasGeneratedPassword) {
topBar = <PasswordNagBar />; topBar = <PasswordNagBar />;
} else if (Notifier.supportsDesktopNotifications() && !Notifier.isEnabled() && !Notifier.isToolbarHidden()) { } else if (!isGuest && Notifier.supportsDesktopNotifications() && !Notifier.isEnabled() && !Notifier.isToolbarHidden()) {
topBar = <MatrixToolbar />; topBar = <MatrixToolbar />;
} }