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

Blend pending redactions

res/css/views/rooms/_EventTile.scss

@@ -169,6 +169,9 @@ limitations under the License.
 .mx_EventTile_sending .mx_RoomPill {
     opacity: 0.5;
 }
+.mx_EventTile_sending.mx_EventTile_redacted .mx_UnknownBody {
+    opacity: 0.4;
+}
 
 .mx_EventTile_notSent {
     color: $event-notsent-color;

src/components/structures/MessagePanel.js

@@ -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}