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

Merge pull request #3117 from matrix-org/bwindels/redactions-blended-echo

Browse source 
Blend pending redactions
This commit is contained in:
Bruno Windels 2019-06-18 13:09:25 +00:00 • committed by GitHub
commit f7c03acb58
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/components/structures/MessagePanel.js
View file

@ -592,7 +592,7 @@ module.exports = React.createClass({
readReceiptMap={this._readReceiptMap}
showUrlPreview={this.props.showUrlPreview}
checkUnmounting={this._isUnmounting}
eventSendStatus={mxEv.replacementOrOwnStatus()}
eventSendStatus={mxEv.getAssociatedStatus()}
tileShape={this.props.tileShape}
isTwelveHour={this.props.isTwelveHour}
permalinkCreator={this.props.permalinkCreator}