From 1c9ac0022ce7ba6565922ab91d925314daa71d01 Mon Sep 17 00:00:00 2001
From: Matt Toohey <contact@matttoohey.com>
Date: Wed, 26 Aug 2026 11:58:31 +1000
Subject: [PATCH] fix(desktop): show member count before joining channels

Signed-off-by: Matt Toohey <contact@matttoohey.com>
Co-authored-by: Jitter <2b2e6415e748c35180847a37aadae06a11e30dddc76b784e7fd9354c4eb42e7a@buzz.block.builderlab.xyz>
---
 .../channels/ui/ChannelMembersBar.tsx         | 53 ++++++++++++-------
 .../channels/ui/ChannelScreenHeader.tsx       | 11 +++-
 desktop/tests/e2e/channel-browser.spec.ts     | 37 +++++++++++++
 3 files changed, 81 insertions(+), 20 deletions(-)

diff --git a/desktop/src/features/channels/ui/ChannelMembersBar.tsx b/desktop/src/features/channels/ui/ChannelMembersBar.tsx
index 5eda936c41..6b851f7fd0 100644
--- a/desktop/src/features/channels/ui/ChannelMembersBar.tsx
+++ b/desktop/src/features/channels/ui/ChannelMembersBar.tsx
@@ -43,6 +43,37 @@ type ChannelMembersBarProps = {
   variant?: "inline" | "compact";
 };
 
+type ChannelMembersButtonProps = {
+  memberCount: number;
+  onToggleMembers: () => void;
+};
+
+export function ChannelMembersButton({
+  memberCount,
+  onToggleMembers,
+}: ChannelMembersButtonProps) {
+  return (
+    <Tooltip disableHoverableContent>
+      <TooltipTrigger asChild>
+        <Button
+          aria-label={`View channel members (${memberCount})`}
+          className="h-8 px-2.5"
+          data-testid="channel-members-trigger"
+          onClick={onToggleMembers}
+          type="button"
+          variant="outline"
+        >
+          <Users />
+          <span className="min-w-[1ch] text-sm font-medium tabular-nums">
+            {memberCount}
+          </span>
+        </Button>
+      </TooltipTrigger>
+      <TooltipContent>Channel members</TooltipContent>
+    </Tooltip>
+  );
+}
+
 export function ChannelMembersBar({
   channel,
   currentPubkey,
@@ -229,24 +260,10 @@ export function ChannelMembersBar({
       </div>
     ) : (
       <div className="flex items-center gap-[6px]">
-        <Tooltip disableHoverableContent>
-          <TooltipTrigger asChild>
-            <Button
-              aria-label={`View channel members (${memberCount})`}
-              className="h-8 px-2.5"
-              data-testid="channel-members-trigger"
-              onClick={onToggleMembers}
-              type="button"
-              variant="outline"
-            >
-              <Users />
-              <span className="min-w-[1ch] text-sm font-medium tabular-nums">
-                {memberCount}
-              </span>
-            </Button>
-          </TooltipTrigger>
-          <TooltipContent>Channel members</TooltipContent>
-        </Tooltip>
+        <ChannelMembersButton
+          memberCount={memberCount}
+          onToggleMembers={onToggleMembers}
+        />
 
         {huddleIndicator}
 
diff --git a/desktop/src/features/channels/ui/ChannelScreenHeader.tsx b/desktop/src/features/channels/ui/ChannelScreenHeader.tsx
index f1c5f5ae42..61b83f77ce 100644
--- a/desktop/src/features/channels/ui/ChannelScreenHeader.tsx
+++ b/desktop/src/features/channels/ui/ChannelScreenHeader.tsx
@@ -8,7 +8,10 @@ import { getChannelDescription } from "@/features/channels/lib/channelDescriptio
 import { getDmParticipantPreview } from "@/features/channels/lib/dmParticipantDisplay";
 import { ChannelGlyph } from "@/features/channels/ui/ChannelGlyph";
 import { ChannelHeaderStatusBadge } from "@/features/channels/ui/ChannelHeaderStatusBadge";
-import { ChannelMembersBar } from "@/features/channels/ui/ChannelMembersBar";
+import {
+  ChannelMembersBar,
+  ChannelMembersButton,
+} from "@/features/channels/ui/ChannelMembersBar";
 import {
   DEFAULT_HOVER_PROFILE_STATUS_GEOMETRY,
   ProfileAvatarWithStatus,
@@ -100,7 +103,11 @@ export function ChannelScreenHeader({
   ) : null;
   const channelActions = activeChannel ? (
     showJoinButton ? (
-      <div className="flex items-center gap-1">
+      <div className="flex items-center gap-[6px]">
+        <ChannelMembersButton
+          memberCount={activeChannel.memberCount}
+          onToggleMembers={onToggleMembers}
+        />
         <Button
           disabled={isJoining}
           onClick={() => void onJoinChannel()}
diff --git a/desktop/tests/e2e/channel-browser.spec.ts b/desktop/tests/e2e/channel-browser.spec.ts
index b60453fc4f..9634142325 100644
--- a/desktop/tests/e2e/channel-browser.spec.ts
+++ b/desktop/tests/e2e/channel-browser.spec.ts
@@ -453,6 +453,43 @@ test("Enter selects a channel when create row is not highlighted", async ({
   await expect(page.getByTestId("chat-title")).toHaveText("design");
 });
 
+test("non-member open channel header shows its member count and roster", async ({
+  page,
+}) => {
+  await page.goto("/");
+
+  await openChannelBrowser(page);
+  const designRow = page.getByTestId("browse-channel-design");
+  await expect(designRow).toContainText("2 members");
+  await designRow.locator("button").first().click();
+
+  await expect(page.getByTestId("channel-browser-dialog")).not.toBeVisible();
+  await expect(page.getByTestId("chat-title")).toHaveText("design");
+  await expect(
+    page.getByRole("button", { name: "Join", exact: true }),
+  ).toBeVisible();
+  await expect(page.getByTestId("channel-members-trigger")).toHaveAttribute(
+    "aria-label",
+    "View channel members (2)",
+  );
+  await expect(page.getByTestId("channel-start-huddle-trigger")).toHaveCount(0);
+  await expect(page.getByTestId("channel-management-trigger")).toHaveCount(0);
+
+  await page.getByTestId("channel-members-trigger").click();
+  const members = page.getByTestId("members-sidebar");
+  await expect(members).toBeVisible();
+  await expect(
+    members.getByTestId(
+      "sidebar-member-953d3363262e86b770419834c53d2446409db6d918a57f8f339d495d54ab001f",
+    ),
+  ).toBeVisible();
+  await expect(
+    members.getByTestId(
+      "sidebar-member-bb22a5299220cad76ffd46190ccbeede8ab5dc260faa28b6e5a2cb31b9aff260",
+    ),
+  ).toBeVisible();
+});
+
 test("joining a channel from browser adds it to the sidebar", async ({
   page,
 }) => {