From f4a41e84b43d58a90cbf4c4aef92170c0ae06238 Mon Sep 17 00:00:00 2001
From: Matt Toohey <contact@matttoohey.com>
Date: Tue, 14 Jul 2026 12:43:38 +1000
Subject: [PATCH 1/2] fix(desktop): navigate to channel from inbox thread
 header

Clicking the #channelname header above an Inbox thread opened the
channel management panel (a side effect of #1066 funneling the name
click and the manage affordance through one onOpenChannel prop). Every
other channel-name click in the app navigates, so restore the
pre-#1066 behavior: the name click now navigates to the channel with
the source message anchored (scrolled to and highlighted).

- Split InboxDetailPane's onOpenChannel prop into onOpenContext
  (channelId, messageId, threadRootId) for the name click and
  onManageChannel(channelId) for the members-bar manage affordance.
- Wire onOpenContext in HomeView to the existing goChannel-backed
  prop; onManageChannel keeps docking the ChannelManagementSheet, so
  #1066's inspect-without-leaving-Home flow stays reachable.
- Replace the e2e test pinning the old name-click behavior with two:
  one asserting the name click navigates to
  /channels/<id>?messageId=<event>, one asserting the manage
  affordance still opens the panel in place.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Signed-off-by: Matt Toohey <contact@matttoohey.com>
---
 desktop/src/features/home/ui/HomeView.tsx     |  3 +-
 .../src/features/home/ui/InboxDetailPane.tsx  | 21 ++++++++--
 desktop/tests/e2e/channels.spec.ts            | 39 +++++++++++++++----
 3 files changed, 51 insertions(+), 12 deletions(-)

diff --git a/desktop/src/features/home/ui/HomeView.tsx b/desktop/src/features/home/ui/HomeView.tsx
index eca9f932c..397c4984d 100644
--- a/desktop/src/features/home/ui/HomeView.tsx
+++ b/desktop/src/features/home/ui/HomeView.tsx
@@ -788,10 +788,11 @@ export function HomeView({
                     setIsDeletingMessage(false);
                   });
               }}
