From ed25d8572ea0bf44ad4720918f48283518deda54 Mon Sep 17 00:00:00 2001 From: canove Date: Mon, 12 Oct 2020 18:04:31 -0300 Subject: [PATCH] Revert "Revert "fix: contact profilePic not updating in ticket header"" This reverts commit 3bca996064376c52c2a9223da7f8e7e20003539d. --- frontend/src/components/Ticket/index.js | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/frontend/src/components/Ticket/index.js b/frontend/src/components/Ticket/index.js index 13b5d97..01246b8 100644 --- a/frontend/src/components/Ticket/index.js +++ b/frontend/src/components/Ticket/index.js @@ -353,7 +353,15 @@ const Ticket = () => { if (data.action === "create") { dispatch({ type: "ADD_MESSAGE", payload: data.message }); scrollToBottom(); + + setContact(prevState => { + if (prevState.id === data.contact?.id) { + return data.contact; + } + return prevState; + }); } + if (data.action === "update") { dispatch({ type: "UPDATE_MESSAGE", payload: data.message }); } @@ -372,7 +380,12 @@ const Ticket = () => { socket.on("contact", data => { if (data.action === "update") { - setContact(data.contact); + setContact(prevState => { + if (prevState.id === data.contact?.id) { + return data.contact; + } + return prevState; + }); } });