From 4b173f05807552092fda5216ecff0838bff3e2b0 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Wed, 26 Aug 2020 17:02:25 -0500 Subject: [PATCH] Chats: sort messages properly --- app/soapbox/features/chats/components/chat_message_list.js | 2 +- app/soapbox/reducers/chat_message_lists.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/soapbox/features/chats/components/chat_message_list.js b/app/soapbox/features/chats/components/chat_message_list.js index e7c37d8cc..d0b2a005f 100644 --- a/app/soapbox/features/chats/components/chat_message_list.js +++ b/app/soapbox/features/chats/components/chat_message_list.js @@ -12,7 +12,7 @@ const mapStateToProps = (state, { chatMessageIds }) => ({ chatMessages: chatMessageIds.reduce((acc, curr) => { const chatMessage = state.getIn(['chat_messages', curr]); return chatMessage ? acc.push(chatMessage) : acc; - }, ImmutableList()), + }, ImmutableList()).sort(), }); export default @connect(mapStateToProps) diff --git a/app/soapbox/reducers/chat_message_lists.js b/app/soapbox/reducers/chat_message_lists.js index c039a4a0b..d13f02ef3 100644 --- a/app/soapbox/reducers/chat_message_lists.js +++ b/app/soapbox/reducers/chat_message_lists.js @@ -28,7 +28,7 @@ export default function chatMessageLists(state = initialState, action) { case CHAT_MESSAGES_IMPORT: return importMessages(state, action.chatMessages); case CHAT_MESSAGES_FETCH_SUCCESS: - return updateList(state, action.chatId, action.data.map(chat => chat.id)); + return updateList(state, action.chatId, action.data.map(chat => chat.id).reverse()); case CHAT_MESSAGE_SEND_SUCCESS: return updateList(state, action.chatId, [action.data.id]); default: