From 87cdc413aabf9cbaaf44b2668fe9a0bb79f8a6de Mon Sep 17 00:00:00 2001
From: Taylor Ho <taylorkmho@gmail.com>
Date: Fri, 14 Aug 2026 14:55:59 -0700
Subject: [PATCH] Polish workflow editor interactions

Signed-off-by: Taylor Ho <taylorkmho@gmail.com>
---
 .../features/workflows/ui/ChannelCombobox.tsx | 56 +++++++++++++++----
 .../features/workflows/ui/WorkflowDialog.tsx  | 12 ++--
 .../workflows/ui/WorkflowFormBuilder.tsx      |  2 +-
 3 files changed, 54 insertions(+), 16 deletions(-)

diff --git a/desktop/src/features/workflows/ui/ChannelCombobox.tsx b/desktop/src/features/workflows/ui/ChannelCombobox.tsx
index fac1cfa7d..5eb0eb586 100644
--- a/desktop/src/features/workflows/ui/ChannelCombobox.tsx
+++ b/desktop/src/features/workflows/ui/ChannelCombobox.tsx
@@ -16,6 +16,7 @@ import type { Channel } from "@/shared/api/types";
 import { cn } from "@/shared/lib/cn";
 import { Popover, PopoverContent, PopoverTrigger } from "@/shared/ui/popover";
 import { PortalledScrollArea } from "@/shared/ui/PortalledScrollArea";
