wip: refactor

src/shared/editProfileModal.tsx

@@ -1,7 +1,6 @@
 import { Dialog, Transition } from '@headlessui/react';
 import { NDKEvent } from '@nostr-dev-kit/ndk';
 import { useQueryClient } from '@tanstack/react-query';
-import { fetch } from '@tauri-apps/plugin-http';
 import { Fragment, useEffect, useState } from 'react';
 import { useForm } from 'react-hook-form';
 

src/shared/lumeBar.tsx

@@ -1,29 +1,20 @@
 import { Link } from 'react-router-dom';
 
+import { useStorage } from '@libs/storage/provider';
+
 import { ActiveAccount } from '@shared/accounts/active';
 import { SettingsIcon } from '@shared/icons';
 import { Logout } from '@shared/logout';
 import { NotificationModal } from '@shared/notification/modal';
 
-import { useAccount } from '@utils/hooks/useAccount';
-
 export function LumeBar() {
-  const { status, account } = useAccount();
+  const { db } = useStorage();
 
   return (
     <div className="rounded-xl bg-white/10 p-2 backdrop-blur-xl">
       <div className="flex items-center justify-between">
-        {status === 'loading' ? (
-          <>
-            <div className="group relative flex h-9 w-9 shrink animate-pulse items-center justify-center rounded-md bg-zinc-900" />
-            <div className="group relative flex h-9 w-9 shrink animate-pulse items-center justify-center rounded-md bg-zinc-900" />
-          </>
-        ) : (
-          <>
-            <ActiveAccount data={account} />
-            <NotificationModal pubkey={account.pubkey} />
-          </>
-        )}
+        <ActiveAccount data={db.account} />
+        <NotificationModal pubkey={db.account.pubkey} />
         <Link
           to="/settings/general"
           className="inline-flex h-9 w-9 transform items-center justify-center rounded-md bg-white/20 active:translate-y-1"

src/shared/navigation.tsx

@@ -97,28 +97,6 @@ export function Navigation() {
             </Collapsible.Content>
           </div>
         </Collapsible.Root>
-        <Collapsible.Root open={chats} onOpenChange={setChats}>
-          <div className="flex flex-col gap-1 px-2">
-            <Collapsible.Trigger asChild>
-              <button className="flex items-center gap-1">
-                <div
-                  className={twMerge(
-                    'inline-flex h-5 w-5 transform items-center justify-center transition-transform duration-150 ease-in-out',
-                    open ? '' : 'rotate-180'
-                  )}
-                >
-                  <NavArrowDownIcon className="h-3 w-3 text-white/50" />
-                </div>
-                <h3 className="text-[11px] font-bold uppercase tracking-widest text-white/50">
-                  Chats
-                </h3>
-              </button>
-            </Collapsible.Trigger>
-            <Collapsible.Content>
-              <ChatsList />
-            </Collapsible.Content>
-          </div>
-        </Collapsible.Root>
         {/* Channels
 				<Disclosure defaultOpen={true}>
 					{({ open }) => (

src/shared/notes/actions.tsx

@@ -10,8 +10,6 @@ import { NoteZap } from '@shared/notes/actions/zap';
 import { BLOCK_KINDS } from '@stores/constants';
 import { useWidgets } from '@stores/widgets';
 
-import { useAccount } from '@utils/hooks/useAccount';
-
 export function NoteActions({
   id,
   pubkey,
@@ -23,7 +21,6 @@ export function NoteActions({
   noOpenThread?: boolean;
   root?: string;
 }) {
-  const { account } = useAccount();
   const setWidget = useWidgets((state) => state.setWidget);
 
   return (
@@ -33,7 +30,7 @@ export function NoteActions({
           <NoteReply id={id} pubkey={pubkey} root={root} />
           <NoteReaction id={id} pubkey={pubkey} />
           <NoteRepost id={id} pubkey={pubkey} />
-          {(account?.lud06 || account?.lud16) && <NoteZap id={id} />}
+          <NoteZap id={id} />
         </div>
         {!noOpenThread && (
           <>

src/shared/notes/metadata.tsx

@@ -67,13 +67,10 @@ export function NoteMetadata({ id }: { id: string }) {
 
   if (status === 'loading') {
     return (
-      <div>
-        <div className="absolute left-[18px] top-14 h-[calc(100%-6.4rem)] w-0.5 bg-gradient-to-t from-white/20 to-white/10" />
-        <div className="relative z-10 flex items-center gap-3 pb-3">
-          <div className="mt-2 h-6 w-11 shrink-0"></div>
-          <div className="mt-2 inline-flex h-6">
-            <LoaderIcon className="h-4 w-4 animate-spin text-white" />
-          </div>
+      <div className="relative z-10 flex items-center gap-3 pb-3">
+        <div className="mt-2 h-6 w-11 shrink-0"></div>
+        <div className="mt-2 inline-flex h-6">
+          <LoaderIcon className="h-4 w-4 animate-spin text-white" />
         </div>
       </div>
     );