Merge pull request #6842 from matrix-org/gsouquet/fix-19016

matrix-org · Sep 21, 2021 · 14c92b7 · 14c92b7
2 parents c632e43 + 0a5e177
commit 14c92b7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/components/structures/MessagePanel.tsx b/src/components/structures/MessagePanel.tsx
@@ -448,7 +448,9 @@ export default class MessagePanel extends React.Component<IProps, IState> {
  // Always show highlighted event
  if (this.props.highlightedEventId === mxEv.getId()) return true;
 
- if (mxEv.replyInThread
+ // Checking if the message has a "parentEventId" as we do not
+ // want to hide the root event of the thread
+ if (mxEv.replyInThread && mxEv.parentEventId
  && this.props.hideThreadedMessages
  && SettingsStore.getValue("feature_thread")) {
  return false;

diff --git a/src/components/views/rooms/EventTile.tsx b/src/components/views/rooms/EventTile.tsx
@@ -521,7 +521,7 @@ export default class EventTile extends React.Component<IProps, IState> {
 
  const thread = this.state.thread;
  const room = MatrixClientPeg.get().getRoom(this.props.mxEvent.getRoomId());
- if (!thread || this.props.showThreadInfo === false) {
+ if (!thread || this.props.showThreadInfo === false || thread.length <= 1) {
  return null;
  }