From c6da06cd4d233810013c5e4e2aff70d836cf6027 Mon Sep 17 00:00:00 2001
From: reya <reya@lume.nu>
Date: Fri, 8 Nov 2024 09:02:57 +0700
Subject: [PATCH] chore: clean up

---
 src-tauri/src/commands/account.rs                   | 13 ++++++++++---
 src/routes/columns/_layout/launchpad.$id.lazy.tsx   |  2 +-
 .../columns/_layout/notification.$id.lazy.tsx       |  6 +++---
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/src-tauri/src/commands/account.rs b/src-tauri/src/commands/account.rs
index 0e406ba8..503a492a 100644
--- a/src-tauri/src/commands/account.rs
+++ b/src-tauri/src/commands/account.rs
@@ -111,16 +111,23 @@ pub async fn connect_account(uri: String, state: State<'_, Nostr>) -> Result<Str
     // Handle auth url
     nostr_connect.auth_url_handler(AuthHandler);
 
-    let bunker_uri = nostr_connect
+    let keyring = Entry::new("Lume Safe Storage", &remote_npub).map_err(|err| err.to_string())?;
+
+    let reuse_bunker = nostr_connect
         .bunker_uri()
         .await
         .map_err(|err| err.to_string())?;
 
-    let keyring = Entry::new("Lume Safe Storage", &remote_npub).map_err(|err| err.to_string())?;
+    let mut reuse_uri = reuse_bunker.to_string();
+
+    if let Some(secret) = reuse_bunker.secret() {
+        let replace = format!("&secret={}", secret);
+        reuse_uri = reuse_uri.replace(replace.as_str(), "");
+    }
 
     let account = Account {
         secret_key: app_secret,
-        nostr_connect: Some(bunker_uri.to_string()),
+        nostr_connect: Some(reuse_uri),
     };
 
     // Save secret key to keyring
diff --git a/src/routes/columns/_layout/launchpad.$id.lazy.tsx b/src/routes/columns/_layout/launchpad.$id.lazy.tsx
index d7187490..0b6c35c8 100644
--- a/src/routes/columns/_layout/launchpad.$id.lazy.tsx
+++ b/src/routes/columns/_layout/launchpad.$id.lazy.tsx
@@ -73,7 +73,7 @@ function Newsfeeds() {
 					: item.tags.find((tag) => tag[0] === "title")?.[1] || "Unnamed";
 			const label =
 				item.kind === 3
-					? `newsfeed-${id.slice(0, 5)}`
+					? `newsfeed-${item.pubkey.slice(0, 5)}`
 					: item.tags.find((tag) => tag[0] === "d")?.[1] || nanoid();
 
 			return (
diff --git a/src/routes/columns/_layout/notification.$id.lazy.tsx b/src/routes/columns/_layout/notification.$id.lazy.tsx
index 3d352b98..a6ae9829 100644
--- a/src/routes/columns/_layout/notification.$id.lazy.tsx
+++ b/src/routes/columns/_layout/notification.$id.lazy.tsx
@@ -120,19 +120,19 @@ function Screen() {
 			>
 				<Tabs.List className="h-11 shrink-0 flex items-center">
 					<Tabs.Trigger
-						className="flex-1 inline-flex h-11 items-center justify-center gap-2 px-3 text-sm font-medium border-b border-neutral-100 dark:border-neutral-900 data-[state=active]:border-neutral-200 dark:data-[state=active]:border-neutral-800 data-[state=inactive]:opacity-50"
+						className="flex-1 inline-flex h-11 items-center justify-center gap-2 px-3 text-sm font-medium border-b border-neutral-100 dark:border-neutral-700 data-[state=active]:border-neutral-200 dark:data-[state=active]:border-neutral-600 data-[state=inactive]:opacity-50"
 						value="replies"
 					>
 						Replies
 					</Tabs.Trigger>
 					<Tabs.Trigger
-						className="flex-1 inline-flex h-11 items-center justify-center gap-2 px-3 text-sm font-medium border-b border-neutral-100 dark:border-neutral-900 data-[state=active]:border-neutral-200 dark:data-[state=active]:border-neutral-800 data-[state=inactive]:opacity-50"
+						className="flex-1 inline-flex h-11 items-center justify-center gap-2 px-3 text-sm font-medium border-b border-neutral-100 dark:border-neutral-700 data-[state=active]:border-neutral-200 dark:data-[state=active]:border-neutral-600 data-[state=inactive]:opacity-50"
 						value="reactions"
 					>
 						Reactions
 					</Tabs.Trigger>
 					<Tabs.Trigger
-						className="flex-1 inline-flex h-11 items-center justify-center gap-2 px-3 text-sm font-medium border-b border-neutral-100 dark:border-neutral-900 data-[state=active]:border-neutral-200 dark:data-[state=active]:border-neutral-800 data-[state=inactive]:opacity-50"
+						className="flex-1 inline-flex h-11 items-center justify-center gap-2 px-3 text-sm font-medium border-b border-neutral-100 dark:border-neutral-700 data-[state=active]:border-neutral-200 dark:data-[state=active]:border-neutral-600 data-[state=inactive]:opacity-50"
 						value="zaps"
 					>
 						Zaps