Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Fix incorrect logic to hide thread relations #6951

Merged
merged 6 commits into from
Oct 15, 2021

Conversation

germain-gg
Copy link
Contributor

@germain-gg germain-gg commented Oct 15, 2021

Following up on #6949 that introduced a weird logic for hiding events from the main timeline

  • Fix incorrect logic to hide thread relations
  • Reconcile threads root with its children before displaying it

This PR currently has no changelog labels, so will not be included in changelogs.

Add one of: T-Deprecation, T-Enhancement, T-Defect, T-Task to indicate what type of change this is plus X-Breaking-Change if it's a breaking change.

Preview: https://6169872b65e896df257c4516--matrix-react-sdk.netlify.app
⚠️ Do you trust the author of this PR? Maybe this build will steal your keys or give you malware. Exercise caution. Use test accounts.

@germain-gg germain-gg requested a review from a team as a code owner October 15, 2021 09:27
const room = MatrixClientPeg.get().getRoom(this.props.mxEvent.getRoomId());
const thread = room.threads.get(this.props.mxEvent.getId());
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Worth a comment on why this.state.thread isn't the right thing here?

@germain-gg germain-gg merged commit cee0d68 into develop Oct 15, 2021
@germain-gg germain-gg deleted the gsouquet/fix-thread-root-hidden branch October 15, 2021 14:00
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants