better structure

src/app/chat/components/item.tsx

@@ -1,8 +1,10 @@
-import { Image } from '@lume/shared/image';
-import { DEFAULT_AVATAR } from '@lume/stores/constants';
-import { usePageContext } from '@lume/utils/hooks/usePageContext';
-import { useProfile } from '@lume/utils/hooks/useProfile';
-import { shortenKey } from '@lume/utils/shortenKey';
+import { Image } from '@shared/image';
+
+import { DEFAULT_AVATAR } from '@stores/constants';
+
+import { usePageContext } from '@utils/hooks/usePageContext';
+import { useProfile } from '@utils/hooks/useProfile';
+import { shortenKey } from '@utils/shortenKey';
 
 import { twMerge } from 'tailwind-merge';
 

src/app/chat/components/list.tsx

@@ -1,7 +1,8 @@
-import ChatsListItem from '@lume/app/chat/components/item';
-import ChatsListSelfItem from '@lume/app/chat/components/self';
-import { useActiveAccount } from '@lume/utils/hooks/useActiveAccount';
-import { getChats } from '@lume/utils/storage';
+import ChatsListItem from '@app/chat/components/item';
+import ChatsListSelfItem from '@app/chat/components/self';
+
+import { useActiveAccount } from '@utils/hooks/useActiveAccount';
+import { getChats } from '@utils/storage';
 
 import useSWR from 'swr';
 

src/app/chat/components/messageList.tsx

@@ -1,6 +1,8 @@
-import { ChatMessageItem } from '@lume/app/chat/components/messages/item';
-import { sortedChatMessagesAtom } from '@lume/stores/chat';
-import { useActiveAccount } from '@lume/utils/hooks/useActiveAccount';
+import { ChatMessageItem } from '@app/chat/components/messages/item';
+
+import { sortedChatMessagesAtom } from '@stores/chat';
+
+import { useActiveAccount } from '@utils/hooks/useActiveAccount';
 
 import { useAtomValue } from 'jotai';
 import { useCallback, useRef } from 'react';

src/app/chat/components/messages/form.tsx

@@ -1,9 +1,11 @@
-import { ImagePicker } from '@lume/shared/form/imagePicker';
-import { RelayContext } from '@lume/shared/relayProvider';
-import { chatContentAtom } from '@lume/stores/chat';
-import { WRITEONLY_RELAYS } from '@lume/stores/constants';
-import { dateToUnix } from '@lume/utils/getDate';
-import { useActiveAccount } from '@lume/utils/hooks/useActiveAccount';
+import { ImagePicker } from '@shared/form/imagePicker';
+import { RelayContext } from '@shared/relayProvider';
+
+import { chatContentAtom } from '@stores/chat';
+import { WRITEONLY_RELAYS } from '@stores/constants';
+
+import { dateToUnix } from '@utils/date';
+import { useActiveAccount } from '@utils/hooks/useActiveAccount';
 
 import { useAtom } from 'jotai';
 import { useResetAtom } from 'jotai/utils';

src/app/chat/components/messages/item.tsx

@@ -1,8 +1,9 @@
-import ChatMessageUser from '@lume/app/chat/components/messages/user';
-import ImagePreview from '@lume/app/note/components/preview/image';
-import VideoPreview from '@lume/app/note/components/preview/video';
-import { useDecryptMessage } from '@lume/utils/hooks/useDecryptMessage';
-import { noteParser } from '@lume/utils/parser';
+import ChatMessageUser from '@app/chat/components/messages/user';
+import { useDecryptMessage } from '@app/chat/hooks/useDecryptMessage';
+import ImagePreview from '@app/note/components/preview/image';
+import VideoPreview from '@app/note/components/preview/video';
+
+import { noteParser } from '@utils/parser';
 
 import { memo } from 'react';
 

src/app/chat/components/messages/user.tsx

