From 042cdcf69896579969100bb868b089368d92742d Mon Sep 17 00:00:00 2001
From: Tyler Brown Cifu Shuster <tyler@fivepaths.com>
Date: Tue, 8 Sep 2020 17:06:08 -0700
Subject: [PATCH] chat: show pending messages again

---
 .../src/views/apps/chat/components/lib/chat-window.tsx   | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkg/interface/src/views/apps/chat/components/lib/chat-window.tsx b/pkg/interface/src/views/apps/chat/components/lib/chat-window.tsx
index 18853f5e0..b5ca26c32 100644
--- a/pkg/interface/src/views/apps/chat/components/lib/chat-window.tsx
+++ b/pkg/interface/src/views/apps/chat/components/lib/chat-window.tsx
@@ -232,11 +232,14 @@ export class ChatWindow extends Component<ChatWindowProps, ChatWindowState> {
     const debouncedFetch = _.debounce(this.fetchMessages, 500).bind(this);
 
     envelopes
-      .concat(stationPendingMessages)
       .forEach((message) => {
         messages[message.number] = message;
       });
     
+    stationPendingMessages.sort((a, b) => a.when - b.when).forEach((message, index) => {
+      messages[mailboxSize + index + 1] = message;
+    });
+    
     return (
       <Fragment>
         <UnreadNotice
@@ -250,7 +253,7 @@ export class ChatWindow extends Component<ChatWindowProps, ChatWindowState> {
         {messages.length ? <VirtualList
           ref={this.virtualList}
           style={{height: '100%', width: '100%', visibility: this.state.initialized ? 'initial' : 'hidden'}}
-          totalCount={mailboxSize}
+          totalCount={mailboxSize + stationPendingMessages.length}
           followOutput={!this.state.idle}
           endReached={this.dismissUnread}
           scrollSeek={{
@@ -289,7 +292,7 @@ export class ChatWindow extends Component<ChatWindowProps, ChatWindowState> {
               hideAvatars={hideAvatars}
               hideNicknames={hideNicknames}
               remoteContentPolicy={remoteContentPolicy}
-              className={number === mailboxSize ? 'pb3' : ''}
+              className={number === mailboxSize + stationPendingMessages.length ? 'pb3' : ''}
             />
           }}
         /> : <div style={{height: '100%', width: '100%'}}></div>}