diff --git a/src/components/NewsFeed/Posts/NormalPost.js b/src/components/NewsFeed/Posts/NormalPost.js index ebcc316..cadf8e9 100644 --- a/src/components/NewsFeed/Posts/NormalPost.js +++ b/src/components/NewsFeed/Posts/NormalPost.js @@ -32,6 +32,7 @@ import { FaHeart, FaComment, FaRegHeart } from "react-icons/fa"; import backBackgroundImage from "../../../assets/images/back-background.jpg"; import "./NormalPost.scss"; import Comment from "./Comment"; +import { useAvatarContext } from "../../../hooks/useAvatarContext"; const NormalPost = ({ post }) => { const { user } = useAuthContext(); @@ -44,7 +45,15 @@ const NormalPost = ({ post }) => { const [isFlipped, setIsFlipped] = useState(false); const handleFlip = () => setIsFlipped(!isFlipped); - const { avatar, username, avatarData } = post.userId; + var avatar = useAvatarContext().avatar; + var avatarData = useAvatarContext().avatarData; + if (post.userId._id !== user.user._id) { + avatar = post.userId.avatar; + avatarData = post.userId.avatarData; + } + + const { username } = post.userId; + const stampBackgroundColor = "#" + avatarData.backgroundColor[0]; const previewNum = 12; @@ -169,7 +178,7 @@ const NormalPost = ({ post }) => {
{ zIndex={1} ml="-65px" > - + @@ -208,7 +217,7 @@ const NormalPost = ({ post }) => { - {title} + {title}