frontend/src/components/MessagesList/index.js

@@ -451,16 +451,15 @@ const MessagesList = ({ ticketId, isGroup }) => {
     socket.on("connect", onConnectMessagesList)
 
     const onAppMessageMessagesList = (data) => {
-      if (+data.message.ticketId !== +ticketId) return
 
-      if (data.action === "create") {
+      if (data.action === "create" && data.ticket.id == ticketId) {
 
         dispatch({ type: "ADD_MESSAGE", payload: data.message })
 
         scrollToBottom()
       }
 
-      if (data.action === "update") {
+      if (data.action === "update" && data.ticket.id == ticketId) {
         dispatch({ type: "UPDATE_MESSAGE", payload: data.message })
       }
     }

frontend/src/components/Ticket/index.js

@@ -143,15 +143,11 @@ const Ticket = () => {
     socket.on("connect", onConnectTicket)
 
     const onTicketTicket = (data) => {
-      const isSameTicket = +data?.ticket?.id === +ticketId || +data.ticketId === +ticketId
-      if (!isSameTicket) return
-
-      if (data.action === "update") {
+      if (data.action === "update" && data.ticket.id == ticketId) {
         setTicket(data.ticket)
       }
 
-      if (data.action === "deleteForever") {
-        console.log('delete forever')
+      if (data.action === "delete") {
         toast.success("Ticket deleted sucessfully.")
         history.push("/tickets")
       }