messaging bug fix done

shahriarsajeeb · shahriarsajeeb · commit 9a3378eb2552 · 2023-07-04T05:24:03.000+06:00
diff --git a/backend/controller/message.js b/backend/controller/message.js
@@ -12,9 +12,15 @@ router.post(
     try {
       const messageData = req.body;
 
-      const myCloud = await cloudinary.v2.uploader.upload(req.body.images, {
-        folder: "messages",
-      });
+      if (req.body.images) {
+        const myCloud = await cloudinary.v2.uploader.upload(req.body.images, {
+          folder: "messages",
+        });
+        messageData.images = {
+          public_id: myCloud.public_id,
+          url: myCloud.url,
+        };
+      }
 
       messageData.conversationId = req.body.conversationId;
       messageData.sender = req.body.sender;
@@ -24,9 +30,7 @@ router.post(
         conversationId: messageData.conversationId,
         text: messageData.text,
         sender: messageData.sender,
-        images: messageData.images
-          ? { public_id: myCloud.public_id, url: myCloud.secure_url }
-          : undefined,
+        images: messageData.images ? messageData.images : undefined,
       });
 
       await message.save();
diff --git a/frontend/src/components/Shop/DashboardMessages.jsx b/frontend/src/components/Shop/DashboardMessages.jsx
@@ -13,7 +13,7 @@ const ENDPOINT = "https://socket-ecommerce-tu68.onrender.com/";
 const socketId = socketIO(ENDPOINT, { transports: ["websocket"] });
 
 const DashboardMessages = () => {
-  const { seller } = useSelector((state) => state.seller);
+  const { seller,isLoading } = useSelector((state) => state.seller);
   const [conversations, setConversations] = useState([]);
   const [arrivalMessage, setArrivalMessage] = useState(null);
   const [currentChat, setCurrentChat] = useState();
@@ -226,6 +226,7 @@ const DashboardMessages = () => {
                 userData={userData}
                 online={onlineCheck(item)}
                 setActiveStatus={setActiveStatus}
+                isLoading={isLoading}
               />
             ))}
         </>
@@ -259,6 +260,7 @@ const MessageList = ({
   setUserData,
   online,
   setActiveStatus,
+  isLoading
 }) => {
   console.log(data);
   const [user, setUser] = useState([]);
@@ -311,7 +313,7 @@ const MessageList = ({
       <div className="pl-3">
         <h1 className="text-[18px]">{user?.name}</h1>
         <p className="text-[16px] text-[#000c]">
-          {data?.lastMessageId !== user?._id
+          {!isLoading && data?.lastMessageId !== user?._id
             ? "You:"
             : user?.name.split(" ")[0] + ": "}{" "}
           {data?.lastMessage}
diff --git a/frontend/src/pages/UserInbox.jsx b/frontend/src/pages/UserInbox.jsx
@@ -13,7 +13,7 @@ const ENDPOINT = "https://socket-ecommerce-tu68.onrender.com/";
 const socketId = socketIO(ENDPOINT, { transports: ["websocket"] });
 
 const UserInbox = () => {
-  const { user } = useSelector((state) => state.user);
+  const { user,loading } = useSelector((state) => state.user);
   const [conversations, setConversations] = useState([]);
   const [arrivalMessage, setArrivalMessage] = useState(null);
   const [currentChat, setCurrentChat] = useState();
@@ -229,6 +229,7 @@ const UserInbox = () => {
                 userData={userData}
                 online={onlineCheck(item)}
                 setActiveStatus={setActiveStatus}
+                loading={loading}
               />
             ))}
         </>
@@ -262,6 +263,7 @@ const MessageList = ({
   userData,
   online,
   setActiveStatus,
+  loading
 }) => {
   const [active, setActive] = useState(0);
   const [user, setUser] = useState([]);
@@ -313,7 +315,7 @@ const MessageList = ({
       <div className="pl-3">
         <h1 className="text-[18px]">{user?.name}</h1>
         <p className="text-[16px] text-[#000c]">
-          {data?.lastMessageId !== userData?._id
+          {!loading && data?.lastMessageId !== userData?._id
             ? "You:"
             : userData?.name.split(" ")[0] + ": "}{" "}
           {data?.lastMessage}
