Sorted the conversationss by desc

Eevee-Elites-Capstone · Feb 11, 2022 · eaaa374 · eaaa374
1 parent c6d2c77
commit eaaa374
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/src/components/Messaging/AllConversations.js b/src/components/Messaging/AllConversations.js
@@ -37,6 +37,7 @@ export default function AllConversations() {
       const conversationToCreate = {
         users: [newUser, user.uid],
         messages: [newMessage],
+        //createdAt: timestamp.fromDate(new Date()),
         createdAt: timestamp.fromDate(new Date()),
         updatedAt: timestamp.fromDate(new Date()),
         title: newTitle,

diff --git a/src/components/Messaging/AllMessages.js b/src/components/Messaging/AllMessages.js
@@ -2,7 +2,7 @@ import { useState } from "react"
 import { timestamp } from "../../firebase/fbConfig"
 import { useAuthContext } from "../../hooks/useAuthContext"
 import { useFirestore } from "../../hooks/useFirestore"
-import Avatar from "../UI/Avatar"
+// import Avatar from "../UI/Avatar"
 import Sidebar from "../Dashboard/Sidebar"
 import { Link } from "react-router-dom"
 
@@ -24,7 +24,7 @@ export default function AllMessages({ conversation }) {
 
         await updateDocument(conversation.id, {
             messages: [...conversation.messages, messageToAdd],
-            updatedAt: timestamp.fromDate(new Date())
+            updatedAt: timestamp.now()
         })
         if (!response.error) {
             setNewMessage('')

diff --git a/src/hooks/useAllConversations.js b/src/hooks/useAllConversations.js
@@ -9,7 +9,8 @@ export const useAllConversations = (id) => {
   // realtime document data
   useEffect(() => {
     const conversationsRef = projectFirestore.collection('conversations')
-    let userConversations = conversationsRef.where('users', 'array-contains', id)
+    let userConversations = conversationsRef.where('users', 'array-contains', id).orderBy('updatedAt', 'desc')
+    //let orderedUserConversations = userConversations.orderBy('updatedAt')
 
     const unsubscribe = userConversations.onSnapshot(snapshot => {
       // need to make sure the doc exists & has data