rebase fixes
This commit is contained in:
@ -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} />;
|
||||
}
|
||||
}
|
||||
|
@ -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";
|
||||
|
||||
|
Reference in New Issue
Block a user