From 3966d55d3bd54e5cfb9e3ae5c90f9664ce6feeee Mon Sep 17 00:00:00 2001 From: Scott Nonnenberg Date: Mon, 27 Apr 2020 09:15:31 -0700 Subject: [PATCH] Conversation.onOpened: Wait for outstanding message processing --- js/views/conversation_view.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/js/views/conversation_view.js b/js/views/conversation_view.js index 4db60a6d25..69e85c0882 100644 --- a/js/views/conversation_view.js +++ b/js/views/conversation_view.js @@ -1733,7 +1733,12 @@ window.log.warn(`onOpened: Did not find message ${messageId}`); } - this.loadNewestMessages(); + // Incoming messages may still be processing, so we wait until those are + // complete to pull the 500 most-recent messages in this conversation. + this.model.queueJob(() => { + this.loadNewestMessages(); + this.model.updateLastMessage(); + }); this.focusMessageField(); @@ -1742,8 +1747,6 @@ this.setQuoteMessage(quotedMessageId); } - this.model.updateLastMessage(); - const statusPromise = this.model.throttledGetProfiles(); // eslint-disable-next-line more/no-then this.statusFetch = statusPromise.then(() =>