wip: refactor

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

@@ -1,4 +1,3 @@
-import { useMutation, useQueryClient } from '@tanstack/react-query';
 import { BaseDirectory, writeTextFile } from '@tauri-apps/plugin-fs';
 import { generatePrivateKey, getPublicKey, nip19 } from 'nostr-tools';
 import { useEffect, useMemo, useState } from 'react';
@@ -16,7 +15,6 @@ import { useStronghold } from '@stores/stronghold';
 export function CreateStep1Screen() {
   const { db } = useStorage();
 
-  const queryClient = useQueryClient();
   const navigate = useNavigate();
   const setPrivkey = useStronghold((state) => state.setPrivkey);
   const setTempPrivkey = useOnboarding((state) => state.setTempPrivkey);
@@ -52,33 +50,16 @@ export function CreateStep1Screen() {
     setDownloaded(true);
   };
 
-  const account = useMutation({
-    mutationFn: (data: {
-      npub: string;
-      pubkey: string;
-      follows: null | string[][];
-      is_active: number;
-    }) => {
-      return db.createAccount(data.npub, data.pubkey);
-    },
-    onSuccess: (data) => {
-      queryClient.setQueryData(['account'], data);
-    },
-  });
-
   const submit = () => {
     setLoading(true);
 
+    // update state
     setPrivkey(privkey);
     setTempPrivkey(privkey); // only use if user close app and reopen it
     setPubkey(pubkey);
 
-    account.mutate({
-      npub,
-      pubkey,
-      follows: null,
-      is_active: 1,
-    });
+    // save to database
+    db.createAccount(npub, pubkey);
 
     // redirect to next step
     navigate('/auth/create/step-2', { replace: true });

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

@@ -1,4 +1,3 @@
-import { useQueryClient } from '@tanstack/react-query';
 import { useEffect, useState } from 'react';
 import { useForm } from 'react-hook-form';
 import { useNavigate } from 'react-router-dom';
@@ -17,7 +16,6 @@ import { useNostr } from '@utils/hooks/useNostr';
 export function CreateStep3Screen() {
   const navigate = useNavigate();
   const setStep = useOnboarding((state) => state.setStep);
-  const queryClient = useQueryClient();
 
   const [loading, setLoading] = useState(false);
   const [picture, setPicture] = useState(DEFAULT_AVATAR);
@@ -47,8 +45,6 @@ export function CreateStep3Screen() {
         tags: [],
       });
 
-      queryClient.invalidateQueries(['account']);
-
       if (event) {
         navigate('/auth/onboarding', { replace: true });
       }

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

@@ -1,4 +1,3 @@
-import { useMutation, useQueryClient } from '@tanstack/react-query';
 import { getPublicKey, nip19 } from 'nostr-tools';
 import { useEffect, useState } from 'react';
 import { Resolver, useForm } from 'react-hook-form';
@@ -31,9 +30,6 @@ const resolver: Resolver<FormValues> = async (values) => {
 };
 
 export function ImportStep1Screen() {
-  const { db } = useStorage();
-
-  const queryClient = useQueryClient();
   const navigate = useNavigate();
   const setPrivkey = useStronghold((state) => state.setPrivkey);
   const setTempPubkey = useOnboarding((state) => state.setTempPrivkey);
@@ -42,20 +38,7 @@ export function ImportStep1Screen() {
 
   const [loading, setLoading] = useState(false);
 
-  const account = useMutation({
-    mutationFn: (data: {
-      npub: string;
-      pubkey: string;
-      follows: null | string[];
-      is_active: number | boolean;
-    }) => {
-      return db.createAccount(data.npub, data.pubkey);
-    },
-    onSuccess: (data) => {
-      queryClient.setQueryData(['account'], data);
-    },
-  });
-
+  const { db } = useStorage();
   const {
     register,
     setError,
@@ -81,12 +64,7 @@ export function ImportStep1Screen() {
         setPubkey(pubkey);
 
         // add account to local database
-        account.mutate({
-          npub,
-          pubkey,
-          follows: null,
-          is_active: 1,
-        });
+        db.createAccount(npub, pubkey);
 
         // redirect to step 2
         navigate('/auth/import/step-2', { replace: true });

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

@@ -1,4 +1,3 @@
-import { useQueryClient } from '@tanstack/react-query';
 import { useEffect, useState } from 'react';
 import { useNavigate } from 'react-router-dom';
 
@@ -13,7 +12,6 @@ import { useOnboarding } from '@stores/onboarding';
 import { useNostr } from '@utils/hooks/useNostr';
 
 export function ImportStep3Screen() {
-  const queryClient = useQueryClient();
   const navigate = useNavigate();
   const setStep = useOnboarding((state) => state.setStep);
 
@@ -30,10 +28,6 @@ export function ImportStep3Screen() {
       const data = await fetchUserData();
 
       if (data.status === 'ok') {
-        // update last login
-        await db.updateLastLogin(Math.floor(Date.now() / 1000));
-
-        queryClient.invalidateQueries(['account']);
         navigate('/auth/onboarding/step-2', { replace: true });
       } else {
         console.log('error: ', data.message);

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

@@ -1,4 +1,4 @@
-import { useQuery, useQueryClient } from '@tanstack/react-query';
+import { useQuery } from '@tanstack/react-query';
 import { useEffect, useState } from 'react';
 import { Link, useNavigate } from 'react-router-dom';
 
@@ -14,12 +14,11 @@ import { useNostr } from '@utils/hooks/useNostr';
 import { arrayToNIP02 } from '@utils/transform';
 
 export function OnboardStep1Screen() {
-  const queryClient = useQueryClient();
   const navigate = useNavigate();
   const setStep = useOnboarding((state) => state.setStep);
 
+  const { publish, fetchUserData, prefetchEvents } = useNostr();
   const { db } = useStorage();
-  const { publish, fetchUserData } = useNostr();
   const { status, data } = useQuery(['trending-profiles'], async () => {
     const res = await fetch('https://api.nostr.band/v0/trending/profiles');
     if (!res.ok) {
@@ -45,14 +44,13 @@ export function OnboardStep1Screen() {
 
       const tags = arrayToNIP02([...follows, db.account.pubkey]);
       const event = await publish({ content: '', kind: 3, tags: tags });
-      await db.updateAccount('follows', follows);
 
-      // prefetch notes with current follows
-      const data = await fetchUserData(follows);
+      // prefetch data
+      const user = await fetchUserData(follows);
+      const data = await prefetchEvents();
 
       // redirect to next step
-      if (event && data.status === 'ok') {
-        queryClient.invalidateQueries(['account']);
+      if (event && user.status === 'ok' && data.status === 'ok') {
         navigate('/auth/onboarding/step-2', { replace: true });
       } else {
         setLoading(false);