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

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
parent cc155ac049 c4fc2a8089
commit f7c03acb58
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}