From 9ddf3471ced10b092c270a2cd48623ad84009c21 Mon Sep 17 00:00:00 2001
From: reya <reya@lume.nu>
Date: Fri, 1 Dec 2023 08:23:46 +0700
Subject: [PATCH] fix nsecbunker

---
 src/app/auth/import.tsx     | 11 +++++++---
 src/app/new/privkey.tsx     |  2 +-
 src/libs/ndk/instance.ts    | 44 +++++++++++++++++++++----------------
 src/shared/logout.tsx       |  2 +-
 src/shared/notes/notify.tsx |  8 +++----
 5 files changed, 39 insertions(+), 28 deletions(-)

diff --git a/src/app/auth/import.tsx b/src/app/auth/import.tsx
index 6beb750a..ad9dfed4 100644
--- a/src/app/auth/import.tsx
+++ b/src/app/auth/import.tsx
@@ -1,4 +1,4 @@
-import { NDKNip46Signer, NDKPrivateKeySigner } from '@nostr-dev-kit/ndk';
+import NDK, { NDKNip46Signer, NDKPrivateKeySigner } from '@nostr-dev-kit/ndk';
 import { readText } from '@tauri-apps/plugin-clipboard-manager';
 import { motion } from 'framer-motion';
 import { nip19 } from 'nostr-tools';
