浏览代码

Finished bug 1607

bugfix/1607
Djordje Mitrovic 3 年前
父节点
当前提交
52d3d4b4fb

+ 1
- 1
src/components/DirectChat/DirectChatContent/DirectChatContent.js 查看文件

const image = isMyMessage const image = isMyMessage
? myProfileImage ? myProfileImage
: interlucatorProfileImage; : interlucatorProfileImage;
if (requester === requesterStatus.INTERLUCATOR && isMyMessage)
if (requester === requesterStatus.INTERLUCATOR && isMyMessage && item?.isAcceptRequest)
return; return;
return ( return (
<MessageContainer key={item?._id || item?._created}> <MessageContainer key={item?._id || item?._created}>

+ 10
- 5
src/components/MarketPlace/MarketPlace.js 查看文件

import { MarketPlaceContainer } from "./MarketPlace.styled"; import { MarketPlaceContainer } from "./MarketPlace.styled";
import Header from "./Header/Header"; import Header from "./Header/Header";
import Offers from "./Offers/Offers"; import Offers from "./Offers/Offers";
import { useDispatch } from "react-redux";
import { useDispatch, useSelector } from "react-redux";
import { useEffect } from "react"; import { useEffect } from "react";
import { fetchChats } from "../../store/actions/chat/chatActions"; import { fetchChats } from "../../store/actions/chat/chatActions";
import { selectUserId } from "../../store/selectors/loginSelectors";


const MarketPlace = (props) => { const MarketPlace = (props) => {
const [isGrid, setIsGrid] = useState(false); const [isGrid, setIsGrid] = useState(false);
const userId = useSelector(selectUserId);
const dispatch = useDispatch(); const dispatch = useDispatch();
useEffect(() => { useEffect(() => {
dispatch(fetchChats({
currentPage: 1,
}));
}, [])
if (userId)
dispatch(
fetchChats({
currentPage: 1,
})
);
}, [userId]);
const offers = props.offers; const offers = props.offers;
return ( return (
<MarketPlaceContainer> <MarketPlaceContainer>

正在加载...
取消
保存