Merge branch 'develop' into improved-forwarding-ui

2021-05-19 12:39:48 -04:00
parent e798b36f1d aa4984019c
commit 678b298bab
67 changed files with 2134 additions and 567 deletions
@@ -808,7 +808,7 @@ export default class RoomView extends React.Component<IProps, IState> {
    };

    private onEvent = (ev) => {
-        if (ev.isBeingDecrypted() || ev.isDecryptionFailure()) return;
+        if (ev.isBeingDecrypted() || ev.isDecryptionFailure() || ev.shouldAttemptDecryption()) return;
        this.handleEffects(ev);
    };