ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2024-09-21 15:38:59 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3457 from tylershuster/pending-message

Browse Source 
chat: show pending messages again
This commit is contained in:
matildepark 2020-09-08 20:31:21 -04:00 committed by GitHub
commit 3d739c03c2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/interface/src/views/apps/chat/components/lib/chat-window.tsx
View File

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