Fix issue with thread notification state ignoring initial events (#8417)

matrix-org · Apr 29, 2022 · fddbc42 · fddbc42
1 parent 565488a
commit fddbc42
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/components/views/rooms/EventTile.tsx b/src/components/views/rooms/EventTile.tsx
@@ -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,

diff --git a/src/stores/notifications/ThreadNotificationState.ts b/src/stores/notifications/ThreadNotificationState.ts
@@ -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 {