matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-20 16:22:28 +03:00
Code Activity

Merge pull request #1656 from matrix-org/luke/fix-scroll-jump-on-message-decryption

Browse Source 
Fix one variant of a scroll jump that occurs when decrypting an m.text
This commit is contained in:
Luke Barnard
2017-12-15 17:25:21 +00:00
committed by GitHub
parent 0a944e0746 7f551f517b
commit d2066f41d5
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/components/views/rooms/EventTile.js
View File

@@ -196,6 +196,8 @@ module.exports = withMatrixClient(React.createClass({
*/ */
_onDecrypted: function() { _onDecrypted: function() {
// we need to re-verify the sending device. // 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._verifyEvent(this.props.mxEvent);
this.forceUpdate(); this.forceUpdate();
}, },
@@ -214,6 +216,9 @@ module.exports = withMatrixClient(React.createClass({
const verified = await this.props.matrixClient.isEventSenderVerified(mxEvent); const verified = await this.props.matrixClient.isEventSenderVerified(mxEvent);
this.setState({ this.setState({
verified: verified, verified: verified,
}, () => {
// Decryption may have caused a change in size
this.props.onWidgetLoad();
}); });
}, },