From d1ac257ff9b96ed6f615808fb297f0931509c86b Mon Sep 17 00:00:00 2001
From: codytseng <codytseng98@gmail.com>
Date: Sun, 31 Aug 2025 01:02:40 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=F0=9F=92=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/secondary/NotePage/index.tsx | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/pages/secondary/NotePage/index.tsx b/src/pages/secondary/NotePage/index.tsx
index 979104d..0515861 100644
--- a/src/pages/secondary/NotePage/index.tsx
+++ b/src/pages/secondary/NotePage/index.tsx
@@ -71,19 +71,23 @@ const NotePage = forwardRef(({ id, index }: { id?: string; index?: number }, ref
     <SecondaryPageLayout ref={ref} index={index} title={t('Note')} displayScrollToTopButton>
       <div className="px-4 pt-3">
         {rootITag && <ExternalRoot value={rootITag[1]} />}
-        {rootEventId !== parentEventId && (
+        {rootEventId && rootEventId !== parentEventId && (
           <ParentNote
             key={`root-note-${event.id}`}
             isFetching={isFetchingRootEvent}
             event={rootEvent}
+            eventBech32Id={rootEventId}
             isConsecutive={isConsecutive(rootEvent, parentEvent)}
           />
         )}
-        <ParentNote
-          key={`parent-note-${event.id}`}
-          isFetching={isFetchingParentEvent}
-          event={parentEvent}
-        />
+        {parentEventId && (
+          <ParentNote
+            key={`parent-note-${event.id}`}
+            isFetching={isFetchingParentEvent}
+            event={parentEvent}
+            eventBech32Id={parentEventId}
+          />
+        )}
         <Note
           key={`note-${event.id}`}
           event={event}
@@ -120,10 +124,12 @@ function ExternalRoot({ value }: { value: string }) {
 
 function ParentNote({
   event,
+  eventBech32Id,
   isFetching,
   isConsecutive = true
 }: {
   event?: Event
+  eventBech32Id: string
   isFetching: boolean
   isConsecutive?: boolean
 }) {
@@ -142,7 +148,6 @@ function ParentNote({
       </div>
     )
   }
-  if (!event) return null
 
   return (
     <div>
@@ -152,8 +157,7 @@ function ParentNote({
           event && 'hover:text-foreground'
         )}
         onClick={() => {
-          if (!event) return
-          push(toNote(event))
+          push(toNote(event ?? eventBech32Id))
         }}
       >
         {event && <UserAvatar userId={event.pubkey} size="tiny" className="shrink-0" />}