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

Commit 0079e70

Browse files
author
Luke Barnard
committed
Display RM when it = a standalone member event
Standalone = not next to any member events in the timeline. fixes element-hq/element-web#4694
1 parent ecd1735 commit 0079e70

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

src/components/structures/MessagePanel.js

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -307,13 +307,13 @@ module.exports = React.createClass({
307307
for (i = 0; i < this.props.events.length; i++) {
308308
let mxEv = this.props.events[i];
309309
let eventId = mxEv.getId();
310-
let readMarkerInMels = false;
311310
let last = (mxEv === lastShownEvent);
312311

313312
const wantTile = this._shouldShowEvent(mxEv);
314313

315314
// Wrap consecutive member events in a ListSummary, ignore if redacted
316315
if (isMembershipChange(mxEv) && wantTile) {
316+
let readMarkerInMels = false;
317317
let ts1 = mxEv.getTs();
318318
// Ensure that the key of the MemberEventListSummary does not change with new
319319
// member events. This will prevent it from being re-created unnecessarily, and
@@ -330,6 +330,11 @@ module.exports = React.createClass({
330330
ret.push(dateSeparator);
331331
}
332332

333+
// If RM event is the first in the MELS, append the RM after MELS
334+
if (mxEv.getId() === this.props.readMarkerEventId) {
335+
readMarkerInMels = true;
336+
}
337+
333338
let summarisedEvents = [mxEv];
334339
for (;i + 1 < this.props.events.length; i++) {
335340
const collapsedMxEv = this.props.events[i + 1];

0 commit comments

Comments
 (0)