feature/IO-3000-messaging-sockets-migrations2 - Everything but tagging and labels works

Signed-off-by: Dave Richer <dave@imexsystems.ca>

client/src/components/chat-conversation/chat-conversation.container.jsx

@@ -30,6 +30,9 @@ export function ChatConversationContainer({ bodyshop, selectedConversation }) {
   const { socket } = useContext(SocketContext);
 
   useEffect(() => {
+    // Early gate, we have no socket, bail.
+    if (!socket || !socket.connected) return;
+
     socket.emit("join-bodyshop-conversation", {
       bodyshopId: bodyshop.id,
       conversationId: selectedConversation
@@ -43,10 +46,6 @@ export function ChatConversationContainer({ bodyshop, selectedConversation }) {
     };
   }, [selectedConversation, bodyshop, socket]);
 
-  // const { loading, error, data } = useSubscription(CONVERSATION_SUBSCRIPTION_BY_PK, {
-  //   variables: { conversationId: selectedConversation }
-  // });
-
   const [markingAsReadInProgress, setMarkingAsReadInProgress] = useState(false);
 
   const unreadCount =
@@ -60,10 +59,10 @@ export function ChatConversationContainer({ bodyshop, selectedConversation }) {
   const handleMarkConversationAsRead = async () => {
     if (unreadCount > 0 && !!selectedConversation && !markingAsReadInProgress) {
       setMarkingAsReadInProgress(true);
-      // await markConversationRead({});
       await axios.post("/sms/markConversationRead", {
         conversationid: selectedConversation,
-        imexshopid: bodyshop.imexshopid
+        imexshopid: bodyshop.imexshopid,
+        bodyshopid: bodyshop.id
       });
       setMarkingAsReadInProgress(false);
     }