matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-05 23:10:41 +03:00
Code Activity

Merge branch 'develop' into improved-forwarding-ui

Browse Source
This commit is contained in:
Robin Townsend
2021-05-19 12:39:48 -04:00
parent e798b36f1d aa4984019c
commit 678b298bab
67 changed files with 2134 additions and 567 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/structures/RoomView.tsx
View File

@@ -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);
};