From 6f1981a1c8493a1ca6558cf29f1f9d1d86f33af4 Mon Sep 17 00:00:00 2001
From: npub13fn4ahfnvaa2qwylvegdgeajqs0mph6v4qsw4jcqnw4mjh3hzh2quuucm5
 <8a675edd33677aa0389f6650d467b2041fb0df4ca820eacb009babb95e3715d4@sprout-oss.stage.blox.sqprod.co>
Date: Fri, 10 Jul 2026 17:32:52 +0100
Subject: [PATCH 01/16] feat(desktop): add Send feedback modal

Adds a 'Send feedback' modal reachable from the profile menu. It mirrors
the New DM modal layout with single-select category pills (Bug / Praise /
Needs work), a feedback textarea, an inline image attachment shown beside
the text, and an 'Attach logs' checkbox. Selecting the positive category
fires the heart-burst emitter.

Delivery resolves (or creates) a private 'Buzz feedback' channel and posts
the feedback with imeta attachments; 'Attach logs' bundles a client-side
diagnostics text file (app version, platform) since there is no on-disk
log sink yet.

Signed-off-by: npub13fn4ahfnvaa2qwylvegdgeajqs0mph6v4qsw4jcqnw4mjh3hzh2quuucm5 <8a675edd33677aa0389f6650d467b2041fb0df4ca820eacb009babb95e3715d4@sprout-oss.stage.blox.sqprod.co>
---
 desktop/src/app/AppShell.tsx                  |  19 ++
 .../features/profile/ui/ProfilePopover.tsx    |  22 +-
 .../settings/hooks/useSendFeedback.ts         | 149 ++++++++
 .../settings/ui/SendFeedbackDialog.tsx        | 321 ++++++++++++++++++
 .../src/features/sidebar/ui/AppSidebar.tsx    |   3 +
 .../sidebar/ui/SidebarProfileCard.tsx         |   3 +
 6 files changed, 516 insertions(+), 1 deletion(-)
 create mode 100644 desktop/src/features/settings/hooks/useSendFeedback.ts
 create mode 100644 desktop/src/features/settings/ui/SendFeedbackDialog.tsx

diff --git a/desktop/src/app/AppShell.tsx b/desktop/src/app/AppShell.tsx
index c5f802a666..7eff51ee05 100644
--- a/desktop/src/app/AppShell.tsx
+++ b/desktop/src/app/AppShell.tsx
@@ -55,6 +55,8 @@ import { useArchiveSync } from "@/features/local-archive/archiveSyncManager";
 import { useObserverArchiveSeed } from "@/features/local-archive/useObserverArchiveSeed";
 import { useAgentMetricArchiveSeed } from "@/features/local-archive/useAgentMetricArchiveSeed";
 import { useProfileQuery } from "@/features/profile/hooks";
