Merge pull request #4988 from matrix-org/uhoreg/fix_encryption_info

check that encryptionInfo.sender is set
2020-07-15 14:31:38 -04:00
parent 7ab1416787 aa445a061d
commit e1cf5ecd2f
1 changed files with 1 additions and 1 deletions
--- a/src/components/views/rooms/EventTile.js
+++ b/src/components/views/rooms/EventTile.js
@@ -333,7 +333,7 @@ export default createReactClass({
            return;
        }

-        const eventSenderTrust = this.context.checkDeviceTrust(
+        const eventSenderTrust = encryptionInfo.sender && this.context.checkDeviceTrust(
            senderId, encryptionInfo.sender.deviceId,
        );
        if (!eventSenderTrust) {