Merge branch 'epic-base' into deploy/epic

dappforce · Jul 18, 2024 · 44bc94a · 44bc94a
2 parents e031acb + e91579b
commit 44bc94a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 10 deletions.
diff --git a/src/components/chats/hooks/usePaginatedMessageIds.ts b/src/components/chats/hooks/usePaginatedMessageIds.ts
@@ -32,11 +32,16 @@ export default function usePaginatedMessageIds({
   const myAddress = useMyMainAddress() ?? ''
   // because from server it doesn't have access to myAddress, so we need to use the data without users' unapproved posts as placeholder
   const { data: placeholderData } =
-    getPaginatedPostIdsByPostId.useInfiniteQuery({
-      postId: chatId,
-      onlyDisplayUnapprovedMessages: !!onlyDisplayUnapprovedMessages,
-      myAddress: '',
-    })
+    getPaginatedPostIdsByPostId.useInfiniteQuery(
+      {
+        postId: chatId,
+        onlyDisplayUnapprovedMessages: !!onlyDisplayUnapprovedMessages,
+        myAddress: '',
+      },
+      {
+        enabled: false,
+      }
+    )
   const { data, fetchNextPage, isLoading } =
     getPaginatedPostIdsByPostId.useInfiniteQuery(
       {

diff --git a/src/pages/tg/index.tsx b/src/pages/tg/index.tsx
@@ -12,16 +12,12 @@ import { getProfilesServer } from '../api/profiles'
 async function prefetchChatData(client: QueryClient, chatId: string) {
   if (!chatId) return
 
+  // as now this query without myAddress is only used as placeholder data, no need to invalidate it
   const firstPageData = await getPaginatedPostIdsByPostId.fetchFirstPageQuery(
     client,
     { postId: chatId, onlyDisplayUnapprovedMessages: false, myAddress: '' },
     1
   )
-  getPaginatedPostIdsByPostId.invalidateFirstQuery(client, {
-    postId: chatId,
-    onlyDisplayUnapprovedMessages: false,
-    myAddress: '',
-  })
   const ownerIds = firstPageData.data
     .map((id) => {
       const post = getPostQuery.getQueryData(client, id)