-              onOpenChannel={(channelId) => {
+              onManageChannel={(channelId) => {
                 handleCloseProfilePanel();
                 setManagedChannelId(channelId);
               }}
+              onOpenContext={onOpenContext}
               onSendReply={async ({
                 content,
                 mediaTags,
diff --git a/desktop/src/features/home/ui/InboxDetailPane.tsx b/desktop/src/features/home/ui/InboxDetailPane.tsx
index 78ce1de57..3b5cc11b9 100644
--- a/desktop/src/features/home/ui/InboxDetailPane.tsx
+++ b/desktop/src/features/home/ui/InboxDetailPane.tsx
@@ -77,7 +77,12 @@ type InboxDetailPaneProps = {
   latchedDefaultParentId?: string | null;
   onBack?: () => void;
   onDelete: () => void;
-  onOpenChannel: (channelId: string) => void;
+  onManageChannel: (channelId: string) => void;
+  onOpenContext: (
+    channelId: string,
+    messageId: string,
+    threadRootId?: string | null,
+  ) => void;
   onSendReply: (input: {
     content: string;
     mediaTags?: string[][];
@@ -111,7 +116,8 @@ export function InboxDetailPane({
   latchedDefaultParentId = null,
   onBack,
   onDelete,
-  onOpenChannel,
+  onManageChannel,
+  onOpenContext,
   onSendReply,
   onToggleReaction,
 }: InboxDetailPaneProps) {
@@ -318,6 +324,7 @@ export function InboxDetailPane({
   const contextLabel = channelContextName ?? formatInboxTypeLabel(item);
   const hasChannelContext = Boolean(channelContextName);
   const contextChannelId = item.item.channelId;
+  const contextThreadRootId = getThreadReference(item.item.tags).rootId;
 
   const handleSelectReplyTarget = (message: InboxDisplayMessage) => {
     setReplyTargetId((currentReplyTargetId) =>
@@ -358,7 +365,13 @@ export function InboxDetailPane({
                   {canOpenChannel && contextChannelId ? (
                     <button
                       className="flex min-w-0 items-center gap-[4px] text-left text-sm font-semibold leading-5 tracking-tight text-foreground hover:underline focus-visible:outline-hidden focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2"
-                      onClick={() => onOpenChannel(contextChannelId)}
+                      onClick={() =>
+                        onOpenContext(
+                          contextChannelId,
+                          item.id,
+                          contextThreadRootId,
+                        )
+                      }
                       title={item.fullTimestampLabel}
                       type="button"
                     >
@@ -394,7 +407,7 @@ export function InboxDetailPane({
                       currentPubkey={currentPubkey}
                       onManageChannel={() => {
                         if (contextChannelId) {
-                          onOpenChannel(contextChannelId);
+                          onManageChannel(contextChannelId);
                         }
                       }}
                       onToggleMembers={() =>
diff --git a/desktop/tests/e2e/channels.spec.ts b/desktop/tests/e2e/channels.spec.ts
index 362e58c17..5147732a4 100644
--- a/desktop/tests/e2e/channels.spec.ts
+++ b/desktop/tests/e2e/channels.spec.ts
@@ -1706,9 +1706,10 @@ test("manage channel keeps canvas near the top of the sheet", async ({
   expect(canvasBox?.y).toBeLessThan(nameBox?.y);
 });
 
-test("home inbox channel label opens management without leaving home", async ({
-  page,
-}) => {
+async function seedHomeInboxMention(
+  page: import("@playwright/test").Page,
+  itemId: string,
+) {
   await page.goto("/");
   await expect(page.getByTestId("home-inbox-list")).toBeVisible();
   await page.waitForFunction(
@@ -1718,7 +1719,7 @@ test("home inbox channel label opens management without leaving home", async ({
   );
 
   await page.evaluate(
-    ({ channelId, createdAt, currentPubkey, senderPubkey }) => {
+    ({ channelId, createdAt, currentPubkey, itemId: id, senderPubkey }) => {
       const pushFeedItem = (window as MockFeedWindow)
         .__BUZZ_E2E_PUSH_MOCK_FEED_ITEM__;
       if (!pushFeedItem) {
@@ -1726,7 +1727,7 @@ test("home inbox channel label opens management without leaving home", async ({
       }
 
       pushFeedItem({
-        id: "mock-feed-home-channel-panel",
+        id,
         kind: 9,
         pubkey: senderPubkey,
         content: "Please review the home panel routing.",
@@ -1744,16 +1745,40 @@ test("home inbox channel label opens management without leaving home", async ({
       channelId: GENERAL_CHANNEL_ID,
       createdAt: Math.floor(Date.now() / 1000),
       currentPubkey: TEST_IDENTITIES.tyler.pubkey,
+      itemId,
       senderPubkey: TEST_IDENTITIES.alice.pubkey,
     },
   );
 
+  await page.getByTestId(`home-inbox-item-${itemId}`).click();
+}
+
+test("home inbox channel label navigates to the channel message", async ({
+  page,
+}) => {
+  await seedHomeInboxMention(page, "mock-feed-home-channel-navigate");
+
   await page
-    .getByTestId("home-inbox-item-mock-feed-home-channel-panel")
+    .getByTestId("home-inbox-detail")
+    .getByRole("button", { exact: true, name: "general" })
     .click();
+
+  await expect(page).toHaveURL(
+    new RegExp(`#/channels/${GENERAL_CHANNEL_ID}\\?`),
+  );
+  await expect(page).toHaveURL(/messageId=mock-feed-home-channel-navigate/);
+  await expect(page.getByTestId("message-timeline")).toBeVisible();
+  await expect(page.getByTestId("home-inbox-list")).toHaveCount(0);
+});
+
+test("home inbox manage affordance opens management without leaving home", async ({
+  page,
+}) => {
+  await seedHomeInboxMention(page, "mock-feed-home-channel-panel");
+
   await page
     .getByTestId("home-inbox-detail")
-    .getByRole("button", { exact: true, name: "general" })
+    .getByTestId("channel-management-trigger")
     .click();
 
   await expect(page.getByTestId("channel-management-sheet")).toBeVisible();

From 551ff01948668df105cb2618777e708eec502288 Mon Sep 17 00:00:00 2001
From: Matt Toohey <contact@matttoohey.com>
Date: Tue, 14 Jul 2026 14:30:57 +1000
Subject: [PATCH 2/2] test(desktop): cover threadRootId pass-through from inbox
 thread header
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The e2e test added with the inbox header navigation fix seeds a
mention whose only e-tag is the unmarked channel id, so
getThreadReference always returns a null rootId and the third
argument to onOpenContext (threadRootId) was never exercised
end-to-end. A regression dropping that argument — which
ChannelRouteScreen needs to splice thread context into the timeline
on arrival — would have gone uncaught.

- Allow seedHomeInboxMention to override the seeded feed item's tags.
- Add a test seeding a thread-reply mention (NIP-10 root/reply-marked
  e-tags) and assert the name click lands on
  /channels/<id>?messageId=<event>&threadRootId=<root>.
- Pin the null path in the existing test by asserting threadRootId is
  absent from the URL for a plain channel mention.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Signed-off-by: Matt Toohey <contact@matttoohey.com>
---
 desktop/tests/e2e/channels.spec.ts | 38 ++++++++++++++++++++++++++++--
 1 file changed, 36 insertions(+), 2 deletions(-)

diff --git a/desktop/tests/e2e/channels.spec.ts b/desktop/tests/e2e/channels.spec.ts
index 5147732a4..1b1cc3b5c 100644
--- a/desktop/tests/e2e/channels.spec.ts
+++ b/desktop/tests/e2e/channels.spec.ts
@@ -1709,6 +1709,7 @@ test("manage channel keeps canvas near the top of the sheet", async ({
 async function seedHomeInboxMention(
   page: import("@playwright/test").Page,
   itemId: string,
+  tags?: string[][],
 ) {
   await page.goto("/");
   await expect(page.getByTestId("home-inbox-list")).toBeVisible();
@@ -1719,7 +1720,14 @@ async function seedHomeInboxMention(
   );
 
   await page.evaluate(
-    ({ channelId, createdAt, currentPubkey, itemId: id, senderPubkey }) => {
+    ({
+      channelId,
+      createdAt,
+      currentPubkey,
+      itemId: id,
+      senderPubkey,
+      tags: seededTags,
+    }) => {
       const pushFeedItem = (window as MockFeedWindow)
         .__BUZZ_E2E_PUSH_MOCK_FEED_ITEM__;
       if (!pushFeedItem) {
@@ -1734,7 +1742,7 @@ async function seedHomeInboxMention(
         created_at: createdAt,
         channel_id: channelId,
         channel_name: "general",
-        tags: [
+        tags: seededTags ?? [
           ["e", channelId],
           ["p", currentPubkey],
         ],
@@ -1747,6 +1755,7 @@ async function seedHomeInboxMention(
       currentPubkey: TEST_IDENTITIES.tyler.pubkey,
       itemId,
       senderPubkey: TEST_IDENTITIES.alice.pubkey,
+      tags,
     },
   );
 
@@ -1767,6 +1776,31 @@ test("home inbox channel label navigates to the channel message", async ({
     new RegExp(`#/channels/${GENERAL_CHANNEL_ID}\\?`),
   );
   await expect(page).toHaveURL(/messageId=mock-feed-home-channel-navigate/);
+  await expect(page).not.toHaveURL(/threadRootId=/);
+  await expect(page.getByTestId("message-timeline")).toBeVisible();
+  await expect(page.getByTestId("home-inbox-list")).toHaveCount(0);
+});
+
+test("home inbox thread reply mention carries threadRootId to the channel", async ({
+  page,
+}) => {
+  const rootEventId = "mock-feed-home-thread-root";
+  await seedHomeInboxMention(page, "mock-feed-home-thread-navigate", [
+    ["e", rootEventId, "", "root"],
+    ["e", "mock-feed-home-thread-parent", "", "reply"],
+    ["p", TEST_IDENTITIES.tyler.pubkey],
+  ]);
+
+  await page
+    .getByTestId("home-inbox-detail")
+    .getByRole("button", { exact: true, name: "general" })
+    .click();
+
+  await expect(page).toHaveURL(
+    new RegExp(`#/channels/${GENERAL_CHANNEL_ID}\\?`),
+  );
+  await expect(page).toHaveURL(/messageId=mock-feed-home-thread-navigate/);
+  await expect(page).toHaveURL(new RegExp(`threadRootId=${rootEventId}`));
   await expect(page.getByTestId("message-timeline")).toBeVisible();
   await expect(page.getByTestId("home-inbox-list")).toHaveCount(0);
 });