From 3d4cd8aa1c6c8acf9c8d7e83f5fce570ae19a46a Mon Sep 17 00:00:00 2001 From: Bruno Windels Date: Wed, 17 Jul 2019 10:19:44 +0200 Subject: [PATCH] local echos should always be ignored (for both RM and RR),so remove flag pending events won't be in liveEvents (where we look) anyway --- src/components/structures/TimelinePanel.js | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/src/components/structures/TimelinePanel.js b/src/components/structures/TimelinePanel.js index e367544492..5c18267637 100644 --- a/src/components/structures/TimelinePanel.js +++ b/src/components/structures/TimelinePanel.js @@ -738,14 +738,8 @@ const TimelinePanel = React.createClass({ // move the RM to *after* the message at the bottom of the screen. This // avoids a problem whereby we never advance the RM if there is a huge // message which doesn't fit on the screen. - // - // But ignore local echoes for this - they have a temporary event ID - // and we'll get confused when their ID changes and we can't figure out - // where the RM is pointing to. The read marker will be invisible for - // now anyway, so this doesn't really matter. const lastDisplayedIndex = this._getLastDisplayedEventIndex({ allowPartial: true, - ignoreEchoes: true, }); if (lastDisplayedIndex === null) { @@ -1128,7 +1122,6 @@ const TimelinePanel = React.createClass({ _getLastDisplayedEventIndex: function(opts) { opts = opts || {}; const ignoreOwn = opts.ignoreOwn || false; - const ignoreEchoes = opts.ignoreEchoes || false; const allowPartial = opts.allowPartial || false; const messagePanel = this.refs.messagePanel; @@ -1175,7 +1168,7 @@ const TimelinePanel = React.createClass({ adjacentInvisibleEventCount = 0; } - const shouldIgnore = (ignoreEchoes && ev.status) || // local echo + const shouldIgnore = !!ev.status || // local echo (ignoreOwn && ev.sender && ev.sender.userId == myUserId); // own message const isWithoutTile = !EventTile.haveTileForEvent(ev) || shouldHideEvent(ev);