Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
commit
ea4c4455c0
1 changed files with 4 additions and 1 deletions
|
@ -434,7 +434,10 @@ const LoggedInView = React.createClass({
|
|||
}
|
||||
|
||||
const usageLimitEvent = this.state.serverNoticeEvents.find((e) => {
|
||||
return e && e.getType() === 'm.server_notice.usage_limit_reached';
|
||||
return (
|
||||
e && e.getType() === 'm.room.message' &&
|
||||
e.getContent()['server_notice_type'] === 'm.server_notice.usage_limit_reached'
|
||||
);
|
||||
});
|
||||
|
||||
let topBar;
|
||||
|
|
Loading…
Reference in a new issue