Merge pull request #1120 from dm3-org/release-1.5-fix

Release 1.5 fix : Fixed websocket contact not added bug
dm3-org · Jul 19, 2024 · 21c1f14 · 21c1f14
2 parents 4435bc5 + 49e9a34
commit 21c1f14
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 10 deletions.
diff --git a/packages/messenger-widget/src/hooks/conversation/useConversation.tsx b/packages/messenger-widget/src/hooks/conversation/useConversation.tsx
@@ -270,17 +270,19 @@ export const useConversation = (config: DM3Configuration) => {
         conversation: string,
         updatedAt: number,
     ) => {
-        const newContactList = contacts.map((contact) => {
-            if (contact.contactDetails.account.ensName === conversation) {
-                return {
-                    ...contact,
-                    updatedAt: updatedAt,
-                };
-            }
-            return contact;
+        setContacts((prev) => {
+            const newContactList = prev.map((contact) => {
+                if (contact.contactDetails.account.ensName === conversation) {
+                    return {
+                        ...contact,
+                        updatedAt: updatedAt,
+                    };
+                }
+                return contact;
+            });
+            // Sort's the contact list in DESC order based on updatedAt property
+            return newContactList.sort((a, b) => b.updatedAt - a.updatedAt);
         });
-        // Sort's the contact list in DESC order based on updatedAt property
-        setContacts(newContactList.sort((a, b) => b.updatedAt - a.updatedAt));
     };
 
     const _toggleHideContact = (_ensName: string, isHidden: boolean) => {

diff --git a/packages/messenger-widget/src/hooks/messages/sources/handleMessagesFromWebSocket.ts b/packages/messenger-widget/src/hooks/messages/sources/handleMessagesFromWebSocket.ts
@@ -76,5 +76,6 @@ export const handleMessagesFromWebSocket = async (
         contact,
         messageModel.envelop.message.metadata.timestamp,
     );
+
     storeMessage(contact, messageModel);
 };