fix: update entire messages array safely

FredrikOseberg · Dec 11, 2023 · 2b0118d · 2b0118d
1 parent 46be71c
commit 2b0118d
Showing 1 changed file with 7 additions and 17 deletions.
diff --git a/src/components/ChatbotMessage/ChatbotMessage.tsx b/src/components/ChatbotMessage/ChatbotMessage.tsx
@@ -42,25 +42,15 @@ const ChatbotMessage = ({
       if (delay) defaultDisableTime += delay;
 
       timeoutId = setTimeout(() => {
-        const newMessages = [...messages];
-        let message = newMessages.find((message) => message.id === id);
+        const newMessages = [...messages].map(message => {
+          if (message.id === id) {
+            return {...message, loading: false, delay: undefined};
+          }
 
-        if (!message) return;
-        message = {
-          ...message,
-          loading: false,
-          delay: undefined,
-        }
-
-        setState((state: any) => {
-          const freshMessages = state.messages;
-          const messageIdx = freshMessages.findIndex(
-            (message: any) => message.id === id
-          );
-          freshMessages[messageIdx] = message;
-
-          return { ...state, messages: freshMessages };
+          return message;
         });
+
+        setState((state: any) => ({...state, messages: newMessages}));
       }, defaultDisableTime);
     };