diff --git a/frontend/src/components/MessagesList/index.js b/frontend/src/components/MessagesList/index.js index 3cb168e..d3fa2a0 100644 --- a/frontend/src/components/MessagesList/index.js +++ b/frontend/src/components/MessagesList/index.js @@ -354,7 +354,8 @@ const MessagesList = ({ ticketId, isGroup, setReplyingMessage }) => { useEffect(() => { const socket = openSocket(process.env.REACT_APP_BACKEND_URL); - socket.emit("joinChatBox", ticketId); + + socket.on("connect", () => socket.emit("joinChatBox", ticketId)); socket.on("appMessage", data => { if (data.action === "create") { diff --git a/frontend/src/components/NotificationsPopOver/index.js b/frontend/src/components/NotificationsPopOver/index.js index 38aa822..4c408aa 100644 --- a/frontend/src/components/NotificationsPopOver/index.js +++ b/frontend/src/components/NotificationsPopOver/index.js @@ -77,7 +77,7 @@ const NotificationsPopOver = () => { useEffect(() => { const socket = openSocket(process.env.REACT_APP_BACKEND_URL); - socket.emit("joinNotification"); + socket.on("connect", () => socket.emit("joinNotification")); socket.on("ticket", data => { if (data.action === "updateUnread" || data.action === "delete") { diff --git a/frontend/src/components/Ticket/index.js b/frontend/src/components/Ticket/index.js index 87c04e7..bf694ee 100644 --- a/frontend/src/components/Ticket/index.js +++ b/frontend/src/components/Ticket/index.js @@ -86,7 +86,8 @@ const Ticket = () => { useEffect(() => { const socket = openSocket(process.env.REACT_APP_BACKEND_URL); - socket.emit("joinChatBox", ticketId); + + socket.on("connect", () => socket.emit("joinChatBox", ticketId)); socket.on("ticket", data => { if (data.action === "updateStatus") { diff --git a/frontend/src/components/TicketsList/index.js b/frontend/src/components/TicketsList/index.js index 458081d..addd137 100644 --- a/frontend/src/components/TicketsList/index.js +++ b/frontend/src/components/TicketsList/index.js @@ -175,11 +175,14 @@ const TicketsList = ({ status, searchParam, showAll }) => { useEffect(() => { const socket = openSocket(process.env.REACT_APP_BACKEND_URL); - if (status) { - socket.emit("joinTickets", status); - } else { - socket.emit("joinNotification"); - } + + socket.on("connect", () => { + if (status) { + socket.emit("joinTickets", status); + } else { + socket.emit("joinNotification"); + } + }); socket.on("ticket", data => { if (data.action === "updateUnread") { diff --git a/frontend/src/pages/Contacts/index.js b/frontend/src/pages/Contacts/index.js index 6bb0f24..302b846 100644 --- a/frontend/src/pages/Contacts/index.js +++ b/frontend/src/pages/Contacts/index.js @@ -128,6 +128,7 @@ const Contacts = () => { useEffect(() => { const socket = openSocket(process.env.REACT_APP_BACKEND_URL); + socket.on("contact", data => { if (data.action === "update" || data.action === "create") { dispatch({ type: "UPDATE_CONTACTS", payload: data.contact }); diff --git a/frontend/src/pages/Settings/index.js b/frontend/src/pages/Settings/index.js index 4fd64ab..2fc4097 100644 --- a/frontend/src/pages/Settings/index.js +++ b/frontend/src/pages/Settings/index.js @@ -52,6 +52,7 @@ const Settings = () => { useEffect(() => { const socket = openSocket(process.env.REACT_APP_BACKEND_URL); + socket.on("settings", data => { if (data.action === "update") { setSettings(prevState => { diff --git a/frontend/src/pages/Users/index.js b/frontend/src/pages/Users/index.js index 7f4d440..d8817a3 100644 --- a/frontend/src/pages/Users/index.js +++ b/frontend/src/pages/Users/index.js @@ -124,6 +124,7 @@ const Users = () => { useEffect(() => { const socket = openSocket(process.env.REACT_APP_BACKEND_URL); + socket.on("user", data => { if (data.action === "update" || data.action === "create") { dispatch({ type: "UPDATE_USERS", payload: data.user });