rebase fixes

This commit is contained in:
2023-08-17 20:45:13 +01:00
parent ed109f0d2b
commit 667518a2df
5 changed files with 7 additions and 6 deletions

View File

@ -39,7 +39,8 @@ export default function DM(props: DMProps) {
}
function sender() {
if (props.chat.type !== ChatType.DirectMessage && !isMe) {
const isGroup = props.chat.type === ChatType.PrivateGroupChat || props.chat.type === ChatType.PublicGroupChat;
if (isGroup && !isMe) {
return <ProfileImage pubkey={msg.from} />;
}
}

View File

@ -6,7 +6,7 @@ import DM from "Element/DM";
import NoteToSelf from "Element/NoteToSelf";
import useLogin from "Hooks/useLogin";
import WriteMessage from "Element/WriteMessage";
import { Chat, ChatParticipant, ChatType, useChatSystem } from "chat";
import { Chat, ChatParticipant, useChatSystem } from "chat";
import { Nip4ChatSystem } from "chat/nip4";
import { FormattedMessage } from "react-intl";