diff --git a/src/models/event.ts b/src/models/event.ts index d596c9463..2b8e32ada 100644 --- a/src/models/event.ts +++ b/src/models/event.ts @@ -107,7 +107,7 @@ export interface IEventRelation { "m.in_reply_to"?: { event_id: string; is_falling_back?: boolean; - "io.element.is_falling_back"?: boolean; // unstable variant of `is_falling_back` - MSC3440 + "io.element.show_reply"?: boolean; // unstable variant of `is_falling_back` - MSC3440 }; key?: string; } diff --git a/src/models/thread.ts b/src/models/thread.ts index 5255914b2..b44172d33 100644 --- a/src/models/thread.ts +++ b/src/models/thread.ts @@ -196,7 +196,7 @@ export class Thread extends TypedEventEmitter { // There is a risk that the `localTimestamp` approximation will not be accurate // when threads are used over federation. That could results in the reply // count value drifting away from the value returned by the server - if (!this.lastEvent || (isThreadReply && event.localTimestamp > this.replyToEvent.localTimestamp)) { + if (!this.lastEvent || (isThreadReply && event.localTimestamp > this.lastEvent.localTimestamp)) { this.lastEvent = event; if (this.lastEvent.getId() !== this.id) { // This counting only works when server side support is enabled