wip: refactor

src/app/auth/onboarding/step-1.tsx

@@ -10,7 +10,6 @@ import { ArrowRightCircleIcon, CheckCircleIcon, LoaderIcon } from '@shared/icons
 
 import { useOnboarding } from '@stores/onboarding';
 
-import { useAccount } from '@utils/hooks/useAccount';
 import { useNostr } from '@utils/hooks/useNostr';
 import { arrayToNIP02 } from '@utils/transform';
 
@@ -21,7 +20,6 @@ export function OnboardStep1Screen() {
 
   const { db } = useStorage();
   const { publish, fetchUserData } = useNostr();
-  const { account } = useAccount();
   const { status, data } = useQuery(['trending-profiles'], async () => {
     const res = await fetch('https://api.nostr.band/v0/trending/profiles');
     if (!res.ok) {
@@ -45,7 +43,7 @@ export function OnboardStep1Screen() {
     try {
       setLoading(true);
 
-      const tags = arrayToNIP02([...follows, account.pubkey]);
+      const tags = arrayToNIP02([...follows, db.account.pubkey]);
       const event = await publish({ content: '', kind: 3, tags: tags });
       await db.updateAccount('follows', follows);
 

src/app/auth/onboarding/step-3.tsx

@@ -12,7 +12,6 @@ import { ArrowRightCircleIcon, CheckCircleIcon, LoaderIcon } from '@shared/icons
 import { FULL_RELAYS } from '@stores/constants';
 import { useOnboarding } from '@stores/onboarding';
 
-import { useAccount } from '@utils/hooks/useAccount';
 import { useNostr } from '@utils/hooks/useNostr';
 
 export function OnboardStep3Screen() {
@@ -22,15 +21,17 @@ export function OnboardStep3Screen() {
   const [loading, setLoading] = useState(false);
   const [relays, setRelays] = useState(new Set<string>());
 
-  const { db } = useStorage();
   const { publish } = useNostr();
-  const { account } = useAccount();
+  const { db } = useStorage();
   const { ndk } = useNDK();
   const { status, data } = useQuery(
     ['relays'],
     async () => {
       const tmp = new Map<string, string>();
-      const events = await ndk.fetchEvents({ kinds: [10002], authors: account.follows });
+      const events = await ndk.fetchEvents({
+        kinds: [10002],
+        authors: db.account.follows,
+      });
 
       if (events) {
         events.forEach((event) => {
@@ -43,7 +44,8 @@ export function OnboardStep3Screen() {
       return tmp;
     },
     {
-      enabled: account ? true : false,
+      enabled: db.account ? true : false,
+      refetchOnWindowFocus: false,
     }
   );