Finished bug 1607

src/components/DirectChat/DirectChatContent/DirectChatContent.js

@@ -55,7 +55,7 @@ const DirectChatContent = (props) => {
               const image = isMyMessage
                 ? myProfileImage
                 : interlucatorProfileImage;
-              if (requester === requesterStatus.INTERLUCATOR && isMyMessage)
+              if (requester === requesterStatus.INTERLUCATOR && isMyMessage && item?.isAcceptRequest)
                 return;
               return (
                 <MessageContainer key={item?._id || item?._created}>

src/components/MarketPlace/MarketPlace.js

@@ -3,18 +3,23 @@ import PropTypes from "prop-types";
 import { MarketPlaceContainer } from "./MarketPlace.styled";
 import Header from "./Header/Header";
 import Offers from "./Offers/Offers";
-import { useDispatch } from "react-redux";
+import { useDispatch, useSelector } from "react-redux";
 import { useEffect } from "react";
 import { fetchChats } from "../../store/actions/chat/chatActions";
+import { selectUserId } from "../../store/selectors/loginSelectors";
 
 const MarketPlace = (props) => {
   const [isGrid, setIsGrid] = useState(false);
+  const userId = useSelector(selectUserId);
   const dispatch = useDispatch();
   useEffect(() => {
-    dispatch(fetchChats({
-      currentPage: 1,
-    }));
-  }, [])
+    if (userId)
+      dispatch(
+        fetchChats({
+          currentPage: 1,
+        })
+      );
+  }, [userId]);
   const offers = props.offers;
   return (
     <MarketPlaceContainer>