From 66991027d38e7fd891e431f73c32ca08996cea07 Mon Sep 17 00:00:00 2001
From: kenny lopez <klopez4212@gmail.com>
Date: Thu, 23 Jul 2026 11:14:31 -0700
Subject: [PATCH] Place catalog publish action before toggle

---
 .../src/features/agents/ui/PersonaShareDialog.tsx  | 14 +++++++-------
 desktop/tests/e2e/agents.spec.ts                   |  7 ++++---
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/desktop/src/features/agents/ui/PersonaShareDialog.tsx b/desktop/src/features/agents/ui/PersonaShareDialog.tsx
index 972b81c07..690658cd9 100644
--- a/desktop/src/features/agents/ui/PersonaShareDialog.tsx
+++ b/desktop/src/features/agents/ui/PersonaShareDialog.tsx
@@ -772,13 +772,6 @@ export function PersonaShareDialog({
               </p>
             </div>
             <div className="flex shrink-0 items-center gap-2">
-              <Switch
-                checked={isCatalogVisible}
-                data-testid="persona-share-show-in-catalog"
-                disabled={isPending}
-                id={switchId}
-                onCheckedChange={onCatalogVisibilityChange}
-              />
               {isCatalogVisible && hasCatalogUpdates ? (
                 <Button
                   data-testid="persona-share-publish-catalog-updates"
@@ -790,6 +783,13 @@ export function PersonaShareDialog({
                   Publish updates
                 </Button>
               ) : null}
+              <Switch
+                checked={isCatalogVisible}
+                data-testid="persona-share-show-in-catalog"
+                disabled={isPending}
+                id={switchId}
+                onCheckedChange={onCatalogVisibilityChange}
+              />
             </div>
           </section>
         )
diff --git a/desktop/tests/e2e/agents.spec.ts b/desktop/tests/e2e/agents.spec.ts
index d84410d0a..8a756ca99 100644
--- a/desktop/tests/e2e/agents.spec.ts
+++ b/desktop/tests/e2e/agents.spec.ts
@@ -1407,9 +1407,10 @@ This deliberately long fenced-code example must not establish the minimum width
     catalogToggle.boundingBox(),
     publishCatalogUpdatesButton.boundingBox(),
   ]);
-  expect(publishCatalogUpdatesButtonBox?.x ?? 0).toBeGreaterThan(
-    (catalogToggleBox?.x ?? 0) + (catalogToggleBox?.width ?? 0),
-  );
+  expect(
+    (publishCatalogUpdatesButtonBox?.x ?? 0) +
+      (publishCatalogUpdatesButtonBox?.width ?? 0),
+  ).toBeLessThan(catalogToggleBox?.x ?? 0);
   await publishCatalogUpdatesButton.click();
   await expect(publishCatalogUpdatesButton).toHaveCount(0);
   await expect(catalogToggle).toHaveAttribute("aria-checked", "true");