imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into SuppressSpeechWhenSending

Browse source
This commit is contained in:
Michael Telatynski 2020-07-24 00:03:55 +01:00
commit c1d2e27f9c
239 changed files with 4980 additions and 10446 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/components/views/rooms/EventTile.js
View file

@ -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) {