diff --git a/src/common/component/PinnedMessage.tsx b/src/common/component/PinnedMessage.tsx index e6d2ae59..f74bf8f3 100644 --- a/src/common/component/PinnedMessage.tsx +++ b/src/common/component/PinnedMessage.tsx @@ -12,18 +12,21 @@ interface Props { } const PinnedMessageView: FC = ({ data }) => { - const { usersData } = useAppSelector((store) => { - return { usersData: store.users.byId }; + const { msgData, usersData } = useAppSelector((store) => { + return { msgData: store.message, usersData: store.users.byId }; }); - const { created_by = 0 } = data; - const normalized = normalizeFileMessage(data as MessagePayload) || {}; - console.log("nnnn", normalized); + console.log("piiii", data); - const { created_at, content_type, content, properties, thumbnail = "" } = { ...data, ...normalized }; - const { name, avatar } = usersData[created_by] ?? {}; + const { mid = 0 } = data; + const normalized = normalizeFileMessage(data as MessagePayload) || {}; + + const { content_type, content, properties, thumbnail = "" } = { ...data, ...normalized }; + const uid = msgData[mid]?.from_uid || 0; + const created_at = msgData[mid]?.created_at || 0; + const { name, avatar } = usersData[uid] ?? {}; return (
-
+
@@ -36,7 +39,7 @@ const PinnedMessageView: FC = ({ data }) => { content_type, content, thumbnail, - from_uid: created_by, + from_uid: uid, properties })}