From 63e6a30d83c64610f3e656fab6fb26a36097193c Mon Sep 17 00:00:00 2001
From: Innei <tukon479@gmail.com>
Date: Wed, 19 Feb 2025 21:44:29 +0800
Subject: [PATCH] refactor(mobile): Update TimelineViewSelector context menu
 handling

- Modify TimelineViewSelector to pass view-specific context menu props
- Adjust TimelineViewSelectorContextMenu to handle undefined viewId more precisely
- Simplify context menu rendering logic for view-based timelines

Signed-off-by: Innei <tukon479@gmail.com>
---
 apps/mobile/src/modules/screen/TimelineViewSelector.tsx      | 5 +----
 .../src/modules/screen/TimelineViewSelectorContextMenu.tsx   | 2 +-
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/apps/mobile/src/modules/screen/TimelineViewSelector.tsx b/apps/mobile/src/modules/screen/TimelineViewSelector.tsx
index af3d2fa5b..9f33b24a8 100644
--- a/apps/mobile/src/modules/screen/TimelineViewSelector.tsx
+++ b/apps/mobile/src/modules/screen/TimelineViewSelector.tsx
@@ -108,10 +108,7 @@ function ViewItem({ view }: { view: ViewDefinition }) {
   }, [isActive, unreadCount])
 
   return (
-    <TimelineViewSelectorContextMenu
-      viewId={selectedFeed && "viewId" in selectedFeed ? selectedFeed.viewId : undefined}
-      type={selectedFeed?.type}
-    >
+    <TimelineViewSelectorContextMenu type="view" viewId={view.view}>
       <ItemWrapper
         isActive={isActive}
         onPress={() => selectTimeline({ type: "view", viewId: view.view })}
diff --git a/apps/mobile/src/modules/screen/TimelineViewSelectorContextMenu.tsx b/apps/mobile/src/modules/screen/TimelineViewSelectorContextMenu.tsx
index a157484bf..2c41a1e91 100644
--- a/apps/mobile/src/modules/screen/TimelineViewSelectorContextMenu.tsx
+++ b/apps/mobile/src/modules/screen/TimelineViewSelectorContextMenu.tsx
@@ -7,7 +7,7 @@ import { unreadSyncService } from "@/src/store/unread/store"
 export const TimelineViewSelectorContextMenu: FC<
   PropsWithChildren<{ type: string | undefined; viewId: FeedViewType | undefined }>
 > = ({ children, type, viewId }) => {
-  if (type !== "view" || !viewId) return children
+  if (type !== "view" || viewId === undefined) return children
 
   return (
     <ContextMenu.Root>