mirror of
https://github.com/vector-im/element-web.git
synced 2025-11-01 08:41:48 +01:00
Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
commit
ea4c4455c0
@ -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…
x
Reference in New Issue
Block a user