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

Fix issue with thread notification state ignoring initial events #8417

Merged
merged 2 commits into from
Apr 29, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions src/components/views/rooms/EventTile.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -991,9 +991,7 @@ export class UnwrappedEventTile extends React.Component<IProps, IState> {
mx_EventTile_12hr: this.props.isTwelveHour,
// Note: we keep the `sending` state class for tests, not for our styles
mx_EventTile_sending: !isEditing && isSending,
mx_EventTile_highlight: (this.context.timelineRenderingType === TimelineRenderingType.Notification
? false
: this.shouldHighlight()),
mx_EventTile_highlight: this.shouldHighlight(),
mx_EventTile_selected: this.props.isSelectedEvent || this.state.contextMenu,
mx_EventTile_continuation: isContinuation || eventType === EventType.CallInvite,
mx_EventTile_last: this.props.last,
Expand Down
4 changes: 4 additions & 0 deletions src/stores/notifications/ThreadNotificationState.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@ export class ThreadNotificationState extends NotificationState implements IDestr
super();
this.thread.on(ThreadEvent.NewReply, this.handleNewThreadReply);
this.thread.on(ThreadEvent.ViewThread, this.resetThreadNotification);
if (this.thread.replyToEvent) {
// Process the current tip event
this.handleNewThreadReply(this.thread, this.thread.replyToEvent);
}
}

public destroy(): void {
Expand Down