fix: add new thread as a newMessage and select it (Greenstand#565)

gwynndp · Apr 10, 2022 · c98c63d · c98c63d
1 parent 041e28a
commit c98c63d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 21 deletions.
diff --git a/src/components/Messaging/Messaging.js b/src/components/Messaging/Messaging.js
@@ -64,7 +64,6 @@ const Messaging = () => {
     loadMessages,
     loadRegions,
     loadAuthors,
-    setErrorMessage,
     setIsLoading,
   } = useContext(MessagingContext);
 
@@ -115,7 +114,7 @@ const Messaging = () => {
           <NewMessage
             openModal={openModal}
             handleClose={handleClose}
-            setErrorMessage={setErrorMessage}
+            setMessageRecipient={setMessageRecipient}
           />
           <Button
             className={button}

diff --git a/src/components/Messaging/NewMessage.js b/src/components/Messaging/NewMessage.js
@@ -59,7 +59,7 @@ const useStyles = makeStyles((theme) => ({
   },
 }));
 
-const NewMessage = ({ openModal, handleClose }) => {
+const NewMessage = ({ openModal, handleClose, setMessageRecipient }) => {
   const { box, formContent, header, button } = useStyles();
   const {
     setErrorMessage,
@@ -153,26 +153,17 @@ const NewMessage = ({ openModal, handleClose }) => {
 
         log.debug('...update threads after postMessageSend');
         // update the full set of threads
-        setThreads((prev) => {
-          const updated = prev
-            .reduce(
-              (threads, thread) => {
-                if (thread.userName === recipient) {
-                  thread.messages.push(newMessage);
-                }
-                return threads;
-              },
-              [...prev]
-            )
-            .sort(
-              (a, b) =>
-                new Date(b?.messages?.at(-1).composed_at) -
-                new Date(a?.messages?.at(-1).composed_at)
-            );
-          return updated;
-        });
+        setThreads((prev) =>
+          [...prev, { userName: recipient, messages: [newMessage] }].sort(
+            (a, b) =>
+              new Date(b?.messages?.at(-1).composed_at) -
+              new Date(a?.messages?.at(-1).composed_at)
+          )
+        );
       }
 
+      setMessageRecipient(recipient);
+
       handleClose();
     }
   };