wip: refactor

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

@@ -10,7 +10,6 @@ import { ArrowRightCircleIcon, LoaderIcon } from '@shared/icons';
 
 import { useOnboarding } from '@stores/onboarding';
 
-import { useAccount } from '@utils/hooks/useAccount';
 import { useNostr } from '@utils/hooks/useNostr';
 
 export function ImportStep3Screen() {
@@ -21,7 +20,6 @@ export function ImportStep3Screen() {
   const [loading, setLoading] = useState(false);
 
   const { db } = useStorage();
-  const { status, account } = useAccount();
   const { fetchUserData } = useNostr();
 
   const submit = async () => {
@@ -72,7 +70,7 @@ export function ImportStep3Screen() {
           </div>
         ) : (
           <div className="flex flex-col gap-3">
-            <User pubkey={account.pubkey} />
+            <User pubkey={db.account.pubkey} />
             <button
               type="button"
               className="inline-flex h-11 w-full items-center justify-between gap-2 rounded-lg bg-fuchsia-500 px-6 font-medium leading-none text-white hover:bg-fuchsia-600 focus:outline-none"

src/app/auth/migrate.tsx

@@ -40,7 +40,6 @@ export function MigrateScreen() {
   const [passwordInput, setPasswordInput] = useState('password');
   const [loading, setLoading] = useState(false);
 
-  const { account } = useAccount();
   const { db } = useStorage();
 
   // toggle private key
@@ -69,10 +68,10 @@ export function MigrateScreen() {
         const stronghold = await Stronghold.load(`${dir}/lume.stronghold`, data.password);
 
         if (!db.secureDB) db.secureDB = stronghold;
-        await db.secureSave(account.pubkey, account.privkey);
+        await db.secureSave(db.account.pubkey, db.account.privkey);
 
         // add privkey to state
-        setPrivkey(account.privkey);
+        setPrivkey(db.account.privkey);
         // remove privkey in db
         await removePrivkey();
         // clear cache

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,
     }
   );
 

src/app/auth/reset.tsx

@@ -39,7 +39,6 @@ export function ResetScreen() {
   const [passwordInput, setPasswordInput] = useState('password');
   const [loading, setLoading] = useState(false);
 
-  const { account } = useAccount();
   const { db } = useStorage();
 
   // toggle private key
@@ -69,7 +68,7 @@ export function ResetScreen() {
 
         const tmpPubkey = getPublicKey(privkey);
 
-        if (tmpPubkey !== account.pubkey) {
+        if (tmpPubkey !== db.account.pubkey) {
           setLoading(false);
           setError('password', {
             type: 'custom',
@@ -88,10 +87,10 @@ export function ResetScreen() {
           );
 
           if (!db.secureDB) db.secureDB = stronghold;
-          await db.secureSave(account.pubkey, account.privkey);
+          await db.secureSave(db.account.pubkey, db.account.privkey);
 
           // add privkey to state
-          setPrivkey(account.privkey);
+          setPrivkey(db.account.privkey);
           // redirect to home
           navigate('/auth/unlock', { replace: true });
         }

src/app/auth/unlock.tsx

@@ -10,8 +10,6 @@ import { EyeOffIcon, EyeOnIcon, LoaderIcon } from '@shared/icons';
 
 import { useStronghold } from '@stores/stronghold';
 
-import { useAccount } from '@utils/hooks/useAccount';
-
 type FormValues = {
   password: string;
 };
@@ -37,7 +35,6 @@ export function UnlockScreen() {
   const [showPassword, setShowPassword] = useState<boolean>(false);
   const [loading, setLoading] = useState<boolean>(false);
 
-  const { account } = useAccount();
   const { db } = useStorage();
 
   const {
@@ -56,7 +53,7 @@ export function UnlockScreen() {
 
         if (!db.secureDB) db.secureDB = stronghold;
 
-        const privkey = await db.secureLoad(account.pubkey);
+        const privkey = await db.secureLoad(db.account.pubkey);
 
         setPrivkey(privkey);
         // redirect to home