Skip to content

Commit 8b197cb

Browse files
author
Oliver Rýdzi
committed
Fixed bug where no date was saved in the database
1 parent a020df7 commit 8b197cb

File tree

6 files changed

+18
-34
lines changed

6 files changed

+18
-34
lines changed

dist/index.es.js

Lines changed: 5 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/index.es.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/index.js

Lines changed: 5 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/index.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/components/ChatWindowProvider.js

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,8 @@ const ChatProviderWrapper = (
6868
chatMessagesRef(firebaseDB, chatId)
6969
.orderByChild('createdAt')
7070
.limitToLast(packageCount)
71-
.on('value', (messagesSnap) => {
71+
.once('value')
72+
.then((messagesSnap) => {
7273
/*
7374
* Here we fetch first batch of the messages at once and process them for the chat
7475
* component. After that we push them to state, mark initial load as done and unsubsribe
@@ -86,20 +87,11 @@ const ChatProviderWrapper = (
8687
processedMessages.push(message)
8788
})
8889

89-
const updatedMesseges = R.concat(
90-
!webMessageTransform
91-
? processedMessages.reverse()
92-
: processedMessages,
93-
this.state.messages
94-
)
95-
9690
this.setState({
97-
messages: updatedMesseges,
98-
messagesCount: this.state.messagesCount + processedMessages.length,
91+
messages: webMessageTransform ? processedMessages : processedMessages.reverse(),
92+
messagesCount: processedMessages.length - this.state.messagesCount,
9993
initialLoad: false,
10094
})
101-
102-
chatMessagesRef(firebaseDB, chatId).off('value')
10395
})
10496
} else {
10597
chatMessagesRef(firebaseDB, chatId)
@@ -197,7 +189,7 @@ const ChatProviderWrapper = (
197189
recipientsIds,
198190
meta: {
199191
lastMessageText: R.last(messages).text,
200-
lastMessageCreatedAt: R.last(messages).createdAt,
192+
lastMessageCreatedAt: R.last(messages).createdAt || new Date(),
201193
lastMessageAuthorId: uid,
202194
},
203195
})

src/firebase/calls.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ export const toSendMessage = ({
6969
}
7070
: {
7171
[`chat-metadata/${chatId}/lastMessageAuthorId`]: meta.lastMessageAuthorId,
72-
[`chat-metadata/${chatId}/lastMessageCreatedAt`]: meta.lastMessageCreatedAt,
72+
[`chat-metadata/${chatId}/lastMessageCreatedAt`]: `${meta.lastMessageCreatedAt.toISOString()}`,
7373
[`chat-metadata/${chatId}/lastMessageText`]: meta.lastMessageText,
7474
}
7575

0 commit comments

Comments
 (0)