Merge pull request #289 from matrix-org/dbkr/email_notifs

Support for enabling email notifications
This commit is contained in:
Matthew Hodgson 2016-05-10 16:39:37 +02:00
commit 62a1100fca
2 changed files with 37 additions and 2 deletions

View file

@ -328,12 +328,12 @@ module.exports = React.createClass({
);
}
var notification_area;
if (!MatrixClientPeg.get().isGuest()) {
if (!MatrixClientPeg.get().isGuest() && this.state.threepids !== undefined) {
notification_area = (<div>
<h3>Notifications</h3>
<div className="mx_UserSettings_section">
<Notifications/>
<Notifications threepids={this.state.threepids} />
</div>
</div>);
}