From 667518a2dfc69722a009801fb2c09ce1f77958ad Mon Sep 17 00:00:00 2001
From: Kieran <kieran@harkin.me>
Date: Thu, 17 Aug 2023 20:45:13 +0100
Subject: [PATCH] rebase fixes

---
 packages/app/src/Element/DM.tsx               | 3 ++-
 packages/app/src/Element/DmWindow.tsx         | 2 +-
 packages/app/src/Pages/MessagesPage.tsx       | 4 ++--
 packages/app/src/Wallet/NostrWalletConnect.ts | 2 +-
 packages/system/src/request-builder.ts        | 2 +-
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/packages/app/src/Element/DM.tsx b/packages/app/src/Element/DM.tsx
index 3e8f8ce00..3a16b32e1 100644
--- a/packages/app/src/Element/DM.tsx
+++ b/packages/app/src/Element/DM.tsx
@@ -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} />;
     }
   }
diff --git a/packages/app/src/Element/DmWindow.tsx b/packages/app/src/Element/DmWindow.tsx
index e458ab668..87df9017f 100644
--- a/packages/app/src/Element/DmWindow.tsx
+++ b/packages/app/src/Element/DmWindow.tsx
@@ -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";
 
diff --git a/packages/app/src/Pages/MessagesPage.tsx b/packages/app/src/Pages/MessagesPage.tsx
index 4fb98fdf6..2010379d2 100644
--- a/packages/app/src/Pages/MessagesPage.tsx
+++ b/packages/app/src/Pages/MessagesPage.tsx
@@ -1,12 +1,12 @@
 import React, { useEffect, useMemo, useState } from "react";
 import { FormattedMessage, useIntl } from "react-intl";
 import { useNavigate, useParams } from "react-router-dom";
-import { NostrPrefix, TLVEntryType, decodeTLV } from "@snort/system";
+import { TLVEntryType, decodeTLV } from "@snort/system";
 import { useUserProfile } from "@snort/system-react";
 
 import UnreadCount from "Element/UnreadCount";
 import ProfileImage, { getDisplayName } from "Element/ProfileImage";
-import { hexToBech32, parseId } from "SnortUtils";
+import { parseId } from "SnortUtils";
 import NoteToSelf from "Element/NoteToSelf";
 import useModeration from "Hooks/useModeration";
 import useLogin from "Hooks/useLogin";
diff --git a/packages/app/src/Wallet/NostrWalletConnect.ts b/packages/app/src/Wallet/NostrWalletConnect.ts
index c42c53a3e..d2d1113d2 100644
--- a/packages/app/src/Wallet/NostrWalletConnect.ts
+++ b/packages/app/src/Wallet/NostrWalletConnect.ts
@@ -1,4 +1,4 @@
-import { Connection, EventKind, NostrEvent, EventBuilder, EventExt, PrivateKeySigner } from "@snort/system";
+import { Connection, EventKind, NostrEvent, EventBuilder, PrivateKeySigner } from "@snort/system";
 import { LNWallet, WalletError, WalletErrorCode, WalletInfo, WalletInvoice, WalletInvoiceState } from "Wallet";
 import debug from "debug";
 
diff --git a/packages/system/src/request-builder.ts b/packages/system/src/request-builder.ts
index de1bdda6a..747a97a4a 100644
--- a/packages/system/src/request-builder.ts
+++ b/packages/system/src/request-builder.ts
@@ -2,7 +2,7 @@ import debug from "debug";
 import { v4 as uuid } from "uuid";
 import { appendDedupe, sanitizeRelayUrl, unixNowMs } from "@snort/shared";
 
-import { ReqFilter, u256, HexKey, EventKind, TaggedRawEvent, OnEventCallback, OnEventCallbackRelease } from ".";
+import { ReqFilter, u256, HexKey, EventKind } from ".";
 import { diffFilters } from "./request-splitter";
 import { RelayCache, splitByWriteRelays, splitFlatByWriteRelays } from "./gossip-model";
 import { flatMerge, mergeSimilar } from "./request-merger";