Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering

2020-04-10 13:56:01 +03:00
parent 03d36f30ec 8f49ed664f
commit 26a4a23a33
387 changed files with 13248 additions and 5078 deletions
--- a/src/components/views/elements/ReplyThread.js
+++ b/src/components/views/elements/ReplyThread.js
@@ -183,7 +183,7 @@ export default class ReplyThread extends React.Component {
            ref={ref} permalinkCreator={permalinkCreator} />;
    }

-    componentWillMount() {
+    componentDidMount() {
        this.unmounted = false;
        this.room = this.context.getRoom(this.props.parentEv.getRoomId());
        this.room.on("Room.redaction", this.onRoomRedaction);