From b02076de26bbb7c745079d691e3eb5e5a2d25d99 Mon Sep 17 00:00:00 2001
From: Eric Bailey <git@esb.lol>
Date: Wed, 15 May 2024 17:13:15 -0500
Subject: [PATCH] Refactor useConvoQuery

---
 src/components/dms/ConvoMenu.tsx           |  5 ++++-
 src/state/queries/messages/conversation.ts | 11 +++++++----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/components/dms/ConvoMenu.tsx b/src/components/dms/ConvoMenu.tsx
index 16e8d98c6c..ee9f90ba2c 100644
--- a/src/components/dms/ConvoMenu.tsx
+++ b/src/components/dms/ConvoMenu.tsx
@@ -74,7 +74,10 @@ let ConvoMenu = ({
   }, [modui])
   const isBlocking = !!userBlock || !!listBlocks.length
 
-  const {data: convo} = useConvoQuery(initialConvo)
+  const {data: convo} = useConvoQuery(
+    {convoId: initialConvo.id},
+    {initialData: initialConvo},
+  )
 
   const onNavigateToProfile = useCallback(() => {
     navigation.navigate('Profile', {name: profile.did})
diff --git a/src/state/queries/messages/conversation.ts b/src/state/queries/messages/conversation.ts
index bd5b746f16..b0ac3db4de 100644
--- a/src/state/queries/messages/conversation.ts
+++ b/src/state/queries/messages/conversation.ts
@@ -9,19 +9,22 @@ import {RQKEY as LIST_CONVOS_KEY} from './list-converations'
 const RQKEY_ROOT = 'convo'
 export const RQKEY = (convoId: string) => [RQKEY_ROOT, convoId]
 
-export function useConvoQuery(convo: ChatBskyConvoDefs.ConvoView) {
+export function useConvoQuery(
+  {convoId}: {convoId: string},
+  options?: {initialData: ChatBskyConvoDefs.ConvoView},
+) {
   const {getAgent} = useAgent()
 
   return useQuery({
-    queryKey: RQKEY(convo.id),
+    queryKey: RQKEY(convoId),
     queryFn: async () => {
       const {data} = await getAgent().api.chat.bsky.convo.getConvo(
-        {convoId: convo.id},
+        {convoId: convoId},
         {headers: DM_SERVICE_HEADERS},
       )
       return data.convo
     },
-    initialData: convo,
+    initialData: options?.initialData,
   })
 }