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

2018-08-23 08:33:02 +00:00 · 2018-08-23 08:33:02 +00:00 · ea4c4455c0
parent f2821d6e76 b34aad50bc
commit ea4c4455c0
1 changed files with 4 additions and 1 deletions
--- a/src/components/structures/LoggedInView.js
+++ b/src/components/structures/LoggedInView.js
@ -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;