Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Fix one variant of a scroll jump that occurs when decrypting an m.text #1656

Merged
merged 3 commits into from
Dec 15, 2017
Merged

Fix one variant of a scroll jump that occurs when decrypting an m.text #1656

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
196e1a4
Fix one variant of a scroll jump that occurs when decrypting an m.text
lukebarnard1 Dec 8, 2017
a516c18
Indicate event tile resize after rendering
lukebarnard1 Dec 15, 2017
7f551f5
Add comments to _onDecrypted
lukebarnard1 Dec 15, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/components/views/rooms/EventTile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,8 @@ module.exports = withMatrixClient(React.createClass({
*/
_onDecrypted: function() {
// we need to re-verify the sending device.
// (we call onWidgetLoad in _verifyEvent to handle the case where decryption
// has caused a change in size of the event tile)
this._verifyEvent(this.props.mxEvent);
this.forceUpdate();
},
Expand All @@ -214,6 +216,9 @@ module.exports = withMatrixClient(React.createClass({
const verified = await this.props.matrixClient.isEventSenderVerified(mxEvent);
this.setState({
verified: verified,
}, () => {
// Decryption may have caused a change in size
this.props.onWidgetLoad();
});
},

Expand Down