Merge branch 'develop' into fix-indent

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-29 20:08:14 +02:00
parent 232b87a3b4 d203e8f129
commit 5913203dc6
58 changed files with 1607 additions and 703 deletions
@@ -128,7 +128,11 @@ export default class RoomStatusBar extends React.Component {

    _onRoomLocalEchoUpdated = (event, room, oldEventId, oldStatus) => {
        if (room.roomId !== this.props.room.roomId) return;
-        this.setState({unsentMessages: getUnsentMessages(this.props.room)});
+        const messages = getUnsentMessages(this.props.room);
+        this.setState({
+            unsentMessages: messages,
+            isResending: messages.length > 0 && this.state.isResending,
+        });
    };

    // Check whether current size is greater than 0, if yes call props.onVisible