wip: refactor

src/app/auth/unlock.tsx

@@ -46,32 +46,33 @@ export function UnlockScreen() {
   } = useForm<FormValues>({ resolver });
 
   const onSubmit = async (data: { [x: string]: string }) => {
-    setLoading(true);
-    if (data.password.length > 3) {
-      try {
-        const dir = await appConfigDir();
-        const stronghold = await Stronghold.load(`${dir}/lume.stronghold`, data.password);
-
-        if (!db.secureDB) db.secureDB = stronghold;
-
-        const privkey = await db.secureLoad(db.account.pubkey);
-
-        setPrivkey(privkey);
-        // redirect to home
-        navigate('/', { replace: true });
-      } catch (e) {
-        setLoading(false);
-        setError('password', {
-          type: 'custom',
-          message: e,
-        });
-      }
-    } else {
-      setLoading(false);
+    if (data.password.length < 3) {
       setError('password', {
         type: 'custom',
         message: 'Password is required and must be greater than 3',
       });
+      return;
+    }
+
+    try {
+      setLoading(true);
+
+      const dir = await appConfigDir();
+      const stronghold = await Stronghold.load(`${dir}/lume.stronghold`, data.password);
+
+      if (!db.secureDB) db.secureDB = stronghold;
+
+      const privkey = await db.secureLoad(db.account.pubkey);
+
+      setPrivkey(privkey);
+      // redirect to home
+      navigate('/', { replace: true });
+    } catch (e) {
+      setLoading(false);
+      setError('password', {
+        type: 'custom',
+        message: e,
+      });
     }
   };
 
@@ -89,7 +90,7 @@ export function UnlockScreen() {
             <div className="relative">
               <input
                 {...register('password', { required: true })}
-                type={showPassword ? 'text' : 'password'}
+                type={'password'}
                 placeholder="Password"
                 className="relative h-12 w-full rounded-lg bg-white/10 py-1 text-center text-white !outline-none placeholder:text-white/50"
               />

src/app/events/index.tsx

@@ -31,12 +31,12 @@ export function EventScreen() {
         ) : (
           <div className="h-min w-full px-3 pt-1.5">
             <div className="rounded-xl bg-white/10 px-3 pt-3">
-              <ThreadUser pubkey={data.pubkey} time={data.created_at} />
+              <ThreadUser pubkey={data.event.pubkey} time={data.event.created_at} />
               <div className="mt-2">
-                <NoteContent content={data.content} />
+                <NoteContent content={data.richContent} />
               </div>
               <div>
-                <NoteActions id={id} pubkey={data.pubkey} noOpenThread={true} />
+                <NoteActions id={id} pubkey={data.event.pubkey} noOpenThread={true} />
                 <NoteStats id={id} />
               </div>
             </div>

src/app/space/components/widgets/thread.tsx

@@ -31,14 +31,14 @@ export function ThreadBlock({ params }: { params: Widget }) {
         ) : (
           <div className="h-min w-full px-3 pt-1.5">
             <div className="rounded-xl bg-white/10 px-3 pt-3">
-              <ThreadUser pubkey={data.pubkey} time={data.created_at} />
+              <ThreadUser pubkey={data.event.pubkey} time={data.event.created_at} />
               <div className="mt-2">
-                <NoteContent content={data.content} />
+                <NoteContent content={data.richContent} />
               </div>
               <div>
                 <NoteActions
                   id={params.content}
-                  pubkey={data.pubkey}
+                  pubkey={data.event.pubkey}
                   noOpenThread={true}
                 />
                 <NoteStats id={params.content} />