+import { Tooltip, TooltipContent, TooltipTrigger } from "@/shared/ui/tooltip";
 
 function ChannelPrivacyIcon({ channel }: { channel: Channel }) {
   const Icon =
@@ -40,6 +41,8 @@ type ChannelComboboxProps = {
   id?: string;
   isChannelDisabled?: (channel: Channel) => boolean;
   onChange: (value: string) => void;
+  readOnly?: boolean;
+  readOnlyTooltip?: string;
   required?: boolean;
   variant?: "header" | "field";
   value: string;
@@ -55,14 +58,25 @@ export function ChannelCombobox({
   id,
   isChannelDisabled,
   onChange,
+  readOnly = false,
+  readOnlyTooltip = "The channel can't be changed after a workflow is created.",
   required = false,
   variant = "header",
   value,
 }: ChannelComboboxProps) {
-  const [open, setOpen] = React.useState(defaultOpen);
+  const [open, setOpen] = React.useState(false);
   const [query, setQuery] = React.useState("");
   const [highlightedIndex, setHighlightedIndex] = React.useState(0);
 
+  React.useEffect(() => {
+    if (!defaultOpen) return;
+
+    // Let the pointer interaction that mounted the containing dialog finish
+    // before installing Radix's outside-interaction listeners.
+    const frame = window.requestAnimationFrame(() => setOpen(true));
+    return () => window.cancelAnimationFrame(frame);
+  }, [defaultOpen]);
+
   const selected = channels.find((c) => c.id === value);
   const currentPubkey = useIdentityQuery().data?.pubkey;
   const dmParticipantPubkeys = React.useMemo(() => {
@@ -150,6 +164,34 @@ export function ChannelCombobox({
     }
   }
 
+  const selectedLabel = selected
+    ? (channelLabels.get(selected.id) ?? selected.name)
+    : value
+      ? "Unavailable channel"
+      : emptyLabel;
+
+  if (readOnly) {
+    return (
+      <Tooltip>
+        <TooltipTrigger asChild>
+          <button
+            aria-disabled="true"
+            aria-label={`${ariaLabel}: ${selectedLabel}. Read only.`}
+            className="flex w-full cursor-default items-center justify-center rounded-lg px-3 py-2 text-lg font-semibold text-foreground focus-visible:outline-hidden focus-visible:ring-1 focus-visible:ring-ring"
+            id={id}
+            type="button"
+          >
+            <span className="flex min-w-0 items-center gap-2">
+              {selected ? <ChannelPrivacyIcon channel={selected} /> : null}
+              <span className="truncate">{selectedLabel}</span>
+            </span>
+          </button>
+        </TooltipTrigger>
+        <TooltipContent side="top">{readOnlyTooltip}</TooltipContent>
+      </Tooltip>
+    );
+  }
+
   return (
     <Popover onOpenChange={handleOpenChange} open={open}>
       <PopoverTrigger asChild>
@@ -181,13 +223,7 @@ export function ChannelCombobox({
             ) : required && !value ? (
               <Asterisk aria-hidden className="h-5 w-5 shrink-0 text-primary" />
             ) : null}
-            <span className="truncate">
-              {selected
-                ? (channelLabels.get(selected.id) ?? selected.name)
-                : value
-                  ? "Unavailable channel"
-                  : emptyLabel}
-            </span>
+            <span className="truncate">{selectedLabel}</span>
           </span>
           <ChevronDown className="ml-1 h-5 w-5 shrink-0 text-muted-foreground opacity-50 transition-opacity group-hover:opacity-100 group-focus-visible:opacity-100" />
         </button>
@@ -222,7 +258,7 @@ export function ChannelCombobox({
           {allowEmpty && !query ? (
             <button
               className={cn(
-                "flex w-full items-center gap-2 rounded-lg px-2 py-1.5 text-left text-sm transition-colors hover:bg-accent hover:text-accent-foreground",
+                "flex w-full cursor-pointer items-center gap-2 rounded-lg px-2 py-1.5 text-left text-sm transition-colors hover:bg-accent hover:text-accent-foreground",
                 !value && "bg-accent/50",
               )}
               onClick={() => selectChannel("")}
@@ -248,7 +284,7 @@ export function ChannelCombobox({
               return (
                 <button
                   className={cn(
-                    "flex w-full items-center gap-2 rounded-lg px-2 py-1.5 text-left text-sm transition-colors hover:bg-accent hover:text-accent-foreground disabled:cursor-not-allowed disabled:opacity-45 disabled:hover:bg-transparent disabled:hover:text-foreground",
+                    "flex w-full cursor-pointer items-center gap-2 rounded-lg px-2 py-1.5 text-left text-sm transition-colors hover:bg-accent hover:text-accent-foreground disabled:cursor-not-allowed disabled:opacity-45 disabled:hover:bg-transparent disabled:hover:text-foreground",
                     channel.id === value && "bg-accent/50",
                     channel.id === selectable[highlightedIndex]?.id &&
                       !optionDisabled &&
diff --git a/desktop/src/features/workflows/ui/WorkflowDialog.tsx b/desktop/src/features/workflows/ui/WorkflowDialog.tsx
index 63bd428e2..bb9f90aa7 100644
--- a/desktop/src/features/workflows/ui/WorkflowDialog.tsx
+++ b/desktop/src/features/workflows/ui/WorkflowDialog.tsx
@@ -320,11 +320,13 @@ export function WorkflowDialog({
                     ) : null}
                   </div>
                 ) : mode === "edit" && selectedChannel ? (
-                  <div className="px-3 py-2 text-center">
-                    <p className="text-lg font-semibold text-foreground">
-                      {selectedChannel.name}
-                    </p>
-                  </div>
+                  <ChannelCombobox
+                    channels={channels}
+                    id="wf-channel-select"
+                    onChange={setSelectedChannelId}
+                    readOnly
+                    value={selectedChannel.id}
+                  />
                 ) : null
               }
               selectedNode={pane}
diff --git a/desktop/src/features/workflows/ui/WorkflowFormBuilder.tsx b/desktop/src/features/workflows/ui/WorkflowFormBuilder.tsx
index 848de3e11..a3fd84d40 100644
--- a/desktop/src/features/workflows/ui/WorkflowFormBuilder.tsx
+++ b/desktop/src/features/workflows/ui/WorkflowFormBuilder.tsx
@@ -303,7 +303,7 @@ function WorkflowNode({
         {onRemove ? (
           <Button
             aria-label={`Remove ${title}`}
-            className="pointer-events-none absolute right-1 top-1/2 z-10 h-8 w-8 -translate-y-1/2 rounded-full bg-transparent opacity-0 transition-all duration-200 group-focus-within:pointer-events-auto group-focus-within:translate-x-12 group-focus-within:opacity-100 group-hover:pointer-events-auto group-hover:translate-x-12 group-hover:opacity-100 hover:bg-destructive/15 hover:text-destructive"
+            className="pointer-events-none absolute -right-8 top-1/2 z-10 h-8 w-8 -translate-y-1/2 rounded-full bg-transparent opacity-0 transition-all duration-200 group-focus-within:pointer-events-auto group-focus-within:translate-x-3 group-focus-within:opacity-100 group-hover:pointer-events-auto group-hover:translate-x-3 group-hover:opacity-100 hover:bg-destructive/15 hover:text-destructive"
             disabled={disabled}
             onClick={onRemove}
             size="icon"