Merge pull request #3005 from matrix-org/jryans/notif-error

Only show reactions in main message timeline

src/components/structures/MessagePanel.js

@@ -96,6 +96,9 @@ module.exports = React.createClass({
 
         // helper function to access relations for an event
         getRelationsForEvent: PropTypes.func,
+
+        // whether to show reactions for an event
+        showReactions: PropTypes.bool,
     },
 
     componentWillMount: function() {
@@ -541,6 +544,7 @@ module.exports = React.createClass({
                     last={last}
                     isSelectedEvent={highlight}
                     getRelationsForEvent={this.props.getRelationsForEvent}
+                    showReactions={this.props.showReactions}
                 />
             </li>,
         );

src/components/structures/RoomView.js

@@ -1832,6 +1832,7 @@ module.exports = React.createClass({
                 membersLoaded={this.state.membersLoaded}
                 permalinkCreator={this._getPermalinkCreatorForRoom(this.state.room)}
                 resizeNotifier={this.props.resizeNotifier}
+                showReactions={true}
             />);
 
         let topUnreadMessagesBar = null;

src/components/structures/TimelinePanel.js

@@ -106,6 +106,9 @@ const TimelinePanel = React.createClass({
 
         // placeholder text to use if the timeline is empty
         empty: PropTypes.string,
+
+        // whether to show reactions for an event
+        showReactions: PropTypes.bool,
     },
 
     statics: {
@@ -1261,6 +1264,7 @@ const TimelinePanel = React.createClass({
                 resizeNotifier={this.props.resizeNotifier}
                 getRelationsForEvent={this.getRelationsForEvent}
                 editEvent={this.state.editEvent}
+                showReactions={this.props.showReactions}
             />
         );
     },