add socket.io back, cleanup
Change-Id: I74e043268c23fb45371f1e397ca2931ca177afc3
diff --git a/client/src/components/ConversationView.js b/client/src/components/ConversationView.js
index 719d3d0..6217905 100644
--- a/client/src/components/ConversationView.js
+++ b/client/src/components/ConversationView.js
@@ -8,7 +8,7 @@
const ConversationView = props => {
const [state, setState] = useState({
- loaded:false,
+ loaded: false,
error: false,
conversation: undefined
})
@@ -44,15 +44,26 @@
})
}
+ const loadMore = () => {
+ authManager.fetch(`/api/accounts/${props.accountId}/conversations/${props.conversationId}/messages`)
+ .then(res => res.json())
+ .then(messages => {
+ console.log(messages)
+ state.conversation.addLoadedMessages(messages)
+ setState(state)
+ })
+ }
+
+ console.log("ConversationView render " + (state.conversation ? state.conversation.getMessages().length : "no conversation"))
if (state.loaded === false) {
return <LoadingPage />
} else if (state.error === true) {
return <div>Error loding {props.conversationId}</div>
} else {
- return <React.Fragment>
- <MessageList conversation={state.conversation} messages={state.conversation.getMessages()} />
+ return <div className="messenger">
+ <MessageList conversation={state.conversation} loadMore={loadMore} messages={state.conversation.getMessages()} />
<SendMessageForm onSend={sendMessage} />
- </React.Fragment>
+ </div>
}
}