@@ -49,8 +49,13 @@ export function ImportAccountScreen() {
       await db.createSetting('nsecbunker', '1');
       await db.secureSave(`${pubkey}-nsecbunker`, localSigner.privateKey);
 
-      const remoteSigner = new NDKNip46Signer(ndk, npub, localSigner);
-      // await remoteSigner.blockUntilReady();
+      const bunker = new NDK({
+        explicitRelayUrls: ['wss://relay.nsecbunker.com', 'wss://nostr.vulpem.com'],
+      });
+      bunker.connect();
+
+      const remoteSigner = new NDKNip46Signer(bunker, npub, localSigner);
+      await remoteSigner.blockUntilReady();
 
       ndk.signer = remoteSigner;
 
diff --git a/src/app/new/privkey.tsx b/src/app/new/privkey.tsx
index 691d1b8a..29ae67d6 100644
--- a/src/app/new/privkey.tsx
+++ b/src/app/new/privkey.tsx
@@ -62,7 +62,7 @@ export function NewPrivkeyScreen() {
           autoComplete="off"
           autoCorrect="off"
           autoCapitalize="off"
-          className="h-11 w-full rounded-lg bg-neutral-100 px-3 py-2 placeholder:text-neutral-500 dark:bg-neutral-900 dark:placeholder:text-neutral-400"
+          className="h-11 rounded-lg border-transparent bg-neutral-100 px-3 placeholder:text-neutral-500 focus:border-blue-500 focus:ring focus:ring-blue-200 dark:bg-neutral-900 dark:placeholder:text-neutral-400 dark:focus:ring-blue-800"
         />
         <div className="mt-2 flex flex-col gap-2">
           <button
diff --git a/src/libs/ndk/instance.ts b/src/libs/ndk/instance.ts
index e002dff3..8ef8cc15 100644
--- a/src/libs/ndk/instance.ts
+++ b/src/libs/ndk/instance.ts
@@ -29,14 +29,22 @@ export const NDKInstance = () => {
 
     // NIP-46 Signer
     if (nsecbunker) {
-      const localSignerPrivkey = await db.secureLoad(db.account.pubkey + '-nsecbunker');
+      const localSignerPrivkey = await db.secureLoad(`${db.account.pubkey}-nsecbunker`);
       if (!localSignerPrivkey) return null;
+
       const localSigner = new NDKPrivateKeySigner(localSignerPrivkey);
-      // await remoteSigner.blockUntilReady();
-      return new NDKNip46Signer(ndk, db.account.id, localSigner);
+      const bunker = new NDK({
+        explicitRelayUrls: ['wss://relay.nsecbunker.com', 'wss://nostr.vulpem.com'],
+      });
+      bunker.connect();
+
+      const remoteSigner = new NDKNip46Signer(bunker, db.account.id, localSigner);
+      await remoteSigner.blockUntilReady();
+
+      return remoteSigner;
     }
 
-    // Private Key Signer
+    // Privkey Signer
     const userPrivkey = await db.secureLoad(db.account.pubkey);
     if (!userPrivkey) return null;
     return new NDKPrivateKeySigner(userPrivkey);
@@ -46,11 +54,6 @@ export const NDKInstance = () => {
     try {
       const outboxSetting = await db.getSettingValue('outbox');
       const bunkerSetting = await db.getSettingValue('nsecbunker');
-
-      const bunker = !!parseInt(bunkerSetting);
-      const outbox = !!parseInt(outboxSetting);
-
-      const signer = await getSigner(bunker);
       const explicitRelayUrls = normalizeRelayUrlSet([
         'wss://relay.damus.io',
         'wss://relay.nostr.band',
@@ -58,6 +61,9 @@ export const NDKInstance = () => {
         'wss://nostr.mutinywallet.com',
       ]);
 
+      const bunker = !!parseInt(bunkerSetting);
+      const outbox = !!parseInt(outboxSetting);
+
       const tauriAdapter = new NDKCacheAdapterTauri(db);
       const instance = new NDK({
         explicitRelayUrls,
@@ -67,10 +73,11 @@ export const NDKInstance = () => {
         autoConnectUserRelays: true,
         autoFetchUserMutelist: true,
         clientName: 'Lume',
-        clientNip89: 'Lume',
+        // clientNip89: '',
       });
 
       // add signer if exist
+      const signer = await getSigner(bunker);
       if (signer) instance.signer = signer;
 
       // connect
@@ -85,7 +92,7 @@ export const NDKInstance = () => {
           (user) => user.pubkey
         );
 
-        // prefetch data
+        // prefetch newsfeed
         await queryClient.prefetchInfiniteQuery({
           queryKey: ['newsfeed'],
           initialPageParam: 0,
@@ -128,6 +135,7 @@ export const NDKInstance = () => {
           },
         });
 
+        // prefetch notification
         await queryClient.prefetchInfiniteQuery({
           queryKey: ['notification'],
           initialPageParam: 0,
@@ -161,14 +169,12 @@ export const NDKInstance = () => {
       setFetcher(_fetcher);
       setRelayUrls(explicitRelayUrls);
     } catch (e) {
-      const yes = await ask(
-        `Something wrong, Lume is not working as expected, do you want to relaunch app?`,
-        {
-          title: 'Lume',
-          type: 'error',
-          okLabel: 'Yes',
-        }
-      );
+      console.error(e);
+      const yes = await ask(e, {
+        title: 'Lume',
+        type: 'error',
+        okLabel: 'Yes',
+      });
       if (yes) relaunch();
     }
   }
diff --git a/src/shared/logout.tsx b/src/shared/logout.tsx
index 7f3812eb..bc56a40d 100644
--- a/src/shared/logout.tsx
+++ b/src/shared/logout.tsx
@@ -19,7 +19,7 @@ export function Logout() {
 
       // remove private key
       await db.secureRemove(db.account.pubkey);
-      await db.secureRemove(db.account.pubkey + '-bunker');
+      await db.secureRemove(db.account.pubkey + '-nsecbunker');
 
       // logout
       await db.accountLogout();
diff --git a/src/shared/notes/notify.tsx b/src/shared/notes/notify.tsx
index d1156727..606b2599 100644
--- a/src/shared/notes/notify.tsx
+++ b/src/shared/notes/notify.tsx
@@ -124,10 +124,10 @@ export function NotifyNote({ event }: { event: NDKEvent }) {
           <div className="flex flex-col gap-2">
             <div className="w-full px-3">
               <div className="flex h-min w-full flex-col gap-3 rounded-lg bg-neutral-100 p-3 dark:bg-neutral-900">
-                {thread.replyEventId ? (
-                  <ChildNote id={thread.replyEventId} />
-                ) : thread.rootEventId ? (
-                  <ChildNote id={thread.rootEventId} isRoot />
+                {thread?.replyEventId ? (
+                  <ChildNote id={thread?.replyEventId} />
+                ) : thread?.rootEventId ? (
+                  <ChildNote id={thread?.rootEventId} isRoot />
                 ) : null}
                 <button
                   type="button"