From f0f721aa32f245578a3beca4523273ff70230f68 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 15 Jun 2017 20:22:38 +0100
Subject: [PATCH] make hiding redactions use new pattern

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/MessagePanel.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/components/structures/MessagePanel.js b/src/components/structures/MessagePanel.js
index e0ca612b0a..6728cb1a49 100644
--- a/src/components/structures/MessagePanel.js
+++ b/src/components/structures/MessagePanel.js
@@ -252,6 +252,9 @@ module.exports = React.createClass({
         // Always show highlighted event
         if (this.props.highlightedEventId === mxEv.getId()) return true;
 
+        // Hide redactions if behaviour enabled
+        if (mxEv.isRedacted() && this.props.hideRedactions) return false;
+
         const isMemberEvent = mxEv.getType() === "m.room.member" && mxEv.getStateKey() !== undefined;
         if (!isMemberEvent) {
             return true; // bail early: all the checks below concern member events only
@@ -511,8 +514,6 @@ module.exports = React.createClass({
             continuation = false;
         }
 
-        if (mxEv.isRedacted() && this.props.hideRedactions) return ret;
-
         var eventId = mxEv.getId();
         var highlight = (eventId == this.props.highlightedEventId);