From b1cac5f01b91e115a901fa5313904a2475845e74 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Fri, 16 Oct 2020 15:12:41 +1100 Subject: [PATCH] fix ordering of message with more recent at bottom of the view --- stylesheets/_session_conversation.scss | 1 + .../session/conversation/SessionConversation.tsx | 8 +++----- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/stylesheets/_session_conversation.scss b/stylesheets/_session_conversation.scss index 781ac84f8..3c1cd7dc2 100644 --- a/stylesheets/_session_conversation.scss +++ b/stylesheets/_session_conversation.scss @@ -79,6 +79,7 @@ flex-grow: 1; align-items: center; justify-content: center; + width: 100%; } .message-selection-overlay { diff --git a/ts/components/session/conversation/SessionConversation.tsx b/ts/components/session/conversation/SessionConversation.tsx index 014792d18..e6d9f23f1 100644 --- a/ts/components/session/conversation/SessionConversation.tsx +++ b/ts/components/session/conversation/SessionConversation.tsx @@ -285,7 +285,7 @@ export class SessionConversation extends React.Component { } ); - const messages = messageSet.models; + const messages = messageSet.models.reverse(); const messageFetchTimestamp = Date.now(); this.setState({ messages, messageFetchTimestamp }, () => { @@ -299,9 +299,7 @@ export class SessionConversation extends React.Component { fetchInterval = Constants.CONVERSATION.MESSAGE_FETCH_INTERVAL ) { const { conversationKey, messageFetchTimestamp } = this.state; - const conversationModel = window.ConversationController.get( - conversationKey - ); + const timestamp = getTimestamp(); // If we have pulled messages in the last interval, don't bother rescanning @@ -326,7 +324,7 @@ export class SessionConversation extends React.Component { ); // Set first member of series here. - const messageModels = messageSet.models; + const messageModels = messageSet.models.reverse(); const messages = []; let previousSender; for (let i = 0; i < messageModels.length; i++) {