wip: refactor

src/app/chats/index.tsx

@@ -10,10 +10,10 @@ import { ChatSidebar } from '@app/chats/components/sidebar';
 
 import { useNDK } from '@libs/ndk/provider';
 import { createChat, getChatMessages } from '@libs/storage';
+import { useStorage } from '@libs/storage/provider';
 
 import { useStronghold } from '@stores/stronghold';
 
-import { useAccount } from '@utils/hooks/useAccount';
 import { Chats } from '@utils/types';
 
 export function ChatScreen() {
@@ -21,17 +21,11 @@ export function ChatScreen() {
   const virtuosoRef = useRef(null);
 
   const { ndk } = useNDK();
+  const { db } = useStorage();
   const { pubkey } = useParams();
-  const { account } = useAccount();
-  const { status, data } = useQuery(
-    ['chat', pubkey],
-    async () => {
-      return await getChatMessages(account.pubkey, pubkey);
-    },
-    {
-      enabled: account ? true : false,
-    }
-  );
+  const { status, data } = useQuery(['chat', pubkey], async () => {
+    return await getChatMessages(db.account.pubkey, pubkey);
+  });
 
   const userPrivkey = useStronghold((state) => state.privkey);
 
@@ -40,7 +34,7 @@ export function ChatScreen() {
       return (
         <ChatMessageItem
           data={data[index]}
-          userPubkey={account.pubkey}
+          userPubkey={db.account.pubkey}
           userPrivkey={userPrivkey}
         />
       );
@@ -75,7 +69,7 @@ export function ChatScreen() {
     const sub: NDKSubscription = ndk.subscribe(
       {
         kinds: [4],
-        authors: [account.pubkey],
+        authors: [db.account.pubkey],
         '#p': [pubkey],
         since: Math.floor(Date.now() / 1000),
       },
@@ -129,7 +123,7 @@ export function ChatScreen() {
             <div className="z-50 shrink-0 rounded-b-xl border-t border-white/5 bg-white/10 p-3 px-5">
               <ChatMessageForm
                 receiverPubkey={pubkey}
-                userPubkey={account.pubkey}
+                userPubkey={db.account.pubkey}
                 userPrivkey={userPrivkey}
               />
             </div>