From 0777c483e51af471fb52a599171fffc42dda4488 Mon Sep 17 00:00:00 2001
From: reya <reya@lume.nu>
Date: Fri, 13 Oct 2023 09:12:30 +0700
Subject: [PATCH] wip: fix ui for macos

---
 src-tauri/tauri.macos.conf.json           | 2 +-
 src/app/chats/components/chatListItem.tsx | 6 +-----
 src/app/chats/hooks/useDecryptMessage.tsx | 8 ++++++--
 src/libs/ndk/provider.tsx                 | 2 +-
 src/shared/layouts/app.tsx                | 7 ++++++-
 5 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/src-tauri/tauri.macos.conf.json b/src-tauri/tauri.macos.conf.json
index e2918d60..af0c5181 100644
--- a/src-tauri/tauri.macos.conf.json
+++ b/src-tauri/tauri.macos.conf.json
@@ -17,7 +17,7 @@
         "decorations": true,
         "transparent": true,
         "windowEffects": {
-          "effects": ["hudWindow"]
+          "effects": ["sidebar"]
         }
       }
     ]
diff --git a/src/app/chats/components/chatListItem.tsx b/src/app/chats/components/chatListItem.tsx
index 119b10fd..bcec8a6a 100644
--- a/src/app/chats/components/chatListItem.tsx
+++ b/src/app/chats/components/chatListItem.tsx
@@ -7,17 +7,13 @@ import { twMerge } from 'tailwind-merge';
 
 import { useDecryptMessage } from '@app/chats/hooks/useDecryptMessage';
 
-import { useStorage } from '@libs/storage/provider';
-
 import { formatCreatedAt } from '@utils/createdAt';
 import { useProfile } from '@utils/hooks/useProfile';
 import { displayNpub } from '@utils/shortenKey';
 
 export const ChatListItem = memo(function ChatListItem({ event }: { event: NDKEvent }) {
-  const { db } = useStorage();
   const { status, user } = useProfile(event.pubkey);
-
-  const decryptedContent = useDecryptMessage(event, db.account.pubkey);
+  const decryptedContent = useDecryptMessage(event);
 
   const createdAt = formatCreatedAt(event.created_at, true);
   const svgURI =
diff --git a/src/app/chats/hooks/useDecryptMessage.tsx b/src/app/chats/hooks/useDecryptMessage.tsx
index 8be74007..49eb9ae0 100644
--- a/src/app/chats/hooks/useDecryptMessage.tsx
+++ b/src/app/chats/hooks/useDecryptMessage.tsx
@@ -2,14 +2,18 @@ import { NDKEvent } from '@nostr-dev-kit/ndk';
 import { nip04 } from 'nostr-tools';
 import { useEffect, useState } from 'react';
 
-export function useDecryptMessage(message: NDKEvent, pubkey: string, privkey: string) {
+import { useStorage } from '@libs/storage/provider';
+
+export function useDecryptMessage(message: NDKEvent) {
+  const { db } = useStorage();
   const [content, setContent] = useState(message.content);
 
   useEffect(() => {
     async function decryptContent() {
       try {
+        const privkey = await db.secureLoad();
         const sender =
-          pubkey === message.pubkey
+          db.account.pubkey === message.pubkey
             ? message.tags.find((el) => el[0] === 'p')[1]
             : message.pubkey;
         const result = await nip04.decrypt(privkey, sender, message.content);
diff --git a/src/libs/ndk/provider.tsx b/src/libs/ndk/provider.tsx
index 5b58e4f6..cb88ec90 100644
--- a/src/libs/ndk/provider.tsx
+++ b/src/libs/ndk/provider.tsx
@@ -28,7 +28,7 @@ const NDKProvider = ({ children }: PropsWithChildren<object>) => {
         data-tauri-drag-region
         className="flex h-screen w-screen items-center justify-center bg-neutral-50 dark:bg-neutral-950"
       >
-        <div className="flex flex-col items-center justify-center gap-6">
+        <div className="flex flex-col items-center justify-center gap-2">
           <LoaderIcon className="h-6 w-6 animate-spin text-neutral-950 dark:text-neutral-50" />
           <h3 className="text-lg font-medium leading-none text-neutral-950 dark:text-neutral-50">
             Connecting...
diff --git a/src/shared/layouts/app.tsx b/src/shared/layouts/app.tsx
index c5c69768..659196e6 100644
--- a/src/shared/layouts/app.tsx
+++ b/src/shared/layouts/app.tsx
@@ -10,7 +10,12 @@ export function AppLayout() {
   const { db } = useStorage();
 
   return (
-    <div className="flex h-screen w-screen flex-col bg-neutral-50 dark:bg-neutral-950">
+    <div
+      className={twMerge(
+        'flex h-screen w-screen flex-col',
+        db.platform !== 'macos' ? 'bg-neutral-50 dark:bg-neutral-950' : ''
+      )}
+    >
       {db.platform !== 'macos' ? (
         <WindowTitlebar />
       ) : (