From c45f497d44e2df2fddd388d8e0ae8a5a7dc6e6c5 Mon Sep 17 00:00:00 2001
From: Alejandro Gomez <alejandro@strike.me>
Date: Sat, 24 Jun 2023 12:06:13 +0200
Subject: [PATCH] refactor: clean up code

---
 src/hooks/emoji.tsx | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/hooks/emoji.tsx b/src/hooks/emoji.tsx
index 818a416..8b84149 100644
--- a/src/hooks/emoji.tsx
+++ b/src/hooks/emoji.tsx
@@ -16,7 +16,9 @@ export default function useEmoji(pubkey: string) {
   }, [pubkey]);
 
   const { data } = useRequestBuilder<FlatNoteStore>(System, FlatNoteStore, sub);
-  const userEmoji = data ?? [];
+  const userEmoji = useMemo(() => {
+    return data ?? [];
+  }, [data]);
 
   const related = useMemo(() => {
     if (userEmoji) {
@@ -39,7 +41,7 @@ export default function useEmoji(pubkey: string) {
       .filter((s) => s)
       .map((s) => s as string);
 
-    const rb = new RequestBuilder(`emoji:${pubkey}`);
+    const rb = new RequestBuilder(`emoji-related:${pubkey}`);
 
     rb.withFilter()
       .kinds([30030 as EventKind])
@@ -48,14 +50,16 @@ export default function useEmoji(pubkey: string) {
       .tag(["d", identifiers]);
 
     return rb;
-  }, [related]);
+  }, [pubkey, related]);
 
   const { data: relatedData } = useRequestBuilder<FlatNoteStore>(
     System,
     FlatNoteStore,
     subRelated
   );
-  const emojiPacks = relatedData ?? [];
+  const emojiPacks = useMemo(() => {
+    return relatedData ?? [];
+  }, [relatedData]);
 
   const emojis = useMemo(() => {
     return userEmoji