From 8d76bb1808b69b913b90df0e26ee88803ddee88c Mon Sep 17 00:00:00 2001
From: Jon Staab <shtaab@gmail.com>
Date: Wed, 5 Jun 2024 09:04:53 -0700
Subject: [PATCH] Fix user display on menu

---
 src/app/MenuDesktop.svelte             | 4 ++--
 src/app/shared/NoteContentKind1.svelte | 1 -
 src/engine/state.ts                    | 5 +++++
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/app/MenuDesktop.svelte b/src/app/MenuDesktop.svelte
index f5758462..22a9390c 100644
--- a/src/app/MenuDesktop.svelte
+++ b/src/app/MenuDesktop.svelte
@@ -19,7 +19,7 @@
     hasNewMessages,
     hasNewNotifications,
     sessions,
-    displayProfileByPubkey,
+    userDisplay,
     publishes,
   } from "src/engine"
 
@@ -220,7 +220,7 @@
           <Anchor class="flex items-center gap-2" on:click={() => setSubMenu("account")}>
             <PersonCircle class="h-10 w-10" pubkey={$pubkey} />
             <div class="flex min-w-0 flex-col">
-              <span>@{displayProfileByPubkey($pubkey)}</span>
+              <span>@{$userDisplay}</span>
               <PersonHandle class="text-sm" pubkey={$pubkey} />
             </div>
           </Anchor>
diff --git a/src/app/shared/NoteContentKind1.svelte b/src/app/shared/NoteContentKind1.svelte
index a948bdff..95f4c201 100644
--- a/src/app/shared/NoteContentKind1.svelte
+++ b/src/app/shared/NoteContentKind1.svelte
@@ -103,7 +103,6 @@
       {:else if !isEllipsis(parsed)}
         {renderParsed(parsed)}
       {/if}
-      {" "}
     {/each}
   </div>
   {#if showMedia && extraLinks.length > 0}
diff --git a/src/engine/state.ts b/src/engine/state.ts
index 572d5587..6b2cbbdc 100644
--- a/src/engine/state.ts
+++ b/src/engine/state.ts
@@ -331,6 +331,11 @@ export const displayProfileByPubkey = (pk: string) => {
 export const deriveProfileDisplay = (pk: string) =>
   derived(deriveProfile(pk), () => displayProfileByPubkey(pk))
 
+export const userDisplay = derived(
+  [pubkey, profilesByPubkey],
+  ([$pk, $p]) => $pk ? displayProfileByPubkey($pk) : ""
+)
+
 export const profilesWithName = derived(profiles, $profiles => $profiles.filter(profileHasName))
 
 export class ProfileSearch extends SearchHelper<PublishedProfile, string> {