@@ -1,7 +1,9 @@
-import { Image } from '@lume/shared/image';
-import { DEFAULT_AVATAR, IMGPROXY_URL } from '@lume/stores/constants';
-import { useProfile } from '@lume/utils/hooks/useProfile';
-import { shortenKey } from '@lume/utils/shortenKey';
+import { Image } from '@shared/image';
+
+import { DEFAULT_AVATAR, IMGPROXY_URL } from '@stores/constants';
+
+import { useProfile } from '@utils/hooks/useProfile';
+import { shortenKey } from '@utils/shortenKey';
 
 import dayjs from 'dayjs';
 import relativeTime from 'dayjs/plugin/relativeTime';

src/app/chat/components/self.tsx

@@ -1,8 +1,10 @@
-import { Image } from '@lume/shared/image';
-import { DEFAULT_AVATAR } from '@lume/stores/constants';
-import { useActiveAccount } from '@lume/utils/hooks/useActiveAccount';
-import { usePageContext } from '@lume/utils/hooks/usePageContext';
-import { shortenKey } from '@lume/utils/shortenKey';
+import { Image } from '@shared/image';
+
+import { DEFAULT_AVATAR } from '@stores/constants';
+
+import { useActiveAccount } from '@utils/hooks/useActiveAccount';
+import { usePageContext } from '@utils/hooks/usePageContext';
+import { shortenKey } from '@utils/shortenKey';
 
 import { twMerge } from 'tailwind-merge';
 

src/app/chat/hooks/useDecryptMessage.tsx

@@ -0,0 +1,28 @@
+import { nip04 } from 'nostr-tools';
+import { useCallback, useEffect, useState } from 'react';
+
+export function useDecryptMessage(userKey: string, userPriv: string, data: any) {
+  const [content, setContent] = useState(null);
+
+  const extractSenderKey = useCallback(() => {
+    const keyInTags = data.tags.find(([k, v]) => k === 'p' && v && v !== '')[1];
+    if (keyInTags === userKey) {
+      return data.pubkey;
+    } else {
+      return keyInTags;
+    }
+  }, [data.pubkey, data.tags, userKey]);
+
+  const decrypt = useCallback(async () => {
+    const senderKey = extractSenderKey();
+    const result = await nip04.decrypt(userPriv, senderKey, data.content);
+    // update state with decrypt content
+    setContent(result);
+  }, [extractSenderKey, userPriv, data.content]);
+
+  useEffect(() => {
+    decrypt().catch(console.error);
+  }, [decrypt]);
+
+  return content ? content : null;
+}

src/app/chat/layout.tsx

@@ -1,6 +1,6 @@
-import AppHeader from '@lume/shared/appHeader';
-import MultiAccounts from '@lume/shared/multiAccounts';
-import Navigation from '@lume/shared/navigation';
+import AppHeader from '@shared/appHeader';
+import MultiAccounts from '@shared/multiAccounts';
+import Navigation from '@shared/navigation';
 
 export function LayoutChat({ children }: { children: React.ReactNode }) {
   return (

src/app/chat/pages/index.page.tsx

@@ -1,16 +1,19 @@
-import ChatMessageForm from '@lume/app/chat/components/messages/form';
-import { RelayContext } from '@lume/shared/relayProvider';
-import { chatMessagesAtom } from '@lume/stores/chat';
-import { READONLY_RELAYS } from '@lume/stores/constants';
-import { useActiveAccount } from '@lume/utils/hooks/useActiveAccount';
-import { usePageContext } from '@lume/utils/hooks/usePageContext';
+import ChatMessageForm from '@app/chat/components/messages/form';
+
+import { RelayContext } from '@shared/relayProvider';
+
+import { chatMessagesAtom } from '@stores/chat';
+import { READONLY_RELAYS } from '@stores/constants';
+
+import { useActiveAccount } from '@utils/hooks/useActiveAccount';
+import { usePageContext } from '@utils/hooks/usePageContext';
 
 import { useSetAtom } from 'jotai';
 import { useResetAtom } from 'jotai/utils';
 import { Suspense, lazy, useContext, useEffect } from 'react';
 import useSWRSubscription from 'swr/subscription';
 
-const ChatMessageList = lazy(() => import('@lume/app/chat/components/messageList'));
+const ChatMessageList = lazy(() => import('@app/chat/components/messageList'));
 
 export function Page() {
   const pool: any = useContext(RelayContext);