From a971a7929652cda0ef86c010b976a14b743e9507 Mon Sep 17 00:00:00 2001
From: Gabe Kangas <gabek@real-ity.com>
Date: Thu, 29 Dec 2022 20:11:20 -0800
Subject: [PATCH] Fix name change clearing chat history. Closes #2532

---
 web/components/stores/ClientConfigStore.tsx            |  2 +-
 .../stores/eventhandlers/handleNameChangeEvent.tsx     | 10 ++--------
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/web/components/stores/ClientConfigStore.tsx b/web/components/stores/ClientConfigStore.tsx
index 9fe7db198..c8094145e 100644
--- a/web/components/stores/ClientConfigStore.tsx
+++ b/web/components/stores/ClientConfigStore.tsx
@@ -290,7 +290,7 @@ export const ClientConfigStore: FC = () => {
         setChatMessages(currentState => [...currentState, message as ChatEvent]);
         break;
       case MessageType.NAME_CHANGE:
-        handleNameChangeEvent(message as ChatEvent, chatMessages, setChatMessages);
+        handleNameChangeEvent(message as ChatEvent, setChatMessages);
         break;
       case MessageType.USER_JOINED:
         setChatMessages(currentState => [...currentState, message as ChatEvent]);
diff --git a/web/components/stores/eventhandlers/handleNameChangeEvent.tsx b/web/components/stores/eventhandlers/handleNameChangeEvent.tsx
index 1889485c2..dcd8ff5e1 100644
--- a/web/components/stores/eventhandlers/handleNameChangeEvent.tsx
+++ b/web/components/stores/eventhandlers/handleNameChangeEvent.tsx
@@ -1,12 +1,6 @@
-import { ChatMessage } from '../../../interfaces/chat-message.model';
 import { ChatEvent } from '../../../interfaces/socket-events';
 
-export function handleNameChangeEvent(
-  message: ChatEvent,
-  messages: ChatMessage[],
-  setChatMessages,
-) {
-  const updatedMessages = [...messages, message];
-  setChatMessages(updatedMessages);
+export function handleNameChangeEvent(message: ChatEvent, setChatMessages) {
+  setChatMessages(currentState => [...currentState, message]);
 }
 export default handleNameChangeEvent;