Merge pull request #6749 from matrix-org/gsouquet/fix-reply-display
Fix replies not appearing in timelinepull/21833/head
commit
ecd1920a4a
|
@ -448,7 +448,7 @@ export default class MessagePanel extends React.Component<IProps, IState> {
|
||||||
// Always show highlighted event
|
// Always show highlighted event
|
||||||
if (this.props.highlightedEventId === mxEv.getId()) return true;
|
if (this.props.highlightedEventId === mxEv.getId()) return true;
|
||||||
|
|
||||||
if (mxEv.replyEventId
|
if (mxEv.replyInThread
|
||||||
&& this.props.hideThreadedMessages
|
&& this.props.hideThreadedMessages
|
||||||
&& SettingsStore.getValue("feature_thread")) {
|
&& SettingsStore.getValue("feature_thread")) {
|
||||||
return false;
|
return false;
|
||||||
|
|
Loading…
Reference in New Issue