imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/develop' into dbkr/scalar

Browse source
This commit is contained in:
David Baker 2016-05-17 10:30:32 +01:00
commit ffe892b4b1
3 changed files with 45 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/components/structures/UserSettings.js
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>);
}