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

2018-09-05 17:09:54 +00:00 · 2018-09-05 17:09:54 +00:00 · 0979baa24d
parent c132b5b9fc 9f5ea73dc2
commit 0979baa24d
1 changed files with 2 additions and 2 deletions
--- a/src/components/views/rooms/MessageComposer.js
+++ b/src/components/views/rooms/MessageComposer.js
@ -309,8 +309,8 @@ export default class MessageComposer extends React.Component {
                </div>;
        }

-        const canSendMessages = !this.state.tombstone &&
-            this.props.room.maySendMessage();
+        const canSendMessages = !this.state.tombstone && this.props.room.currentState.maySendMessage(
+            MatrixClientPeg.get().credentials.userId);

        if (canSendMessages) {
            // This also currently includes the call buttons. Really we should