+import { useSendFeedback } from "@/features/settings/hooks/useSendFeedback";
+import { SendFeedbackDialog } from "@/features/settings/ui/SendFeedbackDialog";
 import {
   DEFAULT_SETTINGS_SECTION,
   type SettingsSection,
@@ -110,6 +112,8 @@ export function AppShell() {
   const [browseDialogType, setBrowseDialogType] =
     React.useState<BrowseDialogType>(null);
   const [isCreateChannelOpen, setIsCreateChannelOpen] = React.useState(false);
+  const [isSendFeedbackOpen, setIsSendFeedbackOpen] = React.useState(false);
+  const sendFeedback = useSendFeedback();
   const [isHuddleDrawerOpen, setIsHuddleDrawerOpen] = React.useState(false);
   const mainInsetRef = React.useRef<HTMLElement>(null);
   const location = useLocation();
@@ -767,6 +771,7 @@ export function AppShell() {
                           onNewMessage={handleOpenNewDm}
                           onCreateChannelOpenChange={setIsCreateChannelOpen}
                           onOpenAddCommunity={() => setIsAddCommunityOpen(true)}
+                          onSendFeedback={() => setIsSendFeedbackOpen(true)}
                           onUpdateCommunity={communitiesHook.updateCommunity}
                           onRemoveCommunity={communitiesHook.removeCommunity}
                           onSwitchCommunity={handleSwitchCommunity}
@@ -924,6 +929,20 @@ export function AppShell() {
                         void goChannel(channelId);
                       }}
                     />
+                    <SendFeedbackDialog
+                      attachedImageUrl={sendFeedback.attachedImage?.url ?? null}
+                      isPending={sendFeedback.isPending}
+                      onAttachImage={sendFeedback.attachImage}
+                      onOpenChange={(open) => {
+                        setIsSendFeedbackOpen(open);
+                        if (!open) {
+                          sendFeedback.reset();
+                        }
+                      }}
+                      onRemoveImage={sendFeedback.removeImage}
+                      onSubmit={sendFeedback.submit}
+                      open={isSendFeedbackOpen}
+                    />
                   </SidebarProvider>
                 </div>
 
diff --git a/desktop/src/features/profile/ui/ProfilePopover.tsx b/desktop/src/features/profile/ui/ProfilePopover.tsx
index 51f4236d01..d9f55a4392 100644
--- a/desktop/src/features/profile/ui/ProfilePopover.tsx
+++ b/desktop/src/features/profile/ui/ProfilePopover.tsx
@@ -1,5 +1,5 @@
 import * as React from "react";
-import { ChevronRight, Smile } from "lucide-react";
+import { ChevronRight, MessageSquareText, Smile } from "lucide-react";
 
 import { Popover, PopoverContent, PopoverTrigger } from "@/shared/ui/popover";
 import { ProfileAvatar } from "@/features/profile/ui/ProfileAvatar";
@@ -24,6 +24,7 @@ interface ProfilePopoverProps {
   onSetUserStatus: (text: string, emoji: string) => void;
   onClearUserStatus: () => void;
   onOpenSettings: (section?: "profile" | "appearance") => void;
+  onSendFeedback?: () => void;
   children: React.ReactNode;
   // Optional outer container whose clicks should NOT close the popover.
   // Used when auxiliary triggers (avatar, status text) live alongside the
@@ -54,6 +55,7 @@ export function ProfilePopover({
   onSetUserStatus,
   onClearUserStatus,
   onOpenSettings,
+  onSendFeedback,
   children,
   triggerContainerRef,
   communitySwitcherSlot,
@@ -259,6 +261,24 @@ export function ProfilePopover({
               </kbd>
             </button>
 
+            {onSendFeedback ? (
+              <button
+                className={MENU_ITEM_CLASS}
+                data-testid="profile-popover-send-feedback"
+                onClick={() => {
+                  closePopover();
+                  window.requestAnimationFrame(() => {
+                    onSendFeedback();
+                  });
+                }}
+                role="menuitem"
+                type="button"
+              >
+                <MessageSquareText className="h-4 w-4 shrink-0 text-muted-foreground" />
+                <span className="flex-1">Send feedback</span>
+              </button>
+            ) : null}
+
             {communitySwitcherSlot ? (
               <>
                 <hr className="my-1 h-px border-0 bg-border" />
diff --git a/desktop/src/features/settings/hooks/useSendFeedback.ts b/desktop/src/features/settings/hooks/useSendFeedback.ts
new file mode 100644
index 0000000000..0f84bfc962
--- /dev/null
+++ b/desktop/src/features/settings/hooks/useSendFeedback.ts
@@ -0,0 +1,149 @@
+import { getVersion } from "@tauri-apps/api/app";
+import { useMutation } from "@tanstack/react-query";
+import * as React from "react";
+
+import { useChannelsQuery } from "@/features/channels/hooks";
+import type { ImetaMedia } from "@/features/messages/lib/imetaMediaMarkdown";
+import { buildOutgoingMessage } from "@/features/messages/lib/imetaMediaMarkdown";
+import type { SendFeedbackInput } from "@/features/settings/ui/SendFeedbackDialog";
+import {
+  createChannel,
+  pickAndUploadMedia,
+  sendChannelMessage,
+  uploadMediaBytes,
+} from "@/shared/api/tauri";
+import type { Channel } from "@/shared/api/types";
+
+/** Name of the private channel feedback is delivered to. */
+export const FEEDBACK_CHANNEL_NAME = "Buzz feedback";
+
+const CATEGORY_LABELS: Record<string, string> = {
+  bug: "Bug",
+  praise: "Praise",
+  "needs-work": "Needs work",
+};
+
+function findFeedbackChannel(channels: Channel[] | undefined): Channel | null {
+  if (!channels) {
+    return null;
+  }
+  return (
+    channels.find(
+      (channel) =>
+        channel.channelType !== "dm" &&
+        channel.name.trim().toLowerCase() ===
+          FEEDBACK_CHANNEL_NAME.toLowerCase(),
+    ) ?? null
+  );
+}
+
+/**
+ * Best-effort diagnostics text bundled when the user checks "Attach logs".
+ *
+ * The desktop app has no on-disk log file yet (it logs to stderr), so this
+ * captures the environment context that is available client-side. When a real
+ * log sink lands, extend this to include recent log lines.
+ */
+async function collectDiagnostics(): Promise<string> {
+  let appVersion = "unknown";
+  try {
+    appVersion = await getVersion();
+  } catch {
+    // Non-fatal — fall through with "unknown".
+  }
+  const nav = typeof navigator !== "undefined" ? navigator : undefined;
+  return [
+    "Buzz feedback diagnostics",
+    `captured: ${new Date().toISOString()}`,
+    `app version: ${appVersion}`,
+    `platform: ${nav?.platform ?? "unknown"}`,
+    `user agent: ${nav?.userAgent ?? "unknown"}`,
+    `language: ${nav?.language ?? "unknown"}`,
+  ].join("\n");
+}
+
+/**
+ * Owns feedback delivery: resolves (or creates) the private "Buzz feedback"
+ * channel, manages the optional image attachment, gathers a diagnostics bundle
+ * when logs are requested, and posts the feedback message with imeta tags.
+ */
+export function useSendFeedback() {
+  const channelsQuery = useChannelsQuery();
+  const [attachedImage, setAttachedImage] = React.useState<ImetaMedia | null>(
+    null,
+  );
+
+  const attachImage = React.useCallback(async () => {
+    const descriptors = await pickAndUploadMedia();
+    const first = descriptors[0];
+    if (first) {
+      setAttachedImage(first);
+    }
+  }, []);
+
+  const removeImage = React.useCallback(() => {
+    setAttachedImage(null);
+  }, []);
+
+  const reset = React.useCallback(() => {
+    setAttachedImage(null);
+  }, []);
+
+  const submitMutation = useMutation({
+    mutationFn: async (input: SendFeedbackInput) => {
+      // Resolve or create the private feedback channel.
+      let channel = findFeedbackChannel(channelsQuery.data);
+      if (!channel) {
+        channel = await createChannel({
+          name: FEEDBACK_CHANNEL_NAME,
+          channelType: "stream",
+          visibility: "private",
+          description: "In-app feedback and bug reports.",
+        });
+      }
+
+      const headerParts: string[] = [];
+      if (input.category) {
+        headerParts.push(
+          `**${CATEGORY_LABELS[input.category] ?? input.category}**`,
+        );
+      }
+      const bodyLines = [headerParts.join(" "), input.message]
+        .filter((part) => part.length > 0)
+        .join("\n\n");
+
+      const attachments: ImetaMedia[] = [];
+      if (attachedImage) {
+        attachments.push(attachedImage);
+      }
+      if (input.includeLogs) {
+        const diagnostics = await collectDiagnostics();
+        const bytes = Array.from(new TextEncoder().encode(diagnostics));
+        const logDescriptor = await uploadMediaBytes(
+          bytes,
+          `feedback-diagnostics-${Date.now()}.txt`,
+        );
+        attachments.push(logDescriptor);
+      }
+
+      const { content, mediaTags } = buildOutgoingMessage(
+        bodyLines,
+        attachments,
+      );
+
+      await sendChannelMessage(channel.id, content, null, mediaTags);
+    },
+    onSuccess: () => {
+      reset();
+    },
+  });
+
+  return {
+    attachImage,
+    attachedImage,
+    isPending: submitMutation.isPending,
+    removeImage,
+    reset,
+    submit: submitMutation.mutateAsync,
+  };
+}
diff --git a/desktop/src/features/settings/ui/SendFeedbackDialog.tsx b/desktop/src/features/settings/ui/SendFeedbackDialog.tsx
new file mode 100644
index 0000000000..1f87c45c6d
--- /dev/null
+++ b/desktop/src/features/settings/ui/SendFeedbackDialog.tsx
@@ -0,0 +1,321 @@
+import { Bug, ImageIcon, Paperclip, ThumbsUp, Wrench, X } from "lucide-react";
+import * as React from "react";
+
+import { cn } from "@/shared/lib/cn";
+import { Button } from "@/shared/ui/button";
+import { Checkbox } from "@/shared/ui/checkbox";
+import {
+  Dialog,
+  DialogClose,
+  DialogContent,
+  DialogHeader,
+  DialogTitle,
+} from "@/shared/ui/dialog";
+import { useEmojiBurst } from "@/shared/ui/EmojiBurstProvider";
+import { Textarea } from "@/shared/ui/textarea";
+
+/** A random heart emoji so repeated bursts vary a little. */
+const HEART_BURST_EMOJIS = ["❤️", "🩷", "🧡", "💛", "💚", "💙", "💜", "💖"];
+
+/**
+ * Feedback categories. `id` is what we persist in the outbound message; `label`
+ * is user-facing. `positive` categories fire the heart-burst emitter on select.
+ */
+export type FeedbackCategoryId = "bug" | "praise" | "needs-work";
+
+type FeedbackCategory = {
+  id: FeedbackCategoryId;
+  label: string;
+  icon: React.ComponentType<{ className?: string }>;
+  positive?: boolean;
+};
+
+const FEEDBACK_CATEGORIES: readonly FeedbackCategory[] = [
+  { id: "bug", label: "Bug", icon: Bug },
+  { id: "praise", label: "Praise", icon: ThumbsUp, positive: true },
+  { id: "needs-work", label: "Needs work", icon: Wrench },
+];
+
+export type SendFeedbackInput = {
+  category: FeedbackCategoryId | null;
+  includeLogs: boolean;
+  message: string;
+};
+
+/**
+ * "Send feedback" modal.
+ *
+ * Layout mirrors {@link NewDirectMessageDialog}: a pill row (here, selectable
+ * feedback categories in place of profile pills), a generic feedback box with an
+ * optional image attachment shown horizontally beside it, and an "Attach logs"
+ * checkbox. Selecting a positive category fires the heart-burst emitter.
+ *
+ * Delivery (channel resolution, upload, send) is delegated to `onSubmit`, and
+ * image attachment to `onAttachImage`, so this shell stays presentational.
+ */
+export function SendFeedbackDialog({
+  attachedImageUrl,
+  isPending,
+  onAttachImage,
+  onOpenChange,
+  onRemoveImage,
+  onSubmit,
+  open,
+}: {
+  /** Preview URL of the currently-attached image, or null when none. */
+  attachedImageUrl: string | null;
+  isPending: boolean;
+  /** Opens a file picker and uploads; the parent owns the resulting URL. */
+  onAttachImage: () => Promise<void>;
+  onOpenChange: (open: boolean) => void;
+  onRemoveImage: () => void;
+  onSubmit: (input: SendFeedbackInput) => Promise<void>;
+  open: boolean;
+}) {
+  const { burstEmoji } = useEmojiBurst();
+  const [category, setCategory] = React.useState<FeedbackCategoryId | null>(
+    null,
+  );
+  const [message, setMessage] = React.useState("");
+  const [includeLogs, setIncludeLogs] = React.useState(false);
+  const [isAttaching, setIsAttaching] = React.useState(false);
+  const [previewOpen, setPreviewOpen] = React.useState(false);
+  const [errorMessage, setErrorMessage] = React.useState<string | null>(null);
+
+  React.useEffect(() => {
+    if (!open) {
+      setCategory(null);
+      setMessage("");
+      setIncludeLogs(false);
+      setIsAttaching(false);
+      setPreviewOpen(false);
+      setErrorMessage(null);
+    }
+  }, [open]);
+
+  function selectCategory(next: FeedbackCategory, event: React.MouseEvent) {
+    const alreadySelected = category === next.id;
+    setCategory(alreadySelected ? null : next.id);
+    if (!alreadySelected && next.positive) {
+      const emoji =
+        HEART_BURST_EMOJIS[
+          Math.floor(Math.random() * HEART_BURST_EMOJIS.length)
+        ] ?? "❤️";
+      burstEmoji(emoji, event.currentTarget);
+    }
+  }
+
+  async function attachImage() {
+    if (isAttaching) {
+      return;
+    }
+    setErrorMessage(null);
+    setIsAttaching(true);
+    try {
+      await onAttachImage();
+    } catch (error) {
+      setErrorMessage(
+        error instanceof Error ? error.message : "Failed to attach image.",
+      );
+    } finally {
+      setIsAttaching(false);
+    }
+  }
+
+  async function submitFeedback() {
+    if (isPending || message.trim().length === 0) {
+      return;
+    }
+    setErrorMessage(null);
+    try {
+      await onSubmit({ category, includeLogs, message: message.trim() });
+      onOpenChange(false);
+    } catch (error) {
+      setErrorMessage(
+        error instanceof Error ? error.message : "Failed to send feedback.",
+      );
+    }
+  }
+
+  return (
+    <Dialog onOpenChange={onOpenChange} open={open}>
+      <DialogContent
+        aria-describedby={undefined}
+        className="max-w-xl gap-0 overflow-hidden border-0 px-6 pb-0 pt-6"
+        data-testid="send-feedback-dialog"
+        showCloseButton={false}
+      >
+        <DialogHeader className="space-y-0 pb-5">
+          <div className="flex items-center justify-between gap-4">
+            <DialogTitle>Send feedback</DialogTitle>
+            <DialogClose className="flex h-8 w-8 shrink-0 items-center justify-center rounded-md text-muted-foreground transition-colors duration-150 ease-out hover:bg-accent hover:text-accent-foreground focus:outline-hidden focus:ring-1 focus:ring-ring">
+              <X className="h-4 w-4" />
+              <span className="sr-only">Close</span>
+            </DialogClose>
+          </div>
+        </DialogHeader>
+
+        <form
+          className="flex flex-col"
+          onSubmit={(event) => {
+            event.preventDefault();
+            void submitFeedback();
+          }}
+        >
+          {/* Category pills — styled like DM recipient pills, single-select. */}
+          <div className="flex flex-wrap items-center gap-2 pb-4">
+            {FEEDBACK_CATEGORIES.map((entry) => {
+              const Icon = entry.icon;
+              const selected = category === entry.id;
+              return (
+                <button
+                  aria-label={entry.label}
+                  aria-pressed={selected}
+                  className={cn(
+                    "inline-flex items-center gap-2 rounded-full border py-1 pl-2.5 pr-3 text-xs transition-colors duration-150 ease-out focus-visible:outline-hidden focus-visible:ring-1 focus-visible:ring-ring disabled:cursor-not-allowed disabled:opacity-60",
+                    selected
+                      ? "border-primary bg-primary text-primary-foreground"
+                      : "border-border/80 bg-background/80 text-foreground hover:bg-muted/50",
+                  )}
+                  data-testid={`feedback-category-${entry.id}`}
+                  disabled={isPending}
+                  key={entry.id}
+                  onClick={(event) => selectCategory(entry, event)}
+                  type="button"
+                >
+                  <Icon className="h-3.5 w-3.5" />
+                  <span className="font-medium">{entry.label}</span>
+                </button>
+              );
+            })}
+          </div>
+
+          {/* Feedback box + optional image attachment, laid out horizontally. */}
+          <div className="flex items-stretch gap-3">
+            <Textarea
+              className="min-h-32 flex-1 resize-none"
+              data-testid="feedback-message"
+              disabled={isPending}
+              onChange={(event) => {
+                setMessage(event.target.value);
+                setErrorMessage(null);
+              }}
+              placeholder="Tell us what went wrong, or share general feedback."
+              value={message}
+            />
+
+            {attachedImageUrl ? (
+              <div className="group/attachment relative flex w-32 shrink-0 flex-col overflow-hidden rounded-lg border border-border/70 bg-muted/40">
+                <button
+                  aria-label="View attached image"
+                  className="flex flex-1 flex-col text-left focus-visible:outline-hidden focus-visible:ring-1 focus-visible:ring-ring"
+                  data-testid="feedback-attachment-thumb"
+                  onClick={() => setPreviewOpen(true)}
+                  type="button"
+                >
+                  <img
+                    alt="Attached"
+                    className="h-20 w-full object-cover"
+                    src={attachedImageUrl}
+                  />
+                  <span className="flex items-center gap-1 px-2 py-1.5 text-2xs font-medium text-muted-foreground">
+                    <ImageIcon
+                      aria-hidden="true"
+                      className="h-3 w-3 shrink-0"
+                    />
+                    <span className="truncate">Attached image</span>
+                  </span>
+                </button>
+                <button
+                  aria-label="Remove attachment"
+                  className="absolute right-1 top-1 flex h-5 w-5 items-center justify-center rounded-full bg-background/90 text-muted-foreground opacity-0 shadow transition-opacity duration-150 ease-out hover:text-foreground focus-visible:opacity-100 focus-visible:outline-hidden focus-visible:ring-1 focus-visible:ring-ring group-hover/attachment:opacity-100"
+                  data-testid="feedback-attachment-remove"
+                  disabled={isPending}
+                  onClick={onRemoveImage}
+                  type="button"
+                >
+                  <X className="h-3 w-3" />
+                </button>
+              </div>
+            ) : (
+              <button
+                aria-label="Attach image"
+                className="flex w-32 shrink-0 flex-col items-center justify-center gap-2 rounded-lg border border-dashed border-border/70 bg-muted/20 p-3 text-center text-2xs font-medium text-muted-foreground transition-colors duration-150 ease-out hover:border-muted-foreground/50 hover:text-foreground focus-visible:outline-hidden focus-visible:ring-1 focus-visible:ring-ring disabled:cursor-not-allowed disabled:opacity-60"
+                data-testid="feedback-attach-image"
+                disabled={isPending || isAttaching}
+                onClick={() => void attachImage()}
+                type="button"
+              >
+                <ImageIcon aria-hidden="true" className="h-5 w-5" />
+                {isAttaching ? "Attaching…" : "Attach image"}
+              </button>
+            )}
+          </div>
+
+          {/* Attach logs checkbox. */}
+          <label
+            className="mt-4 flex w-fit cursor-pointer items-center gap-2 text-sm text-muted-foreground"
+            htmlFor="feedback-include-logs"
+          >
+            <Checkbox
+              checked={includeLogs}
+              data-testid="feedback-include-logs"
+              disabled={isPending}
+              id="feedback-include-logs"
+              onCheckedChange={(checked) => setIncludeLogs(checked === true)}
+            />
+            <Paperclip aria-hidden="true" className="h-3.5 w-3.5" />
+            Attach logs
+          </label>
+
+          {errorMessage ? (
+            <p
+              className="mt-4 text-sm text-destructive"
+              data-testid="feedback-error"
+            >
+              {errorMessage}
+            </p>
+          ) : null}
+
+          <div className="flex items-center gap-3 py-4">
+            <div className="ml-auto flex items-center gap-2">
+              <Button
+                disabled={isPending}
+                onClick={() => onOpenChange(false)}
+                type="button"
+                variant="ghost"
+              >
+                Cancel
+              </Button>
+              <Button
+                data-testid="feedback-submit"
+                disabled={isPending || message.trim().length === 0}
+                type="submit"
+              >
+                {isPending ? "Sending…" : "Send feedback"}
+              </Button>
+            </div>
+          </div>
+        </form>
+      </DialogContent>
+
+      {/* Full-size attachment preview. */}
+      {attachedImageUrl ? (
+        <Dialog onOpenChange={setPreviewOpen} open={previewOpen}>
+          <DialogContent
+            aria-describedby={undefined}
+            className="max-w-4xl border-0 p-2"
+            data-testid="feedback-attachment-preview"
+          >
+            <DialogTitle className="sr-only">Attached image</DialogTitle>
+            <img
+              alt="Attached"
+              className="max-h-[80vh] w-full rounded-lg bg-black/40 object-contain"
+              src={attachedImageUrl}
+            />
+          </DialogContent>
+        </Dialog>
+      ) : null}
+    </Dialog>
+  );
+}
diff --git a/desktop/src/features/sidebar/ui/AppSidebar.tsx b/desktop/src/features/sidebar/ui/AppSidebar.tsx
index 3a9f54bca6..f2b354e30e 100644
--- a/desktop/src/features/sidebar/ui/AppSidebar.tsx
+++ b/desktop/src/features/sidebar/ui/AppSidebar.tsx
@@ -118,6 +118,7 @@ type AppSidebarProps = {
     templateId?: string;
   }) => Promise<void>;
   onOpenAddCommunity: () => void;
+  onSendFeedback: () => void;
   onHideDm: (channelId: string) => void;
   onMarkChannelUnread: (channelId: string) => void;
   onMarkChannelRead: (
@@ -189,6 +190,7 @@ export function AppSidebar({
   onCreateChannel,
   onCreateForum,
   onOpenAddCommunity,
+  onSendFeedback,
   onHideDm,
   onMarkChannelUnread,
   onMarkChannelRead,
@@ -836,6 +838,7 @@ export function AppSidebar({
                   onOpenAddCommunity={onOpenAddCommunity}
                   onOpenSettings={onSelectSettings}
                   onRemoveCommunity={onRemoveCommunity}
+                  onSendFeedback={onSendFeedback}
                   onSetPresenceStatus={onSetPresenceStatus}
                   onSetUserStatus={onSetUserStatus}
                   onClearUserStatus={onClearUserStatus}
diff --git a/desktop/src/features/sidebar/ui/SidebarProfileCard.tsx b/desktop/src/features/sidebar/ui/SidebarProfileCard.tsx
index ef0037d0d8..fa7d3222c4 100644
--- a/desktop/src/features/sidebar/ui/SidebarProfileCard.tsx
+++ b/desktop/src/features/sidebar/ui/SidebarProfileCard.tsx
@@ -21,6 +21,7 @@ type SidebarProfileCardProps = {
   onOpenAddCommunity: () => void;
   onOpenSettings: (section?: "profile" | "appearance") => void;
   onRemoveCommunity: (id: string) => void;
+  onSendFeedback: () => void;
   onSetPresenceStatus?: (status: PresenceStatus) => void;
   onSetUserStatus: (text: string, emoji: string) => void;
   onClearUserStatus: () => void;
@@ -42,6 +43,7 @@ export function SidebarProfileCard({
   onOpenAddCommunity,
   onOpenSettings,
   onRemoveCommunity,
+  onSendFeedback,
   onSetPresenceStatus,
   onSetUserStatus,
   onClearUserStatus,
@@ -145,6 +147,7 @@ export function SidebarProfileCard({
             isStatusPending={isPresencePending}
             onClearUserStatus={onClearUserStatus}
             onOpenSettings={onOpenSettings}
+            onSendFeedback={onSendFeedback}
             onSetStatus={onSetPresenceStatus ?? (() => {})}
             onSetUserStatus={onSetUserStatus}
             triggerContainerRef={profileCardRef}

From b7dbab1b1e8679da2059970dffcb4ca56abd46ba Mon Sep 17 00:00:00 2001
From: npub13fn4ahfnvaa2qwylvegdgeajqs0mph6v4qsw4jcqnw4mjh3hzh2quuucm5
 <8a675edd33677aa0389f6650d467b2041fb0df4ca820eacb009babb95e3715d4@sprout-oss.stage.blox.sqprod.co>
Date: Fri, 10 Jul 2026 19:03:40 +0100
Subject: [PATCH 02/16] fix(desktop): match feedback pills to New DM chip
 styling; drop logs paperclip

Signed-off-by: npub13fn4ahfnvaa2qwylvegdgeajqs0mph6v4qsw4jcqnw4mjh3hzh2quuucm5 <8a675edd33677aa0389f6650d467b2041fb0df4ca820eacb009babb95e3715d4@sprout-oss.stage.blox.sqprod.co>
---
 .../settings/ui/SendFeedbackDialog.tsx        | 33 +++++++++++++++----
 1 file changed, 27 insertions(+), 6 deletions(-)

diff --git a/desktop/src/features/settings/ui/SendFeedbackDialog.tsx b/desktop/src/features/settings/ui/SendFeedbackDialog.tsx
index 1f87c45c6d..5d2b8e4548 100644
--- a/desktop/src/features/settings/ui/SendFeedbackDialog.tsx
+++ b/desktop/src/features/settings/ui/SendFeedbackDialog.tsx
@@ -1,4 +1,4 @@
-import { Bug, ImageIcon, Paperclip, ThumbsUp, Wrench, X } from "lucide-react";
+import { Bug, ImageIcon, ThumbsUp, Wrench, X } from "lucide-react";
 import * as React from "react";
 
 import { cn } from "@/shared/lib/cn";
@@ -162,7 +162,13 @@ export function SendFeedbackDialog({
             void submitFeedback();
           }}
         >
-          {/* Category pills — styled like DM recipient pills, single-select. */}
+          {/*
+            Category pills — mirror the New DM recipient chips: the same
+            rounded-full silhouette with a circular icon slot on the left. When
+            a pill is selected, hovering swaps its icon for an X (the same
+            avatar→X affordance DM chips use to remove a recipient), signalling
+            that clicking deselects it.
+          */}
           <div className="flex flex-wrap items-center gap-2 pb-4">
             {FEEDBACK_CATEGORIES.map((entry) => {
               const Icon = entry.icon;
@@ -172,9 +178,9 @@ export function SendFeedbackDialog({
                   aria-label={entry.label}
                   aria-pressed={selected}
                   className={cn(
-                    "inline-flex items-center gap-2 rounded-full border py-1 pl-2.5 pr-3 text-xs transition-colors duration-150 ease-out focus-visible:outline-hidden focus-visible:ring-1 focus-visible:ring-ring disabled:cursor-not-allowed disabled:opacity-60",
+                    "group/feedback-pill inline-flex items-center gap-2 rounded-full border py-1 pl-1 pr-3 text-xs transition-colors duration-150 ease-out focus-visible:outline-hidden focus-visible:ring-1 focus-visible:ring-ring disabled:cursor-not-allowed disabled:opacity-60",
                     selected
-                      ? "border-primary bg-primary text-primary-foreground"
+                      ? "border-primary/60 bg-primary/10 text-foreground"
                       : "border-border/80 bg-background/80 text-foreground hover:bg-muted/50",
                   )}
                   data-testid={`feedback-category-${entry.id}`}
@@ -183,7 +189,23 @@ export function SendFeedbackDialog({
                   onClick={(event) => selectCategory(entry, event)}
                   type="button"
                 >
-                  <Icon className="h-3.5 w-3.5" />
+                  <span className="relative flex h-8 w-8 shrink-0 items-center justify-center">
+                    <span
+                      className={cn(
+                        "flex h-8 w-8 items-center justify-center rounded-full transition-colors duration-150 ease-out",
+                        selected
+                          ? "bg-primary/20 text-primary group-hover/feedback-pill:opacity-0 group-focus-visible/feedback-pill:opacity-0"
+                          : "bg-muted text-muted-foreground",
+                      )}
+                    >
+                      <Icon className="h-4 w-4" />
+                    </span>
+                    {selected ? (
+                      <span className="absolute inset-0 flex items-center justify-center rounded-full bg-primary text-primary-foreground opacity-0 transition-opacity duration-150 ease-out group-hover/feedback-pill:opacity-100 group-focus-visible/feedback-pill:opacity-100">
+                        <X aria-hidden="true" className="h-4 w-4" />
+                      </span>
+                    ) : null}
+                  </span>
                   <span className="font-medium">{entry.label}</span>
                 </button>
               );
@@ -264,7 +286,6 @@ export function SendFeedbackDialog({
               id="feedback-include-logs"
               onCheckedChange={(checked) => setIncludeLogs(checked === true)}
             />
-            <Paperclip aria-hidden="true" className="h-3.5 w-3.5" />
             Attach logs
           </label>
 

From 26e53bde08a295a27bf2cdb0b5052782835d2b93 Mon Sep 17 00:00:00 2001
From: npub13fn4ahfnvaa2qwylvegdgeajqs0mph6v4qsw4jcqnw4mjh3hzh2quuucm5
 <8a675edd33677aa0389f6650d467b2041fb0df4ca820eacb009babb95e3715d4@sprout-oss.stage.blox.sqprod.co>
Date: Sat, 11 Jul 2026 09:56:59 +0100
Subject: [PATCH 03/16] fix(desktop): drop icon from Send feedback profile menu
 item

Keep the Send feedback entry in the profile popover but render it as
text only (matching the Settings item), removing the MessageSquareText
icon.

Signed-off-by: npub13fn4ahfnvaa2qwylvegdgeajqs0mph6v4qsw4jcqnw4mjh3hzh2quuucm5 <8a675edd33677aa0389f6650d467b2041fb0df4ca820eacb009babb95e3715d4@sprout-oss.stage.blox.sqprod.co>
---
 desktop/src/features/profile/ui/ProfilePopover.tsx | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/desktop/src/features/profile/ui/ProfilePopover.tsx b/desktop/src/features/profile/ui/ProfilePopover.tsx
index d9f55a4392..5c048f1e8d 100644
--- a/desktop/src/features/profile/ui/ProfilePopover.tsx
+++ b/desktop/src/features/profile/ui/ProfilePopover.tsx
@@ -1,5 +1,5 @@
 import * as React from "react";
-import { ChevronRight, MessageSquareText, Smile } from "lucide-react";
+import { ChevronRight, Smile } from "lucide-react";
 
 import { Popover, PopoverContent, PopoverTrigger } from "@/shared/ui/popover";
 import { ProfileAvatar } from "@/features/profile/ui/ProfileAvatar";
@@ -274,7 +274,6 @@ export function ProfilePopover({
                 role="menuitem"
                 type="button"
               >
-                <MessageSquareText className="h-4 w-4 shrink-0 text-muted-foreground" />
                 <span className="flex-1">Send feedback</span>
               </button>
             ) : null}

From 8fb230dce826a3ae90dd0ddc8c6272ac22a50f9b Mon Sep 17 00:00:00 2001
From: npub13fn4ahfnvaa2qwylvegdgeajqs0mph6v4qsw4jcqnw4mjh3hzh2quuucm5
 <8a675edd33677aa0389f6650d467b2041fb0df4ca820eacb009babb95e3715d4@sprout-oss.stage.blox.sqprod.co>
Date: Sat, 11 Jul 2026 10:00:54 +0100
Subject: [PATCH 04/16] fix(desktop): match profile popover header to sidebar
 profile card

Use the MaskedAvatarBadgeFrame with an integrated presence badge on the
avatar (mirroring SidebarProfileCard) and drop the redundant 'Online'
status text row under the name. Re-point the presence e2e assertions to
the presence selector row, which still renders the status label.

Signed-off-by: npub13fn4ahfnvaa2qwylvegdgeajqs0mph6v4qsw4jcqnw4mjh3hzh2quuucm5 <8a675edd33677aa0389f6650d467b2041fb0df4ca820eacb009babb95e3715d4@sprout-oss.stage.blox.sqprod.co>
---
 .../features/profile/ui/ProfilePopover.tsx    | 33 +++++++++++++------
 desktop/tests/e2e/profile.spec.ts             |  6 ++--
 2 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/desktop/src/features/profile/ui/ProfilePopover.tsx b/desktop/src/features/profile/ui/ProfilePopover.tsx
index 5c048f1e8d..eda13af571 100644
--- a/desktop/src/features/profile/ui/ProfilePopover.tsx
+++ b/desktop/src/features/profile/ui/ProfilePopover.tsx
@@ -3,6 +3,10 @@ import { ChevronRight, Smile } from "lucide-react";
 
 import { Popover, PopoverContent, PopoverTrigger } from "@/shared/ui/popover";
 import { ProfileAvatar } from "@/features/profile/ui/ProfileAvatar";
+import {
+  MaskedAvatarBadgeFrame,
+  STATUS_DOT_MASK_CURVE,
+} from "@/features/profile/ui/MaskedAvatarBadgeFrame";
 import { PresenceDot } from "@/features/presence/ui/PresenceBadge";
 import { getPresenceLabel } from "@/features/presence/lib/presence";
 import { SetStatusDialog } from "@/features/user-status/ui/SetStatusDialog";
@@ -132,26 +136,35 @@ export function ProfilePopover({
           <div aria-label="Profile menu" role="menu">
             {/* ── Identity block ─────────────────────────────────── */}
             <div className="flex items-center gap-2 px-3 pt-2 pb-2">
-              <div className="relative shrink-0">
+              <MaskedAvatarBadgeFrame
+                badge={
+                  <span
+                    aria-label={getPresenceLabel(currentStatus)}
+                    className="flex h-3.5 w-3.5 items-center justify-center rounded-full"
+                    data-testid="profile-popover-current-status"
+                    role="img"
+                  >
+                    <PresenceDot className="h-2 w-2" status={currentStatus} />
+                  </span>
+                }
+                badgeBox={{ bottom: -2, height: 14, right: -2, width: 14 }}
+                className="h-8 w-8"
+                curve={STATUS_DOT_MASK_CURVE}
+                cutout={{ cx: 28, cy: 28, r: 7.5 }}
+                size={32}
+              >
                 <ProfileAvatar
                   avatarDataUrl={avatarDataUrl}
                   avatarUrl={avatarUrl}
-                  className="h-8 w-8 text-xs"
+                  className="h-full w-full text-xs"
                   iconClassName="h-4 w-4"
                   label={displayName}
                 />
-              </div>
+              </MaskedAvatarBadgeFrame>
               <div className="min-w-0 flex-1">
                 <p className="truncate text-sm font-semibold leading-tight text-popover-foreground">
                   {displayName}
                 </p>
-                <div
-                  className="inline-flex items-center gap-1.5 text-xs text-muted-foreground"
-                  data-testid="profile-popover-current-status"
-                >
-                  <PresenceDot status={currentStatus} />
-                  <span>{getPresenceLabel(currentStatus)}</span>
-                </div>
               </div>
             </div>
 
diff --git a/desktop/tests/e2e/profile.spec.ts b/desktop/tests/e2e/profile.spec.ts
index 783663ebe9..fb6cceb49e 100644
--- a/desktop/tests/e2e/profile.spec.ts
+++ b/desktop/tests/e2e/profile.spec.ts
@@ -628,21 +628,21 @@ test("updates presence from the profile menu", async ({ page }) => {
 
   await openProfileMenu(page);
   await expect(
-    page.getByTestId("profile-popover-current-status"),
+    page.getByTestId("profile-popover-presence-trigger"),
   ).toContainText("Online");
 
   await page.getByTestId("profile-popover-presence-trigger").click();
   await page.getByTestId("profile-popover-status-away").click();
   await openProfileMenu(page);
   await expect(
-    page.getByTestId("profile-popover-current-status"),
+    page.getByTestId("profile-popover-presence-trigger"),
   ).toContainText("Away");
 
   await page.getByTestId("profile-popover-presence-trigger").click();
   await page.getByTestId("profile-popover-status-offline").click();
   await openProfileMenu(page);
   await expect(
-    page.getByTestId("profile-popover-current-status"),
+    page.getByTestId("profile-popover-presence-trigger"),
   ).toContainText("Offline");
 });
 

From ad0f7372afa7ff71ba5f38d029fb6031c27f2c74 Mon Sep 17 00:00:00 2001
From: npub13fn4ahfnvaa2qwylvegdgeajqs0mph6v4qsw4jcqnw4mjh3hzh2quuucm5
 <8a675edd33677aa0389f6650d467b2041fb0df4ca820eacb009babb95e3715d4@sprout-oss.stage.blox.sqprod.co>
Date: Sat, 11 Jul 2026 10:12:01 +0100
Subject: [PATCH 05/16] fix(desktop): make profile presence a solid green chip
 (no dot)

Signed-off-by: npub13fn4ahfnvaa2qwylvegdgeajqs0mph6v4qsw4jcqnw4mjh3hzh2quuucm5 <8a675edd33677aa0389f6650d467b2041fb0df4ca820eacb009babb95e3715d4@sprout-oss.stage.blox.sqprod.co>
---
 desktop/src/features/presence/lib/presence.ts |  12 ++
 .../features/profile/ui/ProfilePopover.tsx    | 118 ++++++++++--------
 2 files changed, 76 insertions(+), 54 deletions(-)

diff --git a/desktop/src/features/presence/lib/presence.ts b/desktop/src/features/presence/lib/presence.ts
index e93fb3ed9f..b37dddf18c 100644
--- a/desktop/src/features/presence/lib/presence.ts
+++ b/desktop/src/features/presence/lib/presence.ts
@@ -57,3 +57,15 @@ export function getPresenceDotClassName(status: PresenceStatus) {
       return "bg-muted-foreground/35";
   }
 }
+
+// Chip styling for the presence pill (colored fill + matching text, no dot).
+export function getPresenceChipClassName(status: PresenceStatus) {
+  switch (status) {
+    case "online":
+      return "bg-emerald-500/15 text-emerald-600 dark:text-emerald-400";
+    case "away":
+      return "bg-amber-500/15 text-amber-600 dark:text-amber-400";
+    case "offline":
+      return "bg-muted-foreground/15 text-muted-foreground";
+  }
+}
diff --git a/desktop/src/features/profile/ui/ProfilePopover.tsx b/desktop/src/features/profile/ui/ProfilePopover.tsx
index eda13af571..2c4e6a33de 100644
--- a/desktop/src/features/profile/ui/ProfilePopover.tsx
+++ b/desktop/src/features/profile/ui/ProfilePopover.tsx
@@ -1,5 +1,5 @@
 import * as React from "react";
-import { ChevronRight, Smile } from "lucide-react";
+import { Smile } from "lucide-react";
 
 import { Popover, PopoverContent, PopoverTrigger } from "@/shared/ui/popover";
 import { ProfileAvatar } from "@/features/profile/ui/ProfileAvatar";
@@ -8,10 +8,14 @@ import {
   STATUS_DOT_MASK_CURVE,
 } from "@/features/profile/ui/MaskedAvatarBadgeFrame";
 import { PresenceDot } from "@/features/presence/ui/PresenceBadge";
-import { getPresenceLabel } from "@/features/presence/lib/presence";
+import {
+  getPresenceChipClassName,
+  getPresenceLabel,
+} from "@/features/presence/lib/presence";
 import { SetStatusDialog } from "@/features/user-status/ui/SetStatusDialog";
 import { StatusEmoji } from "@/features/user-status/ui/StatusEmoji";
 import type { PresenceStatus } from "@/shared/api/types";
+import { cn } from "@/shared/lib/cn";
 import { isMacPlatform } from "@/shared/lib/platform";
 
 interface ProfilePopoverProps {
@@ -165,6 +169,64 @@ export function ProfilePopover({
                 <p className="truncate text-sm font-semibold leading-tight text-popover-foreground">
                   {displayName}
                 </p>
+                {/* ── Presence chip (opens status chooser) ─────────── */}
+                <Popover
+                  onOpenChange={setPresenceMenuOpen}
+                  open={presenceMenuOpen}
+                >
+                  <PopoverTrigger asChild>
+                    <button
+                      aria-expanded={presenceMenuOpen}
+                      aria-haspopup="menu"
+                      className={cn(
+                        "-ml-1 mt-0.5 inline-flex max-w-full items-center rounded-full px-2 py-0.5 text-xs font-medium outline-hidden transition-opacity hover:opacity-80 focus:outline-none focus-visible:opacity-80 focus-visible:outline-none",
+                        getPresenceChipClassName(currentStatus),
+                      )}
+                      data-testid="profile-popover-presence-trigger"
+                      disabled={isStatusPending}
+                      onClick={() => {
+                        clearPresenceHoverTimer();
+                        setPresenceMenuOpen((prev) => !prev);
+                      }}
+                      onMouseEnter={() => schedulePresenceMenu(true)}
+                      onMouseLeave={() => schedulePresenceMenu(false)}
+                      role="menuitem"
+                      type="button"
+                    >
+                      <span className="truncate">
+                        {getPresenceLabel(currentStatus)}
+                      </span>
+                    </button>
+                  </PopoverTrigger>
+                  <PopoverContent
+                    align="start"
+                    className="w-52 p-1"
+                    onMouseEnter={() => schedulePresenceMenu(true)}
+                    onMouseLeave={() => schedulePresenceMenu(false)}
+                    side="bottom"
+                    sideOffset={4}
+                  >
+                    <div aria-label="Presence status" role="menu">
+                      {ALL_STATUSES.map((status) => (
+                        <button
+                          className={MENU_ITEM_CLASS}
+                          data-testid={`profile-popover-status-${status}`}
+                          disabled={isStatusPending}
+                          key={status}
+                          onClick={() => handlePresenceSelect(status)}
+                          role="menuitem"
+                          type="button"
+                        >
+                          <PresenceDot
+                            className="h-2.5 w-2.5"
+                            status={status}
+                          />
+                          <span>{getPresenceLabel(status)}</span>
+                        </button>
+                      ))}
+                    </div>
+                  </PopoverContent>
+                </Popover>
               </div>
             </div>
 
@@ -201,58 +263,6 @@ export function ProfilePopover({
               </button>
             </div>
 
-            {/* ── Presence ────────────────────────────────────────── */}
-            <Popover onOpenChange={setPresenceMenuOpen} open={presenceMenuOpen}>
-              <PopoverTrigger asChild>
-                <button
-                  aria-expanded={presenceMenuOpen}
-                  aria-haspopup="menu"
-                  className={MENU_ITEM_CLASS}
-                  data-testid="profile-popover-presence-trigger"
-                  disabled={isStatusPending}
-                  onClick={() => {
-                    clearPresenceHoverTimer();
-                    setPresenceMenuOpen((prev) => !prev);
-                  }}
-                  onMouseEnter={() => schedulePresenceMenu(true)}
-                  onMouseLeave={() => schedulePresenceMenu(false)}
-                  role="menuitem"
-                  type="button"
-                >
-                  <PresenceDot className="h-2.5 w-2.5" status={currentStatus} />
-                  <span className="flex-1">
-                    {getPresenceLabel(currentStatus)}
-                  </span>
-                  <ChevronRight className="h-4 w-4 text-muted-foreground" />
-                </button>
-              </PopoverTrigger>
-              <PopoverContent
-                align="start"
-                className="w-60 p-1"
-                onMouseEnter={() => schedulePresenceMenu(true)}
-                onMouseLeave={() => schedulePresenceMenu(false)}
-                side="right"
-                sideOffset={4}
-              >
-                <div aria-label="Presence status" role="menu">
-                  {ALL_STATUSES.map((status) => (
-                    <button
-                      className={MENU_ITEM_CLASS}
-                      data-testid={`profile-popover-status-${status}`}
-                      disabled={isStatusPending}
-                      key={status}
-                      onClick={() => handlePresenceSelect(status)}
-                      role="menuitem"
-                      type="button"
-                    >
-                      <PresenceDot className="h-2.5 w-2.5" status={status} />
-                      <span>{getPresenceLabel(status)}</span>
-                    </button>
-                  ))}
-                </div>
-              </PopoverContent>
-            </Popover>
-
             <hr className="my-1 h-px border-0 bg-border" />
 
             {/* ── Settings ───────────────────────────────────────── */}

From 52630bafc7db2ebae18dc44fad8592a1e774c566 Mon Sep 17 00:00:00 2001
From: npub13fn4ahfnvaa2qwylvegdgeajqs0mph6v4qsw4jcqnw4mjh3hzh2quuucm5
 <8a675edd33677aa0389f6650d467b2041fb0df4ca820eacb009babb95e3715d4@sprout-oss.stage.blox.sqprod.co>
Date: Sat, 11 Jul 2026 10:16:53 +0100
Subject: [PATCH 06/16] fix(desktop): presence chip rounded-lg, name-aligned,
 click-only chooser

Signed-off-by: npub13fn4ahfnvaa2qwylvegdgeajqs0mph6v4qsw4jcqnw4mjh3hzh2quuucm5 <8a675edd33677aa0389f6650d467b2041fb0df4ca820eacb009babb95e3715d4@sprout-oss.stage.blox.sqprod.co>
---
 .../features/profile/ui/ProfilePopover.tsx    | 37 +------------------
 1 file changed, 2 insertions(+), 35 deletions(-)

diff --git a/desktop/src/features/profile/ui/ProfilePopover.tsx b/desktop/src/features/profile/ui/ProfilePopover.tsx
index 2c4e6a33de..31d9252662 100644
--- a/desktop/src/features/profile/ui/ProfilePopover.tsx
+++ b/desktop/src/features/profile/ui/ProfilePopover.tsx
@@ -70,34 +70,9 @@ export function ProfilePopover({
 }: ProfilePopoverProps) {
   const [statusDialogOpen, setStatusDialogOpen] = React.useState(false);
   const [presenceMenuOpen, setPresenceMenuOpen] = React.useState(false);
-  const presenceHoverTimer = React.useRef<number | null>(null);
   const hasUserStatus = Boolean(userStatusText || userStatusEmoji);
   const settingsShortcutLabel = isMacPlatform() ? "⌘," : "Ctrl+,";
 
-  function clearPresenceHoverTimer() {
-    if (presenceHoverTimer.current !== null) {
-      window.clearTimeout(presenceHoverTimer.current);
-      presenceHoverTimer.current = null;
-    }
-  }
-
-  function schedulePresenceMenu(nextOpen: boolean) {
-    clearPresenceHoverTimer();
-    presenceHoverTimer.current = window.setTimeout(
-      () => setPresenceMenuOpen(nextOpen),
-      nextOpen ? 80 : 160,
-    );
-  }
-
-  React.useEffect(
-    () => () => {
-      if (presenceHoverTimer.current !== null) {
-        window.clearTimeout(presenceHoverTimer.current);
-      }
-    },
-    [],
-  );
-
   function handlePopoverOpenChange(nextOpen: boolean) {
     if (!nextOpen) {
       setPresenceMenuOpen(false);
@@ -106,7 +81,6 @@ export function ProfilePopover({
   }
 
   function closePopover() {
-    clearPresenceHoverTimer();
     setPresenceMenuOpen(false);
     onOpenChange(false);
   }
@@ -179,17 +153,12 @@ export function ProfilePopover({
                       aria-expanded={presenceMenuOpen}
                       aria-haspopup="menu"
                       className={cn(
-                        "-ml-1 mt-0.5 inline-flex max-w-full items-center rounded-full px-2 py-0.5 text-xs font-medium outline-hidden transition-opacity hover:opacity-80 focus:outline-none focus-visible:opacity-80 focus-visible:outline-none",
+                        "mt-0.5 inline-flex max-w-full items-center rounded-lg px-2 py-0.5 text-xs font-medium outline-hidden transition-opacity hover:opacity-80 focus:outline-none focus-visible:opacity-80 focus-visible:outline-none",
                         getPresenceChipClassName(currentStatus),
                       )}
                       data-testid="profile-popover-presence-trigger"
                       disabled={isStatusPending}
-                      onClick={() => {
-                        clearPresenceHoverTimer();
-                        setPresenceMenuOpen((prev) => !prev);
-                      }}
-                      onMouseEnter={() => schedulePresenceMenu(true)}
-                      onMouseLeave={() => schedulePresenceMenu(false)}
+                      onClick={() => setPresenceMenuOpen((prev) => !prev)}
                       role="menuitem"
                       type="button"
                     >
@@ -201,8 +170,6 @@ export function ProfilePopover({
                   <PopoverContent
                     align="start"
                     className="w-52 p-1"
-                    onMouseEnter={() => schedulePresenceMenu(true)}
-                    onMouseLeave={() => schedulePresenceMenu(false)}
                     side="bottom"
                     sideOffset={4}
                   >

From 79155b79128fc5bab89738a465c08dc3beda7eef Mon Sep 17 00:00:00 2001
From: npub13fn4ahfnvaa2qwylvegdgeajqs0mph6v4qsw4jcqnw4mjh3hzh2quuucm5
 <8a675edd33677aa0389f6650d467b2041fb0df4ca820eacb009babb95e3715d4@sprout-oss.stage.blox.sqprod.co>
Date: Sat, 11 Jul 2026 10:20:35 +0100
Subject: [PATCH 07/16] fix(desktop): use rounded-md for presence chip

Signed-off-by: npub13fn4ahfnvaa2qwylvegdgeajqs0mph6v4qsw4jcqnw4mjh3hzh2quuucm5 <8a675edd33677aa0389f6650d467b2041fb0df4ca820eacb009babb95e3715d4@sprout-oss.stage.blox.sqprod.co>
---
 desktop/src/features/profile/ui/ProfilePopover.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/desktop/src/features/profile/ui/ProfilePopover.tsx b/desktop/src/features/profile/ui/ProfilePopover.tsx
index 31d9252662..fc7361adc6 100644
--- a/desktop/src/features/profile/ui/ProfilePopover.tsx
+++ b/desktop/src/features/profile/ui/ProfilePopover.tsx
@@ -153,7 +153,7 @@ export function ProfilePopover({
                       aria-expanded={presenceMenuOpen}
                       aria-haspopup="menu"
                       className={cn(
-                        "mt-0.5 inline-flex max-w-full items-center rounded-lg px-2 py-0.5 text-xs font-medium outline-hidden transition-opacity hover:opacity-80 focus:outline-none focus-visible:opacity-80 focus-visible:outline-none",
+                        "mt-0.5 inline-flex max-w-full items-center rounded-md px-2 py-0.5 text-xs font-medium outline-hidden transition-opacity hover:opacity-80 focus:outline-none focus-visible:opacity-80 focus-visible:outline-none",
                         getPresenceChipClassName(currentStatus),
                       )}
                       data-testid="profile-popover-presence-trigger"

From 5cb331ad3fb9754124e1d5ae2c38e4c4b624f8fb Mon Sep 17 00:00:00 2001
From: npub13fn4ahfnvaa2qwylvegdgeajqs0mph6v4qsw4jcqnw4mjh3hzh2quuucm5
 <8a675edd33677aa0389f6650d467b2041fb0df4ca820eacb009babb95e3715d4@sprout-oss.stage.blox.sqprod.co>
Date: Sat, 11 Jul 2026 16:21:26 +0100
Subject: [PATCH 08/16] =?UTF-8?q?fix(desktop):=20address=20feedback=20moda?=
 =?UTF-8?q?l=20review=20=E2=80=94=20cache-safe=20channel=20create,=20image?=
 =?UTF-8?q?-type=20guard?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Use useCreateChannelMutation (setQueryData + invalidate) instead of raw
  createChannel so repeat sends reuse the cached Buzz feedback channel rather
  than creating duplicates.
- Guard attachImage to image/* files; surface a clear error for non-images.
- Dedup category labels: single FEEDBACK_CATEGORY_LABELS derived from the
  dialog category list, consumed by the hook.
- Presence chip: proper focus-visible ring (was opacity-only).
- Add findFeedbackChannel unit tests (match / miss / trim / dm-exclusion).

Signed-off-by: npub13fn4ahfnvaa2qwylvegdgeajqs0mph6v4qsw4jcqnw4mjh3hzh2quuucm5 <8a675edd33677aa0389f6650d467b2041fb0df4ca820eacb009babb95e3715d4@sprout-oss.stage.blox.sqprod.co>
---
 .../features/profile/ui/ProfilePopover.tsx    |  2 +-
 .../hooks/useSendFeedback.helpers.test.mjs    | 51 +++++++++++++++++++
 .../settings/hooks/useSendFeedback.ts         | 34 ++++++++-----
 .../settings/ui/SendFeedbackDialog.tsx        |  6 +++
 4 files changed, 79 insertions(+), 14 deletions(-)
 create mode 100644 desktop/src/features/settings/hooks/useSendFeedback.helpers.test.mjs

diff --git a/desktop/src/features/profile/ui/ProfilePopover.tsx b/desktop/src/features/profile/ui/ProfilePopover.tsx
index fc7361adc6..a09df14a89 100644
--- a/desktop/src/features/profile/ui/ProfilePopover.tsx
+++ b/desktop/src/features/profile/ui/ProfilePopover.tsx
@@ -153,7 +153,7 @@ export function ProfilePopover({
                       aria-expanded={presenceMenuOpen}
                       aria-haspopup="menu"
                       className={cn(
-                        "mt-0.5 inline-flex max-w-full items-center rounded-md px-2 py-0.5 text-xs font-medium outline-hidden transition-opacity hover:opacity-80 focus:outline-none focus-visible:opacity-80 focus-visible:outline-none",
+                        "mt-0.5 inline-flex max-w-full items-center rounded-md px-2 py-0.5 text-xs font-medium outline-hidden transition-opacity hover:opacity-80 focus-visible:opacity-80 focus-visible:outline-hidden focus-visible:ring-1 focus-visible:ring-ring",
                         getPresenceChipClassName(currentStatus),
                       )}
                       data-testid="profile-popover-presence-trigger"
diff --git a/desktop/src/features/settings/hooks/useSendFeedback.helpers.test.mjs b/desktop/src/features/settings/hooks/useSendFeedback.helpers.test.mjs
new file mode 100644
index 0000000000..ef8b5474aa
--- /dev/null
+++ b/desktop/src/features/settings/hooks/useSendFeedback.helpers.test.mjs
@@ -0,0 +1,51 @@
+import assert from "node:assert/strict";
+import test from "node:test";
+
+import {
+  FEEDBACK_CHANNEL_NAME,
+  findFeedbackChannel,
+} from "./useSendFeedback.ts";
+
+/** Minimal Channel-shaped fixture for the name/type match logic. */
+function channel(overrides) {
+  return {
+    id: "id",
+    name: "general",
+    channelType: "stream",
+    visibility: "public",
+    ...overrides,
+  };
+}
+
+test("findFeedbackChannel_returnsNullWhenUndefined", () => {
+  assert.equal(findFeedbackChannel(undefined), null);
+});
+
+test("findFeedbackChannel_returnsNullWhenNoMatch", () => {
+  assert.equal(
+    findFeedbackChannel([
+      channel({ name: "general" }),
+      channel({ name: "random" }),
+    ]),
+    null,
+  );
+});
+
+test("findFeedbackChannel_matchesByNameCaseInsensitively", () => {
+  const match = channel({ id: "fb", name: "buzz FEEDBACK" });
+  assert.equal(findFeedbackChannel([channel(), match]), match);
+});
+
+test("findFeedbackChannel_trimsSurroundingWhitespace", () => {
+  const match = channel({ id: "fb", name: `  ${FEEDBACK_CHANNEL_NAME}  ` });
+  assert.equal(findFeedbackChannel([match]), match);
+});
+
+test("findFeedbackChannel_excludesDmChannelsWithMatchingName", () => {
+  const dm = channel({
+    id: "dm",
+    name: FEEDBACK_CHANNEL_NAME,
+    channelType: "dm",
+  });
+  assert.equal(findFeedbackChannel([dm]), null);
+});
diff --git a/desktop/src/features/settings/hooks/useSendFeedback.ts b/desktop/src/features/settings/hooks/useSendFeedback.ts
index 0f84bfc962..cbb7ae30ab 100644
--- a/desktop/src/features/settings/hooks/useSendFeedback.ts
+++ b/desktop/src/features/settings/hooks/useSendFeedback.ts
@@ -2,12 +2,15 @@ import { getVersion } from "@tauri-apps/api/app";
 import { useMutation } from "@tanstack/react-query";
 import * as React from "react";
 
-import { useChannelsQuery } from "@/features/channels/hooks";
+import {
+  useChannelsQuery,
+  useCreateChannelMutation,
+} from "@/features/channels/hooks";
 import type { ImetaMedia } from "@/features/messages/lib/imetaMediaMarkdown";
 import { buildOutgoingMessage } from "@/features/messages/lib/imetaMediaMarkdown";
 import type { SendFeedbackInput } from "@/features/settings/ui/SendFeedbackDialog";
+import { FEEDBACK_CATEGORY_LABELS } from "@/features/settings/ui/SendFeedbackDialog";
 import {
-  createChannel,
   pickAndUploadMedia,
   sendChannelMessage,
   uploadMediaBytes,
@@ -17,13 +20,13 @@ import type { Channel } from "@/shared/api/types";
 /** Name of the private channel feedback is delivered to. */
 export const FEEDBACK_CHANNEL_NAME = "Buzz feedback";
 
-const CATEGORY_LABELS: Record<string, string> = {
-  bug: "Bug",
-  praise: "Praise",
-  "needs-work": "Needs work",
-};
-
-function findFeedbackChannel(channels: Channel[] | undefined): Channel | null {
+/**
+ * Resolves the private feedback channel from the channel list by name
+ * (case-insensitive), excluding DMs. Exported for unit testing.
+ */
+export function findFeedbackChannel(
+  channels: Channel[] | undefined,
+): Channel | null {
   if (!channels) {
     return null;
   }
@@ -69,6 +72,7 @@ async function collectDiagnostics(): Promise<string> {
  */
 export function useSendFeedback() {
   const channelsQuery = useChannelsQuery();
+  const createChannelMutation = useCreateChannelMutation();
   const [attachedImage, setAttachedImage] = React.useState<ImetaMedia | null>(
     null,
   );
@@ -76,9 +80,13 @@ export function useSendFeedback() {
   const attachImage = React.useCallback(async () => {
     const descriptors = await pickAndUploadMedia();
     const first = descriptors[0];
-    if (first) {
-      setAttachedImage(first);
+    if (!first) {
+      return;
+    }
+    if (!first.type.startsWith("image/")) {
+      throw new Error("Please choose an image file.");
     }
+    setAttachedImage(first);
   }, []);
 
   const removeImage = React.useCallback(() => {
@@ -94,7 +102,7 @@ export function useSendFeedback() {
       // Resolve or create the private feedback channel.
       let channel = findFeedbackChannel(channelsQuery.data);
       if (!channel) {
-        channel = await createChannel({
+        channel = await createChannelMutation.mutateAsync({
           name: FEEDBACK_CHANNEL_NAME,
           channelType: "stream",
           visibility: "private",
@@ -105,7 +113,7 @@ export function useSendFeedback() {
       const headerParts: string[] = [];
       if (input.category) {
         headerParts.push(
-          `**${CATEGORY_LABELS[input.category] ?? input.category}**`,
+          `**${FEEDBACK_CATEGORY_LABELS[input.category] ?? input.category}**`,
         );
       }
       const bodyLines = [headerParts.join(" "), input.message]
diff --git a/desktop/src/features/settings/ui/SendFeedbackDialog.tsx b/desktop/src/features/settings/ui/SendFeedbackDialog.tsx
index 5d2b8e4548..e8d91c1ecd 100644
--- a/desktop/src/features/settings/ui/SendFeedbackDialog.tsx
+++ b/desktop/src/features/settings/ui/SendFeedbackDialog.tsx
@@ -36,6 +36,12 @@ const FEEDBACK_CATEGORIES: readonly FeedbackCategory[] = [
   { id: "needs-work", label: "Needs work", icon: Wrench },
 ];
 
+/** Single source of truth for category id → user-facing label. */
+export const FEEDBACK_CATEGORY_LABELS: Record<FeedbackCategoryId, string> =
+  Object.fromEntries(
+    FEEDBACK_CATEGORIES.map((entry) => [entry.id, entry.label]),
+  ) as Record<FeedbackCategoryId, string>;
+
 export type SendFeedbackInput = {
   category: FeedbackCategoryId | null;
   includeLogs: boolean;

From 4f7600d6d35cdd66d4fb313a5b4efac1e90d7dc9 Mon Sep 17 00:00:00 2001
From: npub13fn4ahfnvaa2qwylvegdgeajqs0mph6v4qsw4jcqnw4mjh3hzh2quuucm5
 <8a675edd33677aa0389f6650d467b2041fb0df4ca820eacb009babb95e3715d4@sprout-oss.stage.blox.sqprod.co>
Date: Sat, 11 Jul 2026 17:19:51 +0100
Subject: [PATCH 09/16] fix(desktop): validate feedback image before upload;
 require private feedback channel

Addresses two P1 review findings on the Send feedback modal:

- Avoid uploading discarded/non-image files. The paperclip path
  (pick_and_upload_media) uploaded every selected file before the dialog
  could filter, so non-image or extra files reached the relay. Add an
  image-only Tauri command (pick_and_upload_image) that runs the existing
  TOCTOU-safe pipeline with an images_only gate, rejecting non-images
  (and videos) during MIME validation, before do_upload. attachImage now
  uses this single-file path.

- Keep feedback out of public channels. findFeedbackChannel matched any
  non-DM channel named 'Buzz feedback', which could route feedback to an
  open channel. Now require visibility === 'private' and membership before
  reusing a channel; a freshly created channel still qualifies.

Signed-off-by: npub13fn4ahfnvaa2qwylvegdgeajqs0mph6v4qsw4jcqnw4mjh3hzh2quuucm5 <8a675edd33677aa0389f6650d467b2041fb0df4ca820eacb009babb95e3715d4@sprout-oss.stage.blox.sqprod.co>
---
 desktop/src-tauri/src/commands/media.rs       | 55 ++++++++++++++++++-
 desktop/src-tauri/src/lib.rs                  |  1 +
 .../hooks/useSendFeedback.helpers.test.mjs    | 38 ++++++++++---
 .../settings/hooks/useSendFeedback.ts         | 26 ++++-----
 desktop/src/shared/api/tauriMedia.ts          | 12 +++-
 5 files changed, 109 insertions(+), 23 deletions(-)

diff --git a/desktop/src-tauri/src/commands/media.rs b/desktop/src-tauri/src/commands/media.rs
index 9d8a858227..9838d06855 100644
--- a/desktop/src-tauri/src/commands/media.rs
+++ b/desktop/src-tauri/src/commands/media.rs
@@ -300,9 +300,15 @@ pub async fn upload_media(
 
 /// Read a picked path through the TOCTOU-safe pipeline (fd pin → sniff →
 /// transcode-or-passthrough → MIME validation → upload).
+///
+/// When `images_only` is set, the file is rejected **before upload** if it is
+/// not an image (videos and non-image files error out; HEIC/HEIF still
+/// transcode to JPEG, which is an image). This keeps discarded/non-image
+/// files from ever leaving the client on image-only surfaces.
 async fn process_picked_path(
     path: std::path::PathBuf,
     state: &State<'_, AppState>,
+    images_only: bool,
 ) -> Result<BlobDescriptor, String> {
     // Pin the inode by opening the fd BEFORE spawn_blocking. This prevents a
     // local attacker from swapping the file between dialog return and read.
@@ -325,6 +331,9 @@ async fn process_picked_path(
             let n = file.read(&mut header).map_err(|e| e.to_string())?;
 
             if is_video_file(&header[..n]) {
+                if images_only {
+                    return Err("Please choose an image file.".to_string());
+                }
                 // ffmpeg needs a path, not an fd. Resolve the fd's real path
                 // so we pass the actual inode's location, not the original
                 // (potentially swapped) pathname. Same pattern as upload_media.
@@ -357,6 +366,12 @@ async fn process_picked_path(
 
     let mime = detect_and_validate_mime(&body)?;
 
+    // Image-only surfaces (e.g. "Send feedback"): reject anything that didn't
+    // sniff as an image, BEFORE the upload leaves the client.
+    if images_only && !mime.starts_with("image/") {
+        return Err("Please choose an image file.".to_string());
+    }
+
     // Upload video first, then poster (best-effort). If poster upload fails,
     // the video descriptor is returned without an image field.
     let mut descriptor = do_upload(body, &mime, state, None).await?;
@@ -414,13 +429,51 @@ pub async fn pick_and_upload_media(
     let mut descriptors = Vec::with_capacity(file_paths.len());
     for file_path in file_paths {
         let path = file_path.as_path().ok_or("invalid path")?.to_path_buf();
-        let descriptor = process_picked_path(path, &state).await?;
+        let descriptor = process_picked_path(path, &state, false).await?;
         descriptors.push(descriptor);
     }
 
     Ok(descriptors)
 }
 
+/// Open a native single-file dialog constrained to images, read the picked
+/// file, and upload it — rejecting anything that doesn't sniff as an image
+/// **before** the bytes leave the client.
+///
+/// This is the secure path for image-only surfaces (e.g. the "Send feedback"
+/// attachment). Unlike [`pick_and_upload_media`], the dialog is filtered to
+/// common image extensions and `process_picked_path` runs with
+/// `images_only = true`, so a user who bypasses the extension filter still
+/// can't upload a non-image (videos and other files error out during MIME
+/// validation, before `do_upload`). Returns `None` when the user cancels.
+#[tauri::command]
+pub async fn pick_and_upload_image(
+    app: tauri::AppHandle,
+    state: State<'_, AppState>,
+) -> Result<Option<BlobDescriptor>, String> {
+    use tauri_plugin_dialog::DialogExt;
+
+    let (tx, rx) = tokio::sync::oneshot::channel();
+    app.dialog()
+        .file()
+        .add_filter(
+            "Images",
+            &["png", "jpg", "jpeg", "gif", "webp", "heic", "heif", "bmp"],
+        )
+        .pick_file(move |path| {
+            let _ = tx.send(path);
+        });
+
+    let file_path = match rx.await.map_err(|_| "dialog cancelled".to_string())? {
+        Some(path) => path,
+        None => return Ok(None),
+    };
+
+    let path = file_path.as_path().ok_or("invalid path")?.to_path_buf();
+    let descriptor = process_picked_path(path, &state, true).await?;
+    Ok(Some(descriptor))
+}
+
 /// Upload raw bytes directly (for paste and drag-drop).
 ///
 /// The renderer already has the bytes in memory from the clipboard/drag event.
diff --git a/desktop/src-tauri/src/lib.rs b/desktop/src-tauri/src/lib.rs
index a9d37c5dc4..7dbea85c6d 100644
--- a/desktop/src-tauri/src/lib.rs
+++ b/desktop/src-tauri/src/lib.rs
@@ -776,6 +776,7 @@ pub fn run() {
             show_native_notification,
             upload_media,
             pick_and_upload_media,
+            pick_and_upload_image,
             upload_media_bytes,
             download_image,
             download_file,
diff --git a/desktop/src/features/settings/hooks/useSendFeedback.helpers.test.mjs b/desktop/src/features/settings/hooks/useSendFeedback.helpers.test.mjs
index ef8b5474aa..c1ce32e730 100644
--- a/desktop/src/features/settings/hooks/useSendFeedback.helpers.test.mjs
+++ b/desktop/src/features/settings/hooks/useSendFeedback.helpers.test.mjs
@@ -12,11 +12,23 @@ function channel(overrides) {
     id: "id",
     name: "general",
     channelType: "stream",
-    visibility: "public",
+    visibility: "open",
+    isMember: true,
     ...overrides,
   };
 }
 
+/** A private channel the user is a member of, named like the feedback channel. */
+function feedbackChannel(overrides) {
+  return channel({
+    id: "fb",
+    name: FEEDBACK_CHANNEL_NAME,
+    visibility: "private",
+    isMember: true,
+    ...overrides,
+  });
+}
+
 test("findFeedbackChannel_returnsNullWhenUndefined", () => {
   assert.equal(findFeedbackChannel(undefined), null);
 });
@@ -32,20 +44,30 @@ test("findFeedbackChannel_returnsNullWhenNoMatch", () => {
 });
 
 test("findFeedbackChannel_matchesByNameCaseInsensitively", () => {
-  const match = channel({ id: "fb", name: "buzz FEEDBACK" });
+  const match = feedbackChannel({ name: "buzz FEEDBACK" });
   assert.equal(findFeedbackChannel([channel(), match]), match);
 });
 
 test("findFeedbackChannel_trimsSurroundingWhitespace", () => {
-  const match = channel({ id: "fb", name: `  ${FEEDBACK_CHANNEL_NAME}  ` });
+  const match = feedbackChannel({ name: `  ${FEEDBACK_CHANNEL_NAME}  ` });
   assert.equal(findFeedbackChannel([match]), match);
 });
 
 test("findFeedbackChannel_excludesDmChannelsWithMatchingName", () => {
-  const dm = channel({
-    id: "dm",
-    name: FEEDBACK_CHANNEL_NAME,
-    channelType: "dm",
-  });
+  const dm = feedbackChannel({ id: "dm", channelType: "dm" });
   assert.equal(findFeedbackChannel([dm]), null);
 });
+
+test("findFeedbackChannel_excludesOpenChannelsWithMatchingName", () => {
+  // An open (public) channel sharing the name must NOT be reused — feedback
+  // would leak publicly. Only a private channel qualifies.
+  const open = feedbackChannel({ id: "open", visibility: "open" });
+  assert.equal(findFeedbackChannel([open]), null);
+});
+
+test("findFeedbackChannel_excludesNonMemberChannelsWithMatchingName", () => {
+  // A private channel the user is not a member of can't receive the message,
+  // and reusing it would be wrong — skip it and create a fresh one.
+  const notMember = feedbackChannel({ id: "nm", isMember: false });
+  assert.equal(findFeedbackChannel([notMember]), null);
+});
diff --git a/desktop/src/features/settings/hooks/useSendFeedback.ts b/desktop/src/features/settings/hooks/useSendFeedback.ts
index cbb7ae30ab..99274db51a 100644
--- a/desktop/src/features/settings/hooks/useSendFeedback.ts
+++ b/desktop/src/features/settings/hooks/useSendFeedback.ts
@@ -10,11 +10,8 @@ import type { ImetaMedia } from "@/features/messages/lib/imetaMediaMarkdown";
 import { buildOutgoingMessage } from "@/features/messages/lib/imetaMediaMarkdown";
 import type { SendFeedbackInput } from "@/features/settings/ui/SendFeedbackDialog";
 import { FEEDBACK_CATEGORY_LABELS } from "@/features/settings/ui/SendFeedbackDialog";
-import {
-  pickAndUploadMedia,
-  sendChannelMessage,
-  uploadMediaBytes,
-} from "@/shared/api/tauri";
+import { sendChannelMessage, uploadMediaBytes } from "@/shared/api/tauri";
+import { pickAndUploadImage } from "@/shared/api/tauriMedia";
 import type { Channel } from "@/shared/api/types";
 
 /** Name of the private channel feedback is delivered to. */
@@ -22,7 +19,9 @@ export const FEEDBACK_CHANNEL_NAME = "Buzz feedback";
 
 /**
  * Resolves the private feedback channel from the channel list by name
- * (case-insensitive), excluding DMs. Exported for unit testing.
+ * (case-insensitive). Requires a **private** channel the user is a member of
+ * and excludes DMs, so feedback is never posted to an open (public) channel
+ * that merely shares the name. Exported for unit testing.
  */
 export function findFeedbackChannel(
   channels: Channel[] | undefined,
@@ -34,6 +33,8 @@ export function findFeedbackChannel(
     channels.find(
       (channel) =>
         channel.channelType !== "dm" &&
+        channel.visibility === "private" &&
+        channel.isMember &&
         channel.name.trim().toLowerCase() ===
           FEEDBACK_CHANNEL_NAME.toLowerCase(),
     ) ?? null
@@ -78,15 +79,14 @@ export function useSendFeedback() {
   );
 
   const attachImage = React.useCallback(async () => {
-    const descriptors = await pickAndUploadMedia();
-    const first = descriptors[0];
-    if (!first) {
+    // The Rust `pick_and_upload_image` command validates the file is an image
+    // (via MIME sniffing) BEFORE upload, so discarded/non-image files never
+    // leave the client. Returns null when the user cancels the dialog.
+    const descriptor = await pickAndUploadImage();
+    if (!descriptor) {
       return;
     }
-    if (!first.type.startsWith("image/")) {
-      throw new Error("Please choose an image file.");
-    }
-    setAttachedImage(first);
+    setAttachedImage(descriptor);
   }, []);
 
   const removeImage = React.useCallback(() => {
diff --git a/desktop/src/shared/api/tauriMedia.ts b/desktop/src/shared/api/tauriMedia.ts
index 05d54a59f4..399781ef08 100644
--- a/desktop/src/shared/api/tauriMedia.ts
+++ b/desktop/src/shared/api/tauriMedia.ts
@@ -1,4 +1,14 @@
-import { invokeTauri } from "./tauri";
+import { type BlobDescriptor, invokeTauri } from "./tauri";
+
+/**
+ * Open a native single-file picker constrained to images and upload the
+ * chosen file. Non-image files are rejected in Rust (via MIME sniffing)
+ * before the bytes leave the client, so discarded/non-image selections never
+ * reach the relay. Resolves to `null` when the user cancels the dialog.
+ */
+export async function pickAndUploadImage(): Promise<BlobDescriptor | null> {
+  return invokeTauri<BlobDescriptor | null>("pick_and_upload_image", {});
+}
 
 /**
  * Fetch relay media bytes over IPC (Rust reqwest, WARP-tunneled).

From 9b7cb17750b303e58d45e8e6a17e29d2690b6c8c Mon Sep 17 00:00:00 2001
From: npub13fn4ahfnvaa2qwylvegdgeajqs0mph6v4qsw4jcqnw4mjh3hzh2quuucm5
 <8a675edd33677aa0389f6650d467b2041fb0df4ca820eacb009babb95e3715d4@sprout-oss.stage.blox.sqprod.co>
Date: Sat, 11 Jul 2026 18:16:26 +0100
Subject: [PATCH 10/16] fix(desktop): reuse only active private stream feedback
 channel; refetch before create

Addresses two P2 review findings on the Send feedback channel resolver:

- Restrict feedback reuse to active stream channels. findFeedbackChannel
  previously matched any non-DM private channel named 'Buzz feedback', so a
  private forum (feedback would file as forum posts) or an archived channel
  (relay rejects writes) could be reused. Now require channelType === 'stream'
  and archivedAt === null in addition to the private + membership checks.

- Refresh before creating the feedback channel. If the cached channel list is
  stale or still seeded from a cold-start snapshot, the resolver returned null
  and created a duplicate. Now refetch the channel list authoritatively and
  re-resolve before falling back to creation.

Added forum + archived unit-test cases; existing fixtures gain archivedAt.

Signed-off-by: npub13fn4ahfnvaa2qwylvegdgeajqs0mph6v4qsw4jcqnw4mjh3hzh2quuucm5 <8a675edd33677aa0389f6650d467b2041fb0df4ca820eacb009babb95e3715d4@sprout-oss.stage.blox.sqprod.co>
---
 .../hooks/useSendFeedback.helpers.test.mjs    | 18 ++++++++++++++++
 .../settings/hooks/useSendFeedback.ts         | 21 +++++++++++++++----
 2 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/desktop/src/features/settings/hooks/useSendFeedback.helpers.test.mjs b/desktop/src/features/settings/hooks/useSendFeedback.helpers.test.mjs
index c1ce32e730..4794eb6cf9 100644
--- a/desktop/src/features/settings/hooks/useSendFeedback.helpers.test.mjs
+++ b/desktop/src/features/settings/hooks/useSendFeedback.helpers.test.mjs
@@ -14,6 +14,7 @@ function channel(overrides) {
     channelType: "stream",
     visibility: "open",
     isMember: true,
+    archivedAt: null,
     ...overrides,
   };
 }
@@ -71,3 +72,20 @@ test("findFeedbackChannel_excludesNonMemberChannelsWithMatchingName", () => {
   const notMember = feedbackChannel({ id: "nm", isMember: false });
   assert.equal(findFeedbackChannel([notMember]), null);
 });
+
+test("findFeedbackChannel_excludesForumChannelsWithMatchingName", () => {
+  // A private forum sharing the name would file feedback as forum posts
+  // (hidden from the default stream view) — require a stream channel.
+  const forum = feedbackChannel({ id: "forum", channelType: "forum" });
+  assert.equal(findFeedbackChannel([forum]), null);
+});
+
+test("findFeedbackChannel_excludesArchivedChannelsWithMatchingName", () => {
+  // An archived channel rejects writes on the relay, so reusing it would make
+  // the send fail — skip it and create a fresh active channel.
+  const archived = feedbackChannel({
+    id: "arch",
+    archivedAt: "2026-01-01T00:00:00Z",
+  });
+  assert.equal(findFeedbackChannel([archived]), null);
+});
diff --git a/desktop/src/features/settings/hooks/useSendFeedback.ts b/desktop/src/features/settings/hooks/useSendFeedback.ts
index 99274db51a..9fd30ad3f1 100644
--- a/desktop/src/features/settings/hooks/useSendFeedback.ts
+++ b/desktop/src/features/settings/hooks/useSendFeedback.ts
@@ -19,9 +19,12 @@ export const FEEDBACK_CHANNEL_NAME = "Buzz feedback";
 
 /**
  * Resolves the private feedback channel from the channel list by name
- * (case-insensitive). Requires a **private** channel the user is a member of
- * and excludes DMs, so feedback is never posted to an open (public) channel
- * that merely shares the name. Exported for unit testing.
+ * (case-insensitive). Requires an **active private stream** channel the user
+ * is a member of: it must be a `stream` (not a DM or forum — a forum would
+ * file feedback as forum posts), non-archived (archived channels reject
+ * writes), private (never an open/public channel that merely shares the
+ * name), and one the user belongs to. Anything else falls through so the
+ * caller creates a fresh channel. Exported for unit testing.
  */
 export function findFeedbackChannel(
   channels: Channel[] | undefined,
@@ -32,8 +35,9 @@ export function findFeedbackChannel(
   return (
     channels.find(
       (channel) =>
-        channel.channelType !== "dm" &&
+        channel.channelType === "stream" &&
         channel.visibility === "private" &&
+        channel.archivedAt === null &&
         channel.isMember &&
         channel.name.trim().toLowerCase() ===
           FEEDBACK_CHANNEL_NAME.toLowerCase(),
@@ -101,6 +105,15 @@ export function useSendFeedback() {
     mutationFn: async (input: SendFeedbackInput) => {
       // Resolve or create the private feedback channel.
       let channel = findFeedbackChannel(channelsQuery.data);
+      if (!channel) {
+        // The cached list may be stale or still seeded from a cold-start
+        // snapshot — e.g. the initial fetch hasn't landed, or we were added to
+        // the feedback channel from another client. Refetch authoritatively
+        // before creating, so we don't spawn a duplicate of a channel that
+        // already exists server-side.
+        const refreshed = await channelsQuery.refetch();
+        channel = findFeedbackChannel(refreshed.data);
+      }
       if (!channel) {
         channel = await createChannelMutation.mutateAsync({
           name: FEEDBACK_CHANNEL_NAME,

From feaa951ab0796a37319f60a885d7e2393f1c3048 Mon Sep 17 00:00:00 2001
From: npub13fn4ahfnvaa2qwylvegdgeajqs0mph6v4qsw4jcqnw4mjh3hzh2quuucm5
 <8a675edd33677aa0389f6650d467b2041fb0df4ca820eacb009babb95e3715d4@sprout-oss.stage.blox.sqprod.co>
Date: Sat, 11 Jul 2026 19:39:47 +0100
Subject: [PATCH 11/16] fix(desktop): discard in-flight feedback image upload
 after dialog closes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Addresses a P2 review finding: if the user picks an image and then closes the
feedback dialog before pickAndUploadImage() resolves, the close handler's
reset() has already run, but the upload continuation would still repopulate
attachedImage — surfacing a stale image from a discarded draft the next time
the dialog opens (and sending it).

Guard the continuation with a session token: attachImage captures the current
sessionRef before its await and drops the resolved descriptor if reset()
bumped the token meanwhile. reset() increments the token so any in-flight
upload for the closed session is ignored.

Signed-off-by: npub13fn4ahfnvaa2qwylvegdgeajqs0mph6v4qsw4jcqnw4mjh3hzh2quuucm5 <8a675edd33677aa0389f6650d467b2041fb0df4ca820eacb009babb95e3715d4@sprout-oss.stage.blox.sqprod.co>
---
 .../src/features/settings/hooks/useSendFeedback.ts   | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/desktop/src/features/settings/hooks/useSendFeedback.ts b/desktop/src/features/settings/hooks/useSendFeedback.ts
index 9fd30ad3f1..3e0babce44 100644
--- a/desktop/src/features/settings/hooks/useSendFeedback.ts
+++ b/desktop/src/features/settings/hooks/useSendFeedback.ts
@@ -81,8 +81,14 @@ export function useSendFeedback() {
   const [attachedImage, setAttachedImage] = React.useState<ImetaMedia | null>(
     null,
   );
+  // Bumped on every reset/close. `attachImage` captures the current value
+  // before its (slow) upload await and drops the result if the token changed
+  // meanwhile — otherwise an upload that resolves after the dialog closed
+  // would repopulate a stale image into the next session's draft.
+  const sessionRef = React.useRef(0);
 
   const attachImage = React.useCallback(async () => {
+    const session = sessionRef.current;
     // The Rust `pick_and_upload_image` command validates the file is an image
     // (via MIME sniffing) BEFORE upload, so discarded/non-image files never
     // leave the client. Returns null when the user cancels the dialog.
@@ -90,6 +96,10 @@ export function useSendFeedback() {
     if (!descriptor) {
       return;
     }
+    // Dialog was reset/closed while the upload was in flight — discard.
+    if (sessionRef.current !== session) {
+      return;
+    }
     setAttachedImage(descriptor);
   }, []);
 
@@ -98,6 +108,8 @@ export function useSendFeedback() {
   }, []);
 
   const reset = React.useCallback(() => {
+    // Invalidate any in-flight attachImage continuation for this session.
+    sessionRef.current += 1;
     setAttachedImage(null);
   }, []);
 

From 378d390913d295ce5c5e42b8a1bb640e86be84aa Mon Sep 17 00:00:00 2001
From: npub13fn4ahfnvaa2qwylvegdgeajqs0mph6v4qsw4jcqnw4mjh3hzh2quuucm5
 <8a675edd33677aa0389f6650d467b2041fb0df4ca820eacb009babb95e3715d4@sprout-oss.stage.blox.sqprod.co>
Date: Sun, 12 Jul 2026 09:36:53 +0100
Subject: [PATCH 12/16] fix(desktop): wait for feedback image upload before
 send

Prevent both the submit handler and button from sending while an image attachment is still uploading. This keeps the selected image from being silently omitted if the user clicks Send feedback before the upload resolves.

Signed-off-by: npub13fn4ahfnvaa2qwylvegdgeajqs0mph6v4qsw4jcqnw4mjh3hzh2quuucm5 <8a675edd33677aa0389f6650d467b2041fb0df4ca820eacb009babb95e3715d4@sprout-oss.stage.blox.sqprod.co>
---
 desktop/src/features/settings/ui/SendFeedbackDialog.tsx | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/desktop/src/features/settings/ui/SendFeedbackDialog.tsx b/desktop/src/features/settings/ui/SendFeedbackDialog.tsx
index e8d91c1ecd..dfdd9f00f8 100644
--- a/desktop/src/features/settings/ui/SendFeedbackDialog.tsx
+++ b/desktop/src/features/settings/ui/SendFeedbackDialog.tsx
@@ -129,7 +129,7 @@ export function SendFeedbackDialog({
   }
 
   async function submitFeedback() {
-    if (isPending || message.trim().length === 0) {
+    if (isPending || isAttaching || message.trim().length === 0) {
       return;
     }
     setErrorMessage(null);
@@ -316,7 +316,9 @@ export function SendFeedbackDialog({
               </Button>
               <Button
                 data-testid="feedback-submit"
-                disabled={isPending || message.trim().length === 0}
+                disabled={
+                  isPending || isAttaching || message.trim().length === 0
+                }
                 type="submit"
               >
                 {isPending ? "Sending…" : "Send feedback"}

From 1aab2ae8baee5aed9afa6e10c4a0148b403f3283 Mon Sep 17 00:00:00 2001
From: npub13fn4ahfnvaa2qwylvegdgeajqs0mph6v4qsw4jcqnw4mjh3hzh2quuucm5
 <8a675edd33677aa0389f6650d467b2041fb0df4ca820eacb009babb95e3715d4@sprout-oss.stage.blox.sqprod.co>
Date: Mon, 13 Jul 2026 08:53:59 +0100
Subject: [PATCH 13/16] fix(desktop): require configured feedback destination

Signed-off-by: npub13fn4ahfnvaa2qwylvegdgeajqs0mph6v4qsw4jcqnw4mjh3hzh2quuucm5 <8a675edd33677aa0389f6650d467b2041fb0df4ca820eacb009babb95e3715d4@sprout-oss.stage.blox.sqprod.co>
---
 .env.example                                  | 15 +++
 desktop/src/app/AppShell.tsx                  | 31 +++---
 .../hooks/useSendFeedback.helpers.test.mjs    | 85 ++++++++--------
 .../settings/hooks/useSendFeedback.ts         | 96 +++++++++++--------
 .../settings/ui/SendFeedbackController.tsx    | 41 ++++++++
 .../settings/ui/SendFeedbackDialog.tsx        | 73 ++++++++++----
 .../src/features/sidebar/ui/AppSidebar.tsx    |  2 +-
 .../sidebar/ui/SidebarProfileCard.tsx         |  2 +-
 desktop/src/vite-env.d.ts                     |  8 ++
 desktop/tests/e2e/profile.spec.ts             | 11 +++
 10 files changed, 247 insertions(+), 117 deletions(-)
 create mode 100644 desktop/src/features/settings/ui/SendFeedbackController.tsx

diff --git a/.env.example b/.env.example
index 696d3a0617..eb43b62246 100644
--- a/.env.example
+++ b/.env.example
@@ -80,6 +80,21 @@ RELAY_URL=ws://localhost:3000
 # How often the reaper checks for expired ephemeral channels (default: 60s).
 # BUZZ_REAPER_INTERVAL_SECS=5
 
+# -----------------------------------------------------------------------------
+# Desktop feedback (optional build-time capability)
+# -----------------------------------------------------------------------------
+# The desktop "Send feedback" UI is omitted when this is unset. When set, the
+# value is bundled into the Vite build and treated as the exact destination on
+# the current relay. It is configuration, not a secret.
+#
+# A distributor enabling this must target a known relay and provision an active
+# private stream with this ID. Every intended sender and at least one monitored
+# support identity must be members. Buzz never creates a fallback channel and
+# never routes by channel name. A single build-time ID therefore only works for
+# binaries intended for one known relay; a future relay/workspace-advertised
+# capability is the durable approach for binaries used across arbitrary relays.
+# VITE_BUZZ_FEEDBACK_CHANNEL_ID=<private-channel-id>
+
 # -----------------------------------------------------------------------------
 # Logging / Tracing
 # -----------------------------------------------------------------------------
diff --git a/desktop/src/app/AppShell.tsx b/desktop/src/app/AppShell.tsx
index 7eff51ee05..bc1d55f2dd 100644
--- a/desktop/src/app/AppShell.tsx
+++ b/desktop/src/app/AppShell.tsx
@@ -55,8 +55,8 @@ import { useArchiveSync } from "@/features/local-archive/archiveSyncManager";
 import { useObserverArchiveSeed } from "@/features/local-archive/useObserverArchiveSeed";
 import { useAgentMetricArchiveSeed } from "@/features/local-archive/useAgentMetricArchiveSeed";
 import { useProfileQuery } from "@/features/profile/hooks";
-import { useSendFeedback } from "@/features/settings/hooks/useSendFeedback";
-import { SendFeedbackDialog } from "@/features/settings/ui/SendFeedbackDialog";
+import { FEEDBACK_ENABLED } from "@/features/settings/hooks/useSendFeedback";
+import { SendFeedbackController } from "@/features/settings/ui/SendFeedbackController";
 import {
   DEFAULT_SETTINGS_SECTION,
   type SettingsSection,
@@ -113,7 +113,6 @@ export function AppShell() {
     React.useState<BrowseDialogType>(null);
   const [isCreateChannelOpen, setIsCreateChannelOpen] = React.useState(false);
   const [isSendFeedbackOpen, setIsSendFeedbackOpen] = React.useState(false);
-  const sendFeedback = useSendFeedback();
   const [isHuddleDrawerOpen, setIsHuddleDrawerOpen] = React.useState(false);
   const mainInsetRef = React.useRef<HTMLElement>(null);
   const location = useLocation();
@@ -771,7 +770,11 @@ export function AppShell() {
                           onNewMessage={handleOpenNewDm}
                           onCreateChannelOpenChange={setIsCreateChannelOpen}
                           onOpenAddCommunity={() => setIsAddCommunityOpen(true)}
-                          onSendFeedback={() => setIsSendFeedbackOpen(true)}
+                          onSendFeedback={
+                            FEEDBACK_ENABLED
+                              ? () => setIsSendFeedbackOpen(true)
+                              : undefined
+                          }
                           onUpdateCommunity={communitiesHook.updateCommunity}
                           onRemoveCommunity={communitiesHook.removeCommunity}
                           onSwitchCommunity={handleSwitchCommunity}
@@ -929,20 +932,12 @@ export function AppShell() {
                         void goChannel(channelId);
                       }}
                     />
-                    <SendFeedbackDialog
-                      attachedImageUrl={sendFeedback.attachedImage?.url ?? null}
-                      isPending={sendFeedback.isPending}
-                      onAttachImage={sendFeedback.attachImage}
-                      onOpenChange={(open) => {
-                        setIsSendFeedbackOpen(open);
-                        if (!open) {
-                          sendFeedback.reset();
-                        }
-                      }}
-                      onRemoveImage={sendFeedback.removeImage}
-                      onSubmit={sendFeedback.submit}
-                      open={isSendFeedbackOpen}
-                    />
+                    {FEEDBACK_ENABLED ? (
+                      <SendFeedbackController
+                        onOpenChange={setIsSendFeedbackOpen}
+                        open={isSendFeedbackOpen}
+                      />
+                    ) : null}
                   </SidebarProvider>
                 </div>
 
diff --git a/desktop/src/features/settings/hooks/useSendFeedback.helpers.test.mjs b/desktop/src/features/settings/hooks/useSendFeedback.helpers.test.mjs
index 4794eb6cf9..29b5d66582 100644
--- a/desktop/src/features/settings/hooks/useSendFeedback.helpers.test.mjs
+++ b/desktop/src/features/settings/hooks/useSendFeedback.helpers.test.mjs
@@ -2,14 +2,16 @@ import assert from "node:assert/strict";
 import test from "node:test";
 
 import {
-  FEEDBACK_CHANNEL_NAME,
   findFeedbackChannel,
+  normalizeFeedbackChannelId,
 } from "./useSendFeedback.ts";
 
-/** Minimal Channel-shaped fixture for the name/type match logic. */
+const FEEDBACK_CHANNEL_ID = "configured-feedback-channel";
+
+/** Minimal Channel-shaped fixture for configured destination matching. */
 function channel(overrides) {
   return {
-    id: "id",
+    id: "other-channel",
     name: "general",
     channelType: "stream",
     visibility: "open",
@@ -19,73 +21,70 @@ function channel(overrides) {
   };
 }
 
-/** A private channel the user is a member of, named like the feedback channel. */
+/** An active private stream matching the configured channel ID. */
 function feedbackChannel(overrides) {
   return channel({
-    id: "fb",
-    name: FEEDBACK_CHANNEL_NAME,
+    id: FEEDBACK_CHANNEL_ID,
+    name: "Support inbox",
     visibility: "private",
     isMember: true,
     ...overrides,
   });
 }
 
-test("findFeedbackChannel_returnsNullWhenUndefined", () => {
-  assert.equal(findFeedbackChannel(undefined), null);
+test("normalizeFeedbackChannelId_returnsNullWhenUnsetOrBlank", () => {
+  assert.equal(normalizeFeedbackChannelId(undefined), null);
+  assert.equal(normalizeFeedbackChannelId(""), null);
+  assert.equal(normalizeFeedbackChannelId("   "), null);
 });
 
-test("findFeedbackChannel_returnsNullWhenNoMatch", () => {
+test("normalizeFeedbackChannelId_trimsConfiguredId", () => {
   assert.equal(
-    findFeedbackChannel([
-      channel({ name: "general" }),
-      channel({ name: "random" }),
-    ]),
-    null,
+    normalizeFeedbackChannelId(`  ${FEEDBACK_CHANNEL_ID}  `),
+    FEEDBACK_CHANNEL_ID,
   );
 });
 
-test("findFeedbackChannel_matchesByNameCaseInsensitively", () => {
-  const match = feedbackChannel({ name: "buzz FEEDBACK" });
-  assert.equal(findFeedbackChannel([channel(), match]), match);
+test("findFeedbackChannel_returnsNullWhenUndefined", () => {
+  assert.equal(findFeedbackChannel(undefined, FEEDBACK_CHANNEL_ID), null);
+});
+
+test("findFeedbackChannel_matchesExactConfiguredId", () => {
+  const match = feedbackChannel();
+  assert.equal(
+    findFeedbackChannel([channel(), match], FEEDBACK_CHANNEL_ID),
+    match,
+  );
 });
 
-test("findFeedbackChannel_trimsSurroundingWhitespace", () => {
-  const match = feedbackChannel({ name: `  ${FEEDBACK_CHANNEL_NAME}  ` });
-  assert.equal(findFeedbackChannel([match]), match);
+test("findFeedbackChannel_doesNotFallBackToName", () => {
+  const sameName = feedbackChannel({ id: "wrong-id" });
+  assert.equal(findFeedbackChannel([sameName], FEEDBACK_CHANNEL_ID), null);
 });
 
-test("findFeedbackChannel_excludesDmChannelsWithMatchingName", () => {
-  const dm = feedbackChannel({ id: "dm", channelType: "dm" });
-  assert.equal(findFeedbackChannel([dm]), null);
+test("findFeedbackChannel_excludesDmChannels", () => {
+  const dm = feedbackChannel({ channelType: "dm" });
+  assert.equal(findFeedbackChannel([dm], FEEDBACK_CHANNEL_ID), null);
 });
 
-test("findFeedbackChannel_excludesOpenChannelsWithMatchingName", () => {
-  // An open (public) channel sharing the name must NOT be reused — feedback
-  // would leak publicly. Only a private channel qualifies.
-  const open = feedbackChannel({ id: "open", visibility: "open" });
-  assert.equal(findFeedbackChannel([open]), null);
+test("findFeedbackChannel_excludesOpenChannels", () => {
+  const open = feedbackChannel({ visibility: "open" });
+  assert.equal(findFeedbackChannel([open], FEEDBACK_CHANNEL_ID), null);
 });
 
-test("findFeedbackChannel_excludesNonMemberChannelsWithMatchingName", () => {
-  // A private channel the user is not a member of can't receive the message,
-  // and reusing it would be wrong — skip it and create a fresh one.
-  const notMember = feedbackChannel({ id: "nm", isMember: false });
-  assert.equal(findFeedbackChannel([notMember]), null);
+test("findFeedbackChannel_excludesNonMemberChannels", () => {
+  const notMember = feedbackChannel({ isMember: false });
+  assert.equal(findFeedbackChannel([notMember], FEEDBACK_CHANNEL_ID), null);
 });
 
-test("findFeedbackChannel_excludesForumChannelsWithMatchingName", () => {
-  // A private forum sharing the name would file feedback as forum posts
-  // (hidden from the default stream view) — require a stream channel.
-  const forum = feedbackChannel({ id: "forum", channelType: "forum" });
-  assert.equal(findFeedbackChannel([forum]), null);
+test("findFeedbackChannel_excludesForumChannels", () => {
+  const forum = feedbackChannel({ channelType: "forum" });
+  assert.equal(findFeedbackChannel([forum], FEEDBACK_CHANNEL_ID), null);
 });
 
-test("findFeedbackChannel_excludesArchivedChannelsWithMatchingName", () => {
-  // An archived channel rejects writes on the relay, so reusing it would make
-  // the send fail — skip it and create a fresh active channel.
+test("findFeedbackChannel_excludesArchivedChannels", () => {
   const archived = feedbackChannel({
-    id: "arch",
     archivedAt: "2026-01-01T00:00:00Z",
   });
-  assert.equal(findFeedbackChannel([archived]), null);
+  assert.equal(findFeedbackChannel([archived], FEEDBACK_CHANNEL_ID), null);
 });
diff --git a/desktop/src/features/settings/hooks/useSendFeedback.ts b/desktop/src/features/settings/hooks/useSendFeedback.ts
index 3e0babce44..f141e0838c 100644
--- a/desktop/src/features/settings/hooks/useSendFeedback.ts
+++ b/desktop/src/features/settings/hooks/useSendFeedback.ts
@@ -2,32 +2,46 @@ import { getVersion } from "@tauri-apps/api/app";
 import { useMutation } from "@tanstack/react-query";
 import * as React from "react";
 
-import {
-  useChannelsQuery,
-  useCreateChannelMutation,
-} from "@/features/channels/hooks";
+import { useChannelsQuery } from "@/features/channels/hooks";
 import type { ImetaMedia } from "@/features/messages/lib/imetaMediaMarkdown";
 import { buildOutgoingMessage } from "@/features/messages/lib/imetaMediaMarkdown";
 import type { SendFeedbackInput } from "@/features/settings/ui/SendFeedbackDialog";
 import { FEEDBACK_CATEGORY_LABELS } from "@/features/settings/ui/SendFeedbackDialog";
+import { useWorkspaces } from "@/features/workspaces/useWorkspaces";
 import { sendChannelMessage, uploadMediaBytes } from "@/shared/api/tauri";
 import { pickAndUploadImage } from "@/shared/api/tauriMedia";
 import type { Channel } from "@/shared/api/types";
 
-/** Name of the private channel feedback is delivered to. */
-export const FEEDBACK_CHANNEL_NAME = "Buzz feedback";
+/** Returns a usable channel ID, or null when feedback is not configured. */
+export function normalizeFeedbackChannelId(
+  configuredId: string | undefined,
+): string | null {
+  const channelId = configuredId?.trim() ?? "";
+  return channelId.length > 0 ? channelId : null;
+}
 
 /**
- * Resolves the private feedback channel from the channel list by name
- * (case-insensitive). Requires an **active private stream** channel the user
- * is a member of: it must be a `stream` (not a DM or forum — a forum would
- * file feedback as forum posts), non-archived (archived channels reject
- * writes), private (never an open/public channel that merely shares the
- * name), and one the user belongs to. Anything else falls through so the
- * caller creates a fresh channel. Exported for unit testing.
+ * Build-time feedback destination. This is intentionally optional: default OSS
+ * builds do not claim to offer a monitored feedback path.
+ */
+export function getConfiguredFeedbackChannelId(): string | null {
+  return normalizeFeedbackChannelId(
+    import.meta.env?.VITE_BUZZ_FEEDBACK_CHANNEL_ID,
+  );
+}
+
+/** True when the optional feedback capability is enabled for this build. */
+export const FEEDBACK_ENABLED = getConfiguredFeedbackChannelId() !== null;
+
+/**
+ * Resolves the configured destination by exact channel ID. It must be an active
+ * private stream that the current user belongs to. No name matching or channel
+ * creation is allowed: distributors are responsible for provisioning a
+ * monitored inbox and its membership before enabling the feature.
  */
 export function findFeedbackChannel(
   channels: Channel[] | undefined,
+  configuredId: string,
 ): Channel | null {
   if (!channels) {
     return null;
@@ -35,18 +49,21 @@ export function findFeedbackChannel(
   return (
     channels.find(
       (channel) =>
+        channel.id === configuredId &&
         channel.channelType === "stream" &&
         channel.visibility === "private" &&
         channel.archivedAt === null &&
-        channel.isMember &&
-        channel.name.trim().toLowerCase() ===
-          FEEDBACK_CHANNEL_NAME.toLowerCase(),
+        channel.isMember,
     ) ?? null
   );
 }
 
+const FEEDBACK_CHANNEL_UNAVAILABLE_MESSAGE =
+  "Feedback is unavailable in this workspace. The configured feedback channel is missing, inaccessible, or not an active private stream. Ask your workspace administrator to verify the channel and your membership.";
+
 /**
- * Best-effort diagnostics text bundled when the user checks "Attach logs".
+ * Best-effort diagnostics text bundled when the user checks
+ * "Attach diagnostics".
  *
  * The desktop app has no on-disk log file yet (it logs to stderr), so this
  * captures the environment context that is available client-side. When a real
@@ -71,13 +88,16 @@ async function collectDiagnostics(): Promise<string> {
 }
 
 /**
- * Owns feedback delivery: resolves (or creates) the private "Buzz feedback"
- * channel, manages the optional image attachment, gathers a diagnostics bundle
- * when logs are requested, and posts the feedback message with imeta tags.
+ * Owns feedback delivery to the explicitly configured private channel, manages
+ * the optional image attachment, gathers a diagnostics bundle when requested,
+ * and posts the feedback message with imeta tags.
  */
 export function useSendFeedback() {
-  const channelsQuery = useChannelsQuery();
-  const createChannelMutation = useCreateChannelMutation();
+  const configuredChannelId = getConfiguredFeedbackChannelId();
+  const channelsQuery = useChannelsQuery({
+    enabled: configuredChannelId !== null,
+  });
+  const { activeWorkspace } = useWorkspaces();
   const [attachedImage, setAttachedImage] = React.useState<ImetaMedia | null>(
     null,
   );
@@ -115,24 +135,17 @@ export function useSendFeedback() {
 
   const submitMutation = useMutation({
     mutationFn: async (input: SendFeedbackInput) => {
-      // Resolve or create the private feedback channel.
-      let channel = findFeedbackChannel(channelsQuery.data);
-      if (!channel) {
-        // The cached list may be stale or still seeded from a cold-start
-        // snapshot — e.g. the initial fetch hasn't landed, or we were added to
-        // the feedback channel from another client. Refetch authoritatively
-        // before creating, so we don't spawn a duplicate of a channel that
-        // already exists server-side.
-        const refreshed = await channelsQuery.refetch();
-        channel = findFeedbackChannel(refreshed.data);
+      if (!configuredChannelId) {
+        throw new Error("Feedback is not configured for this build.");
       }
+
+      // Refetch authoritatively before every send. The configured destination
+      // may have been archived or the user's membership may have changed since
+      // the sidebar cache was populated.
+      const refreshed = await channelsQuery.refetch();
+      const channel = findFeedbackChannel(refreshed.data, configuredChannelId);
       if (!channel) {
-        channel = await createChannelMutation.mutateAsync({
-          name: FEEDBACK_CHANNEL_NAME,
-          channelType: "stream",
-          visibility: "private",
-          description: "In-app feedback and bug reports.",
-        });
+        throw new Error(FEEDBACK_CHANNEL_UNAVAILABLE_MESSAGE);
       }
 
       const headerParts: string[] = [];
@@ -174,6 +187,13 @@ export function useSendFeedback() {
   return {
     attachImage,
     attachedImage,
+    destinationChannelId: configuredChannelId,
+    destinationChannelName: configuredChannelId
+      ? (findFeedbackChannel(channelsQuery.data, configuredChannelId)?.name ??
+        null)
+      : null,
+    destinationRelayUrl: activeWorkspace?.relayUrl ?? "the current relay",
+    destinationWorkspaceName: activeWorkspace?.name ?? "this workspace",
     isPending: submitMutation.isPending,
     removeImage,
     reset,
diff --git a/desktop/src/features/settings/ui/SendFeedbackController.tsx b/desktop/src/features/settings/ui/SendFeedbackController.tsx
new file mode 100644
index 0000000000..a557a24fe5
--- /dev/null
+++ b/desktop/src/features/settings/ui/SendFeedbackController.tsx
@@ -0,0 +1,41 @@
+import { useSendFeedback } from "@/features/settings/hooks/useSendFeedback";
+import { SendFeedbackDialog } from "@/features/settings/ui/SendFeedbackDialog";
+
+/**
+ * Kept behind the build-time feedback gate in AppShell so default OSS builds
+ * neither render the UI nor start a second channels query for a capability they
+ * do not offer.
+ */
+export function SendFeedbackController({
+  onOpenChange,
+  open,
+}: {
+  onOpenChange: (open: boolean) => void;
+  open: boolean;
+}) {
+  const sendFeedback = useSendFeedback();
+  if (!sendFeedback.destinationChannelId) {
+    return null;
+  }
+
+  return (
+    <SendFeedbackDialog
+      attachedImageUrl={sendFeedback.attachedImage?.url ?? null}
+      destinationChannelId={sendFeedback.destinationChannelId}
+      destinationChannelName={sendFeedback.destinationChannelName}
+      destinationRelayUrl={sendFeedback.destinationRelayUrl}
+      destinationWorkspaceName={sendFeedback.destinationWorkspaceName}
+      isPending={sendFeedback.isPending}
+      onAttachImage={sendFeedback.attachImage}
+      onOpenChange={(nextOpen) => {
+        onOpenChange(nextOpen);
+        if (!nextOpen) {
+          sendFeedback.reset();
+        }
+      }}
+      onRemoveImage={sendFeedback.removeImage}
+      onSubmit={sendFeedback.submit}
+      open={open}
+    />
+  );
+}
diff --git a/desktop/src/features/settings/ui/SendFeedbackDialog.tsx b/desktop/src/features/settings/ui/SendFeedbackDialog.tsx
index dfdd9f00f8..a0874e618b 100644
--- a/desktop/src/features/settings/ui/SendFeedbackDialog.tsx
+++ b/desktop/src/features/settings/ui/SendFeedbackDialog.tsx
@@ -53,14 +53,19 @@ export type SendFeedbackInput = {
  *
  * Layout mirrors {@link NewDirectMessageDialog}: a pill row (here, selectable
  * feedback categories in place of profile pills), a generic feedback box with an
- * optional image attachment shown horizontally beside it, and an "Attach logs"
- * checkbox. Selecting a positive category fires the heart-burst emitter.
+ * optional image attachment shown horizontally beside it, and an "Attach
+ * diagnostics" checkbox. Selecting a positive category fires the heart-burst
+ * emitter.
  *
  * Delivery (channel resolution, upload, send) is delegated to `onSubmit`, and
  * image attachment to `onAttachImage`, so this shell stays presentational.
  */
 export function SendFeedbackDialog({
   attachedImageUrl,
+  destinationChannelId,
+  destinationChannelName,
+  destinationRelayUrl,
+  destinationWorkspaceName,
   isPending,
   onAttachImage,
   onOpenChange,
@@ -70,6 +75,14 @@ export function SendFeedbackDialog({
 }: {
   /** Preview URL of the currently-attached image, or null when none. */
   attachedImageUrl: string | null;
+  /** Build-configured private destination channel ID. */
+  destinationChannelId: string;
+  /** Resolved channel name, when the current workspace exposes it. */
+  destinationChannelName: string | null;
+  /** Current relay URL disclosed to the sender. */
+  destinationRelayUrl: string;
+  /** Current workspace/operator label disclosed to the sender. */
+  destinationWorkspaceName: string;
   isPending: boolean;
   /** Opens a file picker and uploads; the parent owns the resulting URL. */
   onAttachImage: () => Promise<void>;
@@ -159,6 +172,28 @@ export function SendFeedbackDialog({
               <span className="sr-only">Close</span>
             </DialogClose>
           </div>
+          <p
+            className="pt-2 text-sm text-muted-foreground"
+            data-testid="feedback-destination-disclosure"
+          >
+            This report goes to the private{" "}
+            <span className="font-medium text-foreground">
+              {destinationChannelName
+                ? `#${destinationChannelName}`
+                : `feedback channel ${destinationChannelId}`}
+            </span>{" "}
+            in{" "}
+            <span className="font-medium text-foreground">
+              {destinationWorkspaceName}
+            </span>{" "}
+            via{" "}
+            <span className="font-medium text-foreground">
+              {destinationRelayUrl}
+            </span>
+            . Attaching an image uploads it immediately to that relay. If you
+            send this report, the image and any diagnostics are shared in the
+            same channel.
+          </p>
         </DialogHeader>
 
         <form
@@ -280,20 +315,26 @@ export function SendFeedbackDialog({
             )}
           </div>
 
-          {/* Attach logs checkbox. */}
-          <label
-            className="mt-4 flex w-fit cursor-pointer items-center gap-2 text-sm text-muted-foreground"
-            htmlFor="feedback-include-logs"
-          >
-            <Checkbox
-              checked={includeLogs}
-              data-testid="feedback-include-logs"
-              disabled={isPending}
-              id="feedback-include-logs"
-              onCheckedChange={(checked) => setIncludeLogs(checked === true)}
-            />
-            Attach logs
-          </label>
+          {/* Optional environment diagnostics attachment. */}
+          <div className="mt-4 space-y-1.5">
+            <label
+              className="flex w-fit cursor-pointer items-center gap-2 text-sm text-muted-foreground"
+              htmlFor="feedback-include-logs"
+            >
+              <Checkbox
+                checked={includeLogs}
+                data-testid="feedback-include-logs"
+                disabled={isPending}
+                id="feedback-include-logs"
+                onCheckedChange={(checked) => setIncludeLogs(checked === true)}
+              />
+              Attach diagnostics
+            </label>
+            <p className="pl-6 text-xs text-muted-foreground">
+              Includes capture time, app version, platform, user agent, and
+              language. No application log lines are collected.
+            </p>
+          </div>
 
           {errorMessage ? (
             <p
diff --git a/desktop/src/features/sidebar/ui/AppSidebar.tsx b/desktop/src/features/sidebar/ui/AppSidebar.tsx
index f2b354e30e..a7eec90623 100644
--- a/desktop/src/features/sidebar/ui/AppSidebar.tsx
+++ b/desktop/src/features/sidebar/ui/AppSidebar.tsx
@@ -118,7 +118,7 @@ type AppSidebarProps = {
     templateId?: string;
   }) => Promise<void>;
   onOpenAddCommunity: () => void;
-  onSendFeedback: () => void;
+  onSendFeedback?: () => void;
   onHideDm: (channelId: string) => void;
   onMarkChannelUnread: (channelId: string) => void;
   onMarkChannelRead: (
diff --git a/desktop/src/features/sidebar/ui/SidebarProfileCard.tsx b/desktop/src/features/sidebar/ui/SidebarProfileCard.tsx
index fa7d3222c4..a7302c48af 100644
--- a/desktop/src/features/sidebar/ui/SidebarProfileCard.tsx
+++ b/desktop/src/features/sidebar/ui/SidebarProfileCard.tsx
@@ -21,7 +21,7 @@ type SidebarProfileCardProps = {
   onOpenAddCommunity: () => void;
   onOpenSettings: (section?: "profile" | "appearance") => void;
   onRemoveCommunity: (id: string) => void;
-  onSendFeedback: () => void;
+  onSendFeedback?: () => void;
   onSetPresenceStatus?: (status: PresenceStatus) => void;
   onSetUserStatus: (text: string, emoji: string) => void;
   onClearUserStatus: () => void;
diff --git a/desktop/src/vite-env.d.ts b/desktop/src/vite-env.d.ts
index 11f02fe2a0..a202889f88 100644
--- a/desktop/src/vite-env.d.ts
+++ b/desktop/src/vite-env.d.ts
@@ -1 +1,9 @@
 /// <reference types="vite/client" />
+
+interface ImportMetaEnv {
+  readonly VITE_BUZZ_FEEDBACK_CHANNEL_ID?: string;
+}
+
+interface ImportMeta {
+  readonly env: ImportMetaEnv;
+}
diff --git a/desktop/tests/e2e/profile.spec.ts b/desktop/tests/e2e/profile.spec.ts
index fb6cceb49e..332eece18e 100644
--- a/desktop/tests/e2e/profile.spec.ts
+++ b/desktop/tests/e2e/profile.spec.ts
@@ -623,6 +623,17 @@ test("snaps custom avatar colors to the dot grid", async ({ page }) => {
   await expect(page.getByTestId("profile-avatar-done")).toBeVisible();
 });
 
+test("hides Send feedback when no destination is configured", async ({
+  page,
+}) => {
+  await page.goto("/");
+
+  await openProfileMenu(page);
+  await expect(page.getByTestId("profile-popover-send-feedback")).toHaveCount(
+    0,
+  );
+});
+
 test("updates presence from the profile menu", async ({ page }) => {
   await page.goto("/");
 

From d70f3ed346a2a04196dbeace85db424514950a2c Mon Sep 17 00:00:00 2001
From: Wes <wesbillman@users.noreply.github.com>
Date: Tue, 14 Jul 2026 14:18:19 -0600
Subject: [PATCH 14/16] Refactor feedback delivery to product inbox

Publish feedback as dedicated kind 42000 events so the relay can persist it
outside channel timelines and operators can review it deployment-wide.

Co-authored-by: Pinky <44b8e82baa6e0e254e0208d68f335c283c94e7b78dd1fa10d5a49d3f13dd0435@sprout-oss.stage.blox.sqprod.co>
Signed-off-by: Wes <wesbillman@users.noreply.github.com>
---
 .env.example                                  |  15 --
 desktop/src/app/AppShell.tsx                  |  17 +-
 .../hooks/useSendFeedback.helpers.test.mjs    | 102 +++--------
 .../settings/hooks/useSendFeedback.ts         | 165 ++++--------------
 .../settings/ui/SendFeedbackController.tsx    |  17 +-
 .../settings/ui/SendFeedbackDialog.tsx        |  35 +---
 .../src/features/sidebar/ui/AppSidebar.tsx    |   2 +-
 .../sidebar/ui/SidebarProfileCard.tsx         |   2 +-
 desktop/src/shared/constants/kinds.ts         |   1 +
 desktop/src/vite-env.d.ts                     |   8 -
 desktop/tests/e2e/profile.spec.ts             |  11 +-
 11 files changed, 79 insertions(+), 296 deletions(-)

diff --git a/.env.example b/.env.example
index eb43b62246..696d3a0617 100644
--- a/.env.example
+++ b/.env.example
@@ -80,21 +80,6 @@ RELAY_URL=ws://localhost:3000
 # How often the reaper checks for expired ephemeral channels (default: 60s).
 # BUZZ_REAPER_INTERVAL_SECS=5
 
-# -----------------------------------------------------------------------------
-# Desktop feedback (optional build-time capability)
-# -----------------------------------------------------------------------------
-# The desktop "Send feedback" UI is omitted when this is unset. When set, the
-# value is bundled into the Vite build and treated as the exact destination on
-# the current relay. It is configuration, not a secret.
-#
-# A distributor enabling this must target a known relay and provision an active
-# private stream with this ID. Every intended sender and at least one monitored
-# support identity must be members. Buzz never creates a fallback channel and
-# never routes by channel name. A single build-time ID therefore only works for
-# binaries intended for one known relay; a future relay/workspace-advertised
-# capability is the durable approach for binaries used across arbitrary relays.
-# VITE_BUZZ_FEEDBACK_CHANNEL_ID=<private-channel-id>
-
 # -----------------------------------------------------------------------------
 # Logging / Tracing
 # -----------------------------------------------------------------------------
diff --git a/desktop/src/app/AppShell.tsx b/desktop/src/app/AppShell.tsx
index bc1d55f2dd..08cf94a4c6 100644
--- a/desktop/src/app/AppShell.tsx
+++ b/desktop/src/app/AppShell.tsx
@@ -55,7 +55,6 @@ import { useArchiveSync } from "@/features/local-archive/archiveSyncManager";
 import { useObserverArchiveSeed } from "@/features/local-archive/useObserverArchiveSeed";
 import { useAgentMetricArchiveSeed } from "@/features/local-archive/useAgentMetricArchiveSeed";
 import { useProfileQuery } from "@/features/profile/hooks";
-import { FEEDBACK_ENABLED } from "@/features/settings/hooks/useSendFeedback";
 import { SendFeedbackController } from "@/features/settings/ui/SendFeedbackController";
 import {
   DEFAULT_SETTINGS_SECTION,
@@ -770,11 +769,7 @@ export function AppShell() {
                           onNewMessage={handleOpenNewDm}
                           onCreateChannelOpenChange={setIsCreateChannelOpen}
                           onOpenAddCommunity={() => setIsAddCommunityOpen(true)}
-                          onSendFeedback={
-                            FEEDBACK_ENABLED
-                              ? () => setIsSendFeedbackOpen(true)
-                              : undefined
-                          }
+                          onSendFeedback={() => setIsSendFeedbackOpen(true)}
                           onUpdateCommunity={communitiesHook.updateCommunity}
                           onRemoveCommunity={communitiesHook.removeCommunity}
                           onSwitchCommunity={handleSwitchCommunity}
@@ -932,12 +927,10 @@ export function AppShell() {
                         void goChannel(channelId);
                       }}
                     />
-                    {FEEDBACK_ENABLED ? (
-                      <SendFeedbackController
-                        onOpenChange={setIsSendFeedbackOpen}
-                        open={isSendFeedbackOpen}
-                      />
-                    ) : null}
+                    <SendFeedbackController
+                      onOpenChange={setIsSendFeedbackOpen}
+                      open={isSendFeedbackOpen}
+                    />
                   </SidebarProvider>
                 </div>
 
diff --git a/desktop/src/features/settings/hooks/useSendFeedback.helpers.test.mjs b/desktop/src/features/settings/hooks/useSendFeedback.helpers.test.mjs
index 29b5d66582..2dee013368 100644
--- a/desktop/src/features/settings/hooks/useSendFeedback.helpers.test.mjs
+++ b/desktop/src/features/settings/hooks/useSendFeedback.helpers.test.mjs
@@ -1,90 +1,34 @@
 import assert from "node:assert/strict";
 import test from "node:test";
 
-import {
-  findFeedbackChannel,
-  normalizeFeedbackChannelId,
-} from "./useSendFeedback.ts";
+import { buildProductFeedbackEvent } from "./useSendFeedback.ts";
 
-const FEEDBACK_CHANNEL_ID = "configured-feedback-channel";
-
-/** Minimal Channel-shaped fixture for configured destination matching. */
-function channel(overrides) {
-  return {
-    id: "other-channel",
-    name: "general",
-    channelType: "stream",
-    visibility: "open",
-    isMember: true,
-    archivedAt: null,
-    ...overrides,
-  };
-}
-
-/** An active private stream matching the configured channel ID. */
-function feedbackChannel(overrides) {
-  return channel({
-    id: FEEDBACK_CHANNEL_ID,
-    name: "Support inbox",
-    visibility: "private",
-    isMember: true,
-    ...overrides,
-  });
-}
-
-test("normalizeFeedbackChannelId_returnsNullWhenUnsetOrBlank", () => {
-  assert.equal(normalizeFeedbackChannelId(undefined), null);
-  assert.equal(normalizeFeedbackChannelId(""), null);
-  assert.equal(normalizeFeedbackChannelId("   "), null);
+test("buildProductFeedbackEvent uses body and category tag", () => {
+  assert.deepEqual(
+    buildProductFeedbackEvent({ category: "bug", message: "  It broke  " }, []),
+    { content: "It broke", tags: [["category", "bug"]] },
+  );
 });
 
-test("normalizeFeedbackChannelId_trimsConfiguredId", () => {
+test("buildProductFeedbackEvent omits absent category and retains imeta", () => {
+  const attachment = {
+    url: "https://example.test/screenshot.png",
+    sha256: "ab".repeat(32),
+    size: 42,
+    type: "image/png",
+    uploaded: 42,
+  };
+  const result = buildProductFeedbackEvent(
+    { category: null, message: "Useful feedback" },
+    [attachment],
+  );
+  assert.match(result.content, /Useful feedback/);
   assert.equal(
-    normalizeFeedbackChannelId(`  ${FEEDBACK_CHANNEL_ID}  `),
-    FEEDBACK_CHANNEL_ID,
+    result.tags.some((tag) => tag[0] === "category"),
+    false,
   );
-});
-
-test("findFeedbackChannel_returnsNullWhenUndefined", () => {
-  assert.equal(findFeedbackChannel(undefined, FEEDBACK_CHANNEL_ID), null);
-});
-
-test("findFeedbackChannel_matchesExactConfiguredId", () => {
-  const match = feedbackChannel();
   assert.equal(
-    findFeedbackChannel([channel(), match], FEEDBACK_CHANNEL_ID),
-    match,
+    result.tags.some((tag) => tag[0] === "imeta"),
+    true,
   );
 });
-
-test("findFeedbackChannel_doesNotFallBackToName", () => {
-  const sameName = feedbackChannel({ id: "wrong-id" });
-  assert.equal(findFeedbackChannel([sameName], FEEDBACK_CHANNEL_ID), null);
-});
-
-test("findFeedbackChannel_excludesDmChannels", () => {
-  const dm = feedbackChannel({ channelType: "dm" });
-  assert.equal(findFeedbackChannel([dm], FEEDBACK_CHANNEL_ID), null);
-});
-
-test("findFeedbackChannel_excludesOpenChannels", () => {
-  const open = feedbackChannel({ visibility: "open" });
-  assert.equal(findFeedbackChannel([open], FEEDBACK_CHANNEL_ID), null);
-});
-
-test("findFeedbackChannel_excludesNonMemberChannels", () => {
-  const notMember = feedbackChannel({ isMember: false });
-  assert.equal(findFeedbackChannel([notMember], FEEDBACK_CHANNEL_ID), null);
-});
-
-test("findFeedbackChannel_excludesForumChannels", () => {
-  const forum = feedbackChannel({ channelType: "forum" });
-  assert.equal(findFeedbackChannel([forum], FEEDBACK_CHANNEL_ID), null);
-});
-
-test("findFeedbackChannel_excludesArchivedChannels", () => {
-  const archived = feedbackChannel({
-    archivedAt: "2026-01-01T00:00:00Z",
-  });
-  assert.equal(findFeedbackChannel([archived], FEEDBACK_CHANNEL_ID), null);
-});
diff --git a/desktop/src/features/settings/hooks/useSendFeedback.ts b/desktop/src/features/settings/hooks/useSendFeedback.ts
index f141e0838c..bdd876928b 100644
--- a/desktop/src/features/settings/hooks/useSendFeedback.ts
+++ b/desktop/src/features/settings/hooks/useSendFeedback.ts
@@ -2,73 +2,14 @@ import { getVersion } from "@tauri-apps/api/app";
 import { useMutation } from "@tanstack/react-query";
 import * as React from "react";
 
-import { useChannelsQuery } from "@/features/channels/hooks";
 import type { ImetaMedia } from "@/features/messages/lib/imetaMediaMarkdown";
 import { buildOutgoingMessage } from "@/features/messages/lib/imetaMediaMarkdown";
 import type { SendFeedbackInput } from "@/features/settings/ui/SendFeedbackDialog";
-import { FEEDBACK_CATEGORY_LABELS } from "@/features/settings/ui/SendFeedbackDialog";
-import { useWorkspaces } from "@/features/workspaces/useWorkspaces";
-import { sendChannelMessage, uploadMediaBytes } from "@/shared/api/tauri";
+import { relayClient } from "@/shared/api/relayClient";
+import { signRelayEvent, uploadMediaBytes } from "@/shared/api/tauri";
 import { pickAndUploadImage } from "@/shared/api/tauriMedia";
-import type { Channel } from "@/shared/api/types";
+import { KIND_PRODUCT_FEEDBACK } from "@/shared/constants/kinds";
 
-/** Returns a usable channel ID, or null when feedback is not configured. */
-export function normalizeFeedbackChannelId(
-  configuredId: string | undefined,
-): string | null {
-  const channelId = configuredId?.trim() ?? "";
-  return channelId.length > 0 ? channelId : null;
-}
-
-/**
- * Build-time feedback destination. This is intentionally optional: default OSS
- * builds do not claim to offer a monitored feedback path.
- */
-export function getConfiguredFeedbackChannelId(): string | null {
-  return normalizeFeedbackChannelId(
-    import.meta.env?.VITE_BUZZ_FEEDBACK_CHANNEL_ID,
-  );
-}
-
-/** True when the optional feedback capability is enabled for this build. */
-export const FEEDBACK_ENABLED = getConfiguredFeedbackChannelId() !== null;
-
-/**
- * Resolves the configured destination by exact channel ID. It must be an active
- * private stream that the current user belongs to. No name matching or channel
- * creation is allowed: distributors are responsible for provisioning a
- * monitored inbox and its membership before enabling the feature.
- */
-export function findFeedbackChannel(
-  channels: Channel[] | undefined,
-  configuredId: string,
-): Channel | null {
-  if (!channels) {
-    return null;
-  }
-  return (
-    channels.find(
-      (channel) =>
-        channel.id === configuredId &&
-        channel.channelType === "stream" &&
-        channel.visibility === "private" &&
-        channel.archivedAt === null &&
-        channel.isMember,
-    ) ?? null
-  );
-}
-
-const FEEDBACK_CHANNEL_UNAVAILABLE_MESSAGE =
-  "Feedback is unavailable in this workspace. The configured feedback channel is missing, inaccessible, or not an active private stream. Ask your workspace administrator to verify the channel and your membership.";
-
-/**
- * Best-effort diagnostics text bundled when the user checks
- * "Attach diagnostics".
- *
- * The desktop app has no on-disk log file yet (it logs to stderr), so this
- * captures the environment context that is available client-side. When a real
- * log sink lands, extend this to include recent log lines.
- */
 async function collectDiagnostics(): Promise<string> {
   let appVersion = "unknown";
   try {
@@ -87,37 +28,34 @@ async function collectDiagnostics(): Promise<string> {
   ].join("\n");
 }
 
-/**
- * Owns feedback delivery to the explicitly configured private channel, manages
- * the optional image attachment, gathers a diagnostics bundle when requested,
- * and posts the feedback message with imeta tags.
- */
+export function buildProductFeedbackEvent(
+  input: Pick<SendFeedbackInput, "category" | "message">,
+  attachments: ImetaMedia[],
+): { content: string; tags: string[][] } {
+  const { content, mediaTags } = buildOutgoingMessage(
+    input.message.trim(),
+    attachments,
+  );
+  return {
+    content,
+    tags: [
+      ...(input.category ? [["category", input.category]] : []),
+      ...(mediaTags ?? []),
+    ],
+  };
+}
+
+/** Owns private product-feedback submission and optional attachment uploads. */
 export function useSendFeedback() {
-  const configuredChannelId = getConfiguredFeedbackChannelId();
-  const channelsQuery = useChannelsQuery({
-    enabled: configuredChannelId !== null,
-  });
-  const { activeWorkspace } = useWorkspaces();
   const [attachedImage, setAttachedImage] = React.useState<ImetaMedia | null>(
     null,
   );
-  // Bumped on every reset/close. `attachImage` captures the current value
-  // before its (slow) upload await and drops the result if the token changed
-  // meanwhile — otherwise an upload that resolves after the dialog closed
-  // would repopulate a stale image into the next session's draft.
   const sessionRef = React.useRef(0);
 
   const attachImage = React.useCallback(async () => {
     const session = sessionRef.current;
-    // The Rust `pick_and_upload_image` command validates the file is an image
-    // (via MIME sniffing) BEFORE upload, so discarded/non-image files never
-    // leave the client. Returns null when the user cancels the dialog.
     const descriptor = await pickAndUploadImage();
-    if (!descriptor) {
-      return;
-    }
-    // Dialog was reset/closed while the upload was in flight — discard.
-    if (sessionRef.current !== session) {
+    if (!descriptor || sessionRef.current !== session) {
       return;
     }
     setAttachedImage(descriptor);
@@ -128,36 +66,12 @@ export function useSendFeedback() {
   }, []);
 
   const reset = React.useCallback(() => {
-    // Invalidate any in-flight attachImage continuation for this session.
     sessionRef.current += 1;
     setAttachedImage(null);
   }, []);
 
   const submitMutation = useMutation({
     mutationFn: async (input: SendFeedbackInput) => {
-      if (!configuredChannelId) {
-        throw new Error("Feedback is not configured for this build.");
-      }
-
-      // Refetch authoritatively before every send. The configured destination
-      // may have been archived or the user's membership may have changed since
-      // the sidebar cache was populated.
-      const refreshed = await channelsQuery.refetch();
-      const channel = findFeedbackChannel(refreshed.data, configuredChannelId);
-      if (!channel) {
-        throw new Error(FEEDBACK_CHANNEL_UNAVAILABLE_MESSAGE);
-      }
-
-      const headerParts: string[] = [];
-      if (input.category) {
-        headerParts.push(
-          `**${FEEDBACK_CATEGORY_LABELS[input.category] ?? input.category}**`,
-        );
-      }
-      const bodyLines = [headerParts.join(" "), input.message]
-        .filter((part) => part.length > 0)
-        .join("\n\n");
-
       const attachments: ImetaMedia[] = [];
       if (attachedImage) {
         attachments.push(attachedImage);
@@ -165,35 +79,32 @@ export function useSendFeedback() {
       if (input.includeLogs) {
         const diagnostics = await collectDiagnostics();
         const bytes = Array.from(new TextEncoder().encode(diagnostics));
-        const logDescriptor = await uploadMediaBytes(
-          bytes,
-          `feedback-diagnostics-${Date.now()}.txt`,
+        attachments.push(
+          await uploadMediaBytes(
+            bytes,
+            `feedback-diagnostics-${Date.now()}.txt`,
+          ),
         );
-        attachments.push(logDescriptor);
       }
 
-      const { content, mediaTags } = buildOutgoingMessage(
-        bodyLines,
-        attachments,
+      const payload = buildProductFeedbackEvent(input, attachments);
+      const event = await signRelayEvent({
+        kind: KIND_PRODUCT_FEEDBACK,
+        content: payload.content,
+        tags: payload.tags,
+      });
+      await relayClient.publishEvent(
+        event,
+        "Timed out while sending feedback.",
+        "Failed to send feedback.",
       );
-
-      await sendChannelMessage(channel.id, content, null, mediaTags);
-    },
-    onSuccess: () => {
-      reset();
     },
+    onSuccess: reset,
   });
 
   return {
     attachImage,
     attachedImage,
-    destinationChannelId: configuredChannelId,
-    destinationChannelName: configuredChannelId
-      ? (findFeedbackChannel(channelsQuery.data, configuredChannelId)?.name ??
-        null)
-      : null,
-    destinationRelayUrl: activeWorkspace?.relayUrl ?? "the current relay",
-    destinationWorkspaceName: activeWorkspace?.name ?? "this workspace",
     isPending: submitMutation.isPending,
     removeImage,
     reset,
diff --git a/desktop/src/features/settings/ui/SendFeedbackController.tsx b/desktop/src/features/settings/ui/SendFeedbackController.tsx
index a557a24fe5..836eeb3b44 100644
--- a/desktop/src/features/settings/ui/SendFeedbackController.tsx
+++ b/desktop/src/features/settings/ui/SendFeedbackController.tsx
@@ -1,11 +1,6 @@
 import { useSendFeedback } from "@/features/settings/hooks/useSendFeedback";
 import { SendFeedbackDialog } from "@/features/settings/ui/SendFeedbackDialog";
 
-/**
- * Kept behind the build-time feedback gate in AppShell so default OSS builds
- * neither render the UI nor start a second channels query for a capability they
- * do not offer.
- */
 export function SendFeedbackController({
   onOpenChange,
   open,
@@ -14,24 +9,14 @@ export function SendFeedbackController({
   open: boolean;
 }) {
   const sendFeedback = useSendFeedback();
-  if (!sendFeedback.destinationChannelId) {
-    return null;
-  }
-
   return (
     <SendFeedbackDialog
       attachedImageUrl={sendFeedback.attachedImage?.url ?? null}
-      destinationChannelId={sendFeedback.destinationChannelId}
-      destinationChannelName={sendFeedback.destinationChannelName}
-      destinationRelayUrl={sendFeedback.destinationRelayUrl}
-      destinationWorkspaceName={sendFeedback.destinationWorkspaceName}
       isPending={sendFeedback.isPending}
       onAttachImage={sendFeedback.attachImage}
       onOpenChange={(nextOpen) => {
         onOpenChange(nextOpen);
-        if (!nextOpen) {
-          sendFeedback.reset();
-        }
+        if (!nextOpen) sendFeedback.reset();
       }}
       onRemoveImage={sendFeedback.removeImage}
       onSubmit={sendFeedback.submit}
diff --git a/desktop/src/features/settings/ui/SendFeedbackDialog.tsx b/desktop/src/features/settings/ui/SendFeedbackDialog.tsx
index a0874e618b..72538a7fa3 100644
--- a/desktop/src/features/settings/ui/SendFeedbackDialog.tsx
+++ b/desktop/src/features/settings/ui/SendFeedbackDialog.tsx
@@ -57,15 +57,11 @@ export type SendFeedbackInput = {
  * diagnostics" checkbox. Selecting a positive category fires the heart-burst
  * emitter.
  *
- * Delivery (channel resolution, upload, send) is delegated to `onSubmit`, and
+ * Delivery (upload and private feedback submission) is delegated to `onSubmit`, and
  * image attachment to `onAttachImage`, so this shell stays presentational.
  */
 export function SendFeedbackDialog({
   attachedImageUrl,
-  destinationChannelId,
-  destinationChannelName,
-  destinationRelayUrl,
-  destinationWorkspaceName,
   isPending,
   onAttachImage,
   onOpenChange,
@@ -75,14 +71,6 @@ export function SendFeedbackDialog({
 }: {
   /** Preview URL of the currently-attached image, or null when none. */
   attachedImageUrl: string | null;
-  /** Build-configured private destination channel ID. */
-  destinationChannelId: string;
-  /** Resolved channel name, when the current workspace exposes it. */
-  destinationChannelName: string | null;
-  /** Current relay URL disclosed to the sender. */
-  destinationRelayUrl: string;
-  /** Current workspace/operator label disclosed to the sender. */
-  destinationWorkspaceName: string;
   isPending: boolean;
   /** Opens a file picker and uploads; the parent owns the resulting URL. */
   onAttachImage: () => Promise<void>;
@@ -174,25 +162,10 @@ export function SendFeedbackDialog({
           </div>
           <p
             className="pt-2 text-sm text-muted-foreground"
-            data-testid="feedback-destination-disclosure"
+            data-testid="feedback-privacy-disclosure"
           >
-            This report goes to the private{" "}
-            <span className="font-medium text-foreground">
-              {destinationChannelName
-                ? `#${destinationChannelName}`
-                : `feedback channel ${destinationChannelId}`}
-            </span>{" "}
-            in{" "}
-            <span className="font-medium text-foreground">
-              {destinationWorkspaceName}
-            </span>{" "}
-            via{" "}
-            <span className="font-medium text-foreground">
-              {destinationRelayUrl}
-            </span>
-            . Attaching an image uploads it immediately to that relay. If you
-            send this report, the image and any diagnostics are shared in the
-            same channel.
+            Feedback is sent privately to this Buzz deployment and is not posted
+            to a channel. Attachments are uploaded before you send.
           </p>
         </DialogHeader>
 
diff --git a/desktop/src/features/sidebar/ui/AppSidebar.tsx b/desktop/src/features/sidebar/ui/AppSidebar.tsx
index a7eec90623..bc86d97abc 100644
--- a/desktop/src/features/sidebar/ui/AppSidebar.tsx
+++ b/desktop/src/features/sidebar/ui/AppSidebar.tsx
@@ -837,8 +837,8 @@ export function AppSidebar({
                   isPresencePending={isPresencePending}
                   onOpenAddCommunity={onOpenAddCommunity}
                   onOpenSettings={onSelectSettings}
-                  onRemoveCommunity={onRemoveCommunity}
                   onSendFeedback={onSendFeedback}
+                  onRemoveCommunity={onRemoveCommunity}
                   onSetPresenceStatus={onSetPresenceStatus}
                   onSetUserStatus={onSetUserStatus}
                   onClearUserStatus={onClearUserStatus}
diff --git a/desktop/src/features/sidebar/ui/SidebarProfileCard.tsx b/desktop/src/features/sidebar/ui/SidebarProfileCard.tsx
index a7302c48af..467b2fae7f 100644
--- a/desktop/src/features/sidebar/ui/SidebarProfileCard.tsx
+++ b/desktop/src/features/sidebar/ui/SidebarProfileCard.tsx
@@ -42,8 +42,8 @@ export function SidebarProfileCard({
   isPresencePending,
   onOpenAddCommunity,
   onOpenSettings,
-  onRemoveCommunity,
   onSendFeedback,
+  onRemoveCommunity,
   onSetPresenceStatus,
   onSetUserStatus,
   onClearUserStatus,
diff --git a/desktop/src/shared/constants/kinds.ts b/desktop/src/shared/constants/kinds.ts
index 8b16a89886..3895abff6a 100644
--- a/desktop/src/shared/constants/kinds.ts
+++ b/desktop/src/shared/constants/kinds.ts
@@ -9,6 +9,7 @@ export const KIND_NIP29_DELETE_EVENT = 9005;
 // the mod queue only; commands (9040–9044) are relay-validated and never stored.
 // Tag shapes are pinned by buzz-sdk builders + relay moderation_commands.rs.
 export const KIND_REPORT = 1984;
+export const KIND_PRODUCT_FEEDBACK = 42000;
 export const KIND_MODERATION_BAN = 9040;
 export const KIND_MODERATION_UNBAN = 9041;
 export const KIND_MODERATION_TIMEOUT = 9042;
diff --git a/desktop/src/vite-env.d.ts b/desktop/src/vite-env.d.ts
index a202889f88..11f02fe2a0 100644
--- a/desktop/src/vite-env.d.ts
+++ b/desktop/src/vite-env.d.ts
@@ -1,9 +1 @@
 /// <reference types="vite/client" />
-
-interface ImportMetaEnv {
-  readonly VITE_BUZZ_FEEDBACK_CHANNEL_ID?: string;
-}
-
-interface ImportMeta {
-  readonly env: ImportMetaEnv;
-}
diff --git a/desktop/tests/e2e/profile.spec.ts b/desktop/tests/e2e/profile.spec.ts
index 332eece18e..301edb29cc 100644
--- a/desktop/tests/e2e/profile.spec.ts
+++ b/desktop/tests/e2e/profile.spec.ts
@@ -623,14 +623,13 @@ test("snaps custom avatar colors to the dot grid", async ({ page }) => {
   await expect(page.getByTestId("profile-avatar-done")).toBeVisible();
 });
 
-test("hides Send feedback when no destination is configured", async ({
-  page,
-}) => {
+test("opens Send feedback from the profile menu", async ({ page }) => {
   await page.goto("/");
-
   await openProfileMenu(page);
-  await expect(page.getByTestId("profile-popover-send-feedback")).toHaveCount(
-    0,
+  await page.getByTestId("profile-popover-send-feedback").click();
+  await expect(page.getByTestId("send-feedback-dialog")).toBeVisible();
+  await expect(page.getByTestId("feedback-privacy-disclosure")).toContainText(
+    "not posted to a channel",
   );
 });
 

From 7048e4d4643560b8ebc75756f35d323285d2d510 Mon Sep 17 00:00:00 2001
From: kenny lopez <klopez4212@gmail.com>
Date: Wed, 15 Jul 2026 08:50:20 +0100
Subject: [PATCH 15/16] fix(desktop): guard overlapping feedback uploads

---
 .../settings/hooks/useSendFeedback.ts         | 36 +++++++++++++--
 .../settings/ui/SendFeedbackController.tsx    |  1 +
 .../settings/ui/SendFeedbackDialog.tsx        |  7 +--
 desktop/src/testing/e2eBridge.ts              |  2 +
 desktop/tests/e2e/profile.spec.ts             | 44 +++++++++++++++++++
 5 files changed, 81 insertions(+), 9 deletions(-)

diff --git a/desktop/src/features/settings/hooks/useSendFeedback.ts b/desktop/src/features/settings/hooks/useSendFeedback.ts
index bdd876928b..53444363d5 100644
--- a/desktop/src/features/settings/hooks/useSendFeedback.ts
+++ b/desktop/src/features/settings/hooks/useSendFeedback.ts
@@ -50,15 +50,40 @@ export function useSendFeedback() {
   const [attachedImage, setAttachedImage] = React.useState<ImetaMedia | null>(
     null,
   );
+  const [isAttaching, setIsAttaching] = React.useState(false);
   const sessionRef = React.useRef(0);
+  const attachmentAttemptRef = React.useRef(0);
 
   const attachImage = React.useCallback(async () => {
     const session = sessionRef.current;
-    const descriptor = await pickAndUploadImage();
-    if (!descriptor || sessionRef.current !== session) {
-      return;
+    const attempt = attachmentAttemptRef.current + 1;
+    attachmentAttemptRef.current = attempt;
+    setIsAttaching(true);
+    try {
+      const descriptor = await pickAndUploadImage();
+      if (
+        !descriptor ||
+        sessionRef.current !== session ||
+        attachmentAttemptRef.current !== attempt
+      ) {
+        return;
+      }
+      setAttachedImage(descriptor);
+    } catch (error) {
+      if (
+        sessionRef.current === session &&
+        attachmentAttemptRef.current === attempt
+      ) {
+        throw error;
+      }
+    } finally {
+      if (
+        sessionRef.current === session &&
+        attachmentAttemptRef.current === attempt
+      ) {
+        setIsAttaching(false);
+      }
     }
-    setAttachedImage(descriptor);
   }, []);
 
   const removeImage = React.useCallback(() => {
@@ -67,7 +92,9 @@ export function useSendFeedback() {
 
   const reset = React.useCallback(() => {
     sessionRef.current += 1;
+    attachmentAttemptRef.current += 1;
     setAttachedImage(null);
+    setIsAttaching(false);
   }, []);
 
   const submitMutation = useMutation({
@@ -105,6 +132,7 @@ export function useSendFeedback() {
   return {
     attachImage,
     attachedImage,
+    isAttaching,
     isPending: submitMutation.isPending,
     removeImage,
     reset,
diff --git a/desktop/src/features/settings/ui/SendFeedbackController.tsx b/desktop/src/features/settings/ui/SendFeedbackController.tsx
index 836eeb3b44..f7c22f519e 100644
--- a/desktop/src/features/settings/ui/SendFeedbackController.tsx
+++ b/desktop/src/features/settings/ui/SendFeedbackController.tsx
@@ -12,6 +12,7 @@ export function SendFeedbackController({
   return (
     <SendFeedbackDialog
       attachedImageUrl={sendFeedback.attachedImage?.url ?? null}
+      isAttaching={sendFeedback.isAttaching}
       isPending={sendFeedback.isPending}
       onAttachImage={sendFeedback.attachImage}
       onOpenChange={(nextOpen) => {
diff --git a/desktop/src/features/settings/ui/SendFeedbackDialog.tsx b/desktop/src/features/settings/ui/SendFeedbackDialog.tsx
index 72538a7fa3..f7e99a2760 100644
--- a/desktop/src/features/settings/ui/SendFeedbackDialog.tsx
+++ b/desktop/src/features/settings/ui/SendFeedbackDialog.tsx
@@ -62,6 +62,7 @@ export type SendFeedbackInput = {
  */
 export function SendFeedbackDialog({
   attachedImageUrl,
+  isAttaching,
   isPending,
   onAttachImage,
   onOpenChange,
@@ -71,6 +72,7 @@ export function SendFeedbackDialog({
 }: {
   /** Preview URL of the currently-attached image, or null when none. */
   attachedImageUrl: string | null;
+  isAttaching: boolean;
   isPending: boolean;
   /** Opens a file picker and uploads; the parent owns the resulting URL. */
   onAttachImage: () => Promise<void>;
@@ -85,7 +87,6 @@ export function SendFeedbackDialog({
   );
   const [message, setMessage] = React.useState("");
   const [includeLogs, setIncludeLogs] = React.useState(false);
-  const [isAttaching, setIsAttaching] = React.useState(false);
   const [previewOpen, setPreviewOpen] = React.useState(false);
   const [errorMessage, setErrorMessage] = React.useState<string | null>(null);
 
@@ -94,7 +95,6 @@ export function SendFeedbackDialog({
       setCategory(null);
       setMessage("");
       setIncludeLogs(false);
-      setIsAttaching(false);
       setPreviewOpen(false);
       setErrorMessage(null);
     }
@@ -117,15 +117,12 @@ export function SendFeedbackDialog({
       return;
     }
     setErrorMessage(null);
-    setIsAttaching(true);
     try {
       await onAttachImage();
     } catch (error) {
       setErrorMessage(
         error instanceof Error ? error.message : "Failed to attach image.",
       );
-    } finally {
-      setIsAttaching(false);
     }
   }
 
diff --git a/desktop/src/testing/e2eBridge.ts b/desktop/src/testing/e2eBridge.ts
index d8a53e08fc..38a621abbb 100644
--- a/desktop/src/testing/e2eBridge.ts
+++ b/desktop/src/testing/e2eBridge.ts
@@ -9466,6 +9466,8 @@ export function maybeInstallE2eTauriMocks() {
         return MOCK_MEDIA_PROXY_PORT;
       case "pick_and_upload_media":
         return await resolveMockUploadDescriptors(activeConfig);
+      case "pick_and_upload_image":
+        return (await resolveMockUploadDescriptors(activeConfig))[0] ?? null;
       case "upload_media_bytes":
         return (await resolveMockUploadDescriptors(activeConfig))[0];
       case "fetch_media_bytes": {
diff --git a/desktop/tests/e2e/profile.spec.ts b/desktop/tests/e2e/profile.spec.ts
index 301edb29cc..3e47ea2b83 100644
--- a/desktop/tests/e2e/profile.spec.ts
+++ b/desktop/tests/e2e/profile.spec.ts
@@ -633,6 +633,50 @@ test("opens Send feedback from the profile menu", async ({ page }) => {
   );
 });
 
+test("keeps Send disabled when a stale attachment attempt finishes", async ({
+  page,
+}) => {
+  await installMockBridge(page, {
+    uploadDelayMs: 1_200,
+    uploadDescriptors: [
+      {
+        url: `https://mock.relay/media/${"b".repeat(64)}.png`,
+        sha256: "b".repeat(64),
+        size: 42,
+        type: "image/png",
+        uploaded: 42,
+      },
+    ],
+  });
+  await page.goto("/");
+
+  await openProfileMenu(page);
+  await page.getByTestId("profile-popover-send-feedback").click();
+  await page.getByTestId("feedback-message").fill("Attachment race");
+  await page.getByTestId("feedback-attach-image").click();
+  await expect(page.getByTestId("feedback-attach-image")).toContainText(
+    "Attaching…",
+  );
+
+  await page.waitForTimeout(450);
+  await page.getByRole("button", { name: "Cancel" }).click();
+  await openProfileMenu(page);
+  await page.getByTestId("profile-popover-send-feedback").click();
+  await page.getByTestId("feedback-message").fill("Second attachment");
+  await page.getByTestId("feedback-attach-image").click();
+
+  const submit = page.getByTestId("feedback-submit");
+  await expect(submit).toBeDisabled();
+  await page.waitForTimeout(900);
+  await expect(page.getByTestId("feedback-attach-image")).toContainText(
+    "Attaching…",
+  );
+  await expect(submit).toBeDisabled();
+
+  await expect(page.getByTestId("feedback-attachment-thumb")).toBeVisible();
+  await expect(submit).toBeEnabled();
+});
+
 test("updates presence from the profile menu", async ({ page }) => {
   await page.goto("/");
 

From bbd927101eeb79efa4328d049459db43439af1d2 Mon Sep 17 00:00:00 2001
From: kenny lopez <klopez4212@gmail.com>
Date: Wed, 15 Jul 2026 09:08:27 +0100
Subject: [PATCH 16/16] fix(desktop): proxy feedback image previews

---
 .../settings/ui/SendFeedbackDialog.tsx        | 12 +++++---
 desktop/tests/e2e/profile.spec.ts             | 29 +++++++++++++++++++
 2 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/desktop/src/features/settings/ui/SendFeedbackDialog.tsx b/desktop/src/features/settings/ui/SendFeedbackDialog.tsx
index f7e99a2760..a0a64da8a9 100644
--- a/desktop/src/features/settings/ui/SendFeedbackDialog.tsx
+++ b/desktop/src/features/settings/ui/SendFeedbackDialog.tsx
@@ -2,6 +2,7 @@ import { Bug, ImageIcon, ThumbsUp, Wrench, X } from "lucide-react";
 import * as React from "react";
 
 import { cn } from "@/shared/lib/cn";
+import { rewriteRelayUrl } from "@/shared/lib/mediaUrl";
 import { Button } from "@/shared/ui/button";
 import { Checkbox } from "@/shared/ui/checkbox";
 import {
@@ -82,6 +83,9 @@ export function SendFeedbackDialog({
   open: boolean;
 }) {
   const { burstEmoji } = useEmojiBurst();
+  const resolvedAttachedImageUrl = attachedImageUrl
+    ? rewriteRelayUrl(attachedImageUrl)
+    : null;
   const [category, setCategory] = React.useState<FeedbackCategoryId | null>(
     null,
   );
@@ -237,7 +241,7 @@ export function SendFeedbackDialog({
               value={message}
             />
 
-            {attachedImageUrl ? (
+            {resolvedAttachedImageUrl ? (
               <div className="group/attachment relative flex w-32 shrink-0 flex-col overflow-hidden rounded-lg border border-border/70 bg-muted/40">
                 <button
                   aria-label="View attached image"
@@ -249,7 +253,7 @@ export function SendFeedbackDialog({
                   <img
                     alt="Attached"
                     className="h-20 w-full object-cover"
-                    src={attachedImageUrl}
+                    src={resolvedAttachedImageUrl}
                   />
                   <span className="flex items-center gap-1 px-2 py-1.5 text-2xs font-medium text-muted-foreground">
                     <ImageIcon
@@ -340,7 +344,7 @@ export function SendFeedbackDialog({
       </DialogContent>
 
       {/* Full-size attachment preview. */}
-      {attachedImageUrl ? (
+      {resolvedAttachedImageUrl ? (
         <Dialog onOpenChange={setPreviewOpen} open={previewOpen}>
           <DialogContent
             aria-describedby={undefined}
@@ -351,7 +355,7 @@ export function SendFeedbackDialog({
             <img
               alt="Attached"
               className="max-h-[80vh] w-full rounded-lg bg-black/40 object-contain"
-              src={attachedImageUrl}
+              src={resolvedAttachedImageUrl}
             />
           </DialogContent>
         </Dialog>
diff --git a/desktop/tests/e2e/profile.spec.ts b/desktop/tests/e2e/profile.spec.ts
index 3e47ea2b83..2f2944bfda 100644
--- a/desktop/tests/e2e/profile.spec.ts
+++ b/desktop/tests/e2e/profile.spec.ts
@@ -677,6 +677,35 @@ test("keeps Send disabled when a stale attachment attempt finishes", async ({
   await expect(submit).toBeEnabled();
 });
 
+test("proxies feedback attachment previews", async ({ page }) => {
+  const sha256 = "c".repeat(64);
+  const proxyUrl = `http://127.0.0.1:54321/media/${sha256}.png`;
+  await installMockBridge(page, {
+    uploadDescriptors: [
+      {
+        url: `http://localhost:3000/media/${sha256}.png`,
+        sha256,
+        size: 42,
+        type: "image/png",
+        uploaded: 42,
+      },
+    ],
+  });
+  await page.goto("/");
+
+  await openProfileMenu(page);
+  await page.getByTestId("profile-popover-send-feedback").click();
+  await page.getByTestId("feedback-attach-image").click();
+
+  const thumbnail = page.getByTestId("feedback-attachment-thumb");
+  await expect(thumbnail.locator("img")).toHaveAttribute("src", proxyUrl);
+  await thumbnail.click();
+
+  const preview = page.getByTestId("feedback-attachment-preview");
+  await expect(preview).toBeVisible();
+  await expect(preview.locator("img")).toHaveAttribute("src", proxyUrl);
+});
+
 test("updates presence from the profile menu", async ({ page }) => {
   await page.goto("/");