From 39fa0b65dd2a8da7ea74cd343e9e2bb57de4a237 Mon Sep 17 00:00:00 2001
From: Waleed Latif <walif6@gmail.com>
Date: Sat, 19 Sep 2026 16:37:15 -0700
Subject: [PATCH] fix(settings): align credential groups with organization
 rollout

---
 .../settings-sidebar/settings-sidebar.test.tsx     |  5 +----
 .../settings-sidebar/settings-sidebar.tsx          | 14 +++++++-------
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/settings-sidebar/settings-sidebar.test.tsx b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/settings-sidebar/settings-sidebar.test.tsx
index 93c385f93c1..873838e6268 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/settings-sidebar/settings-sidebar.test.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/settings-sidebar/settings-sidebar.test.tsx
@@ -240,10 +240,7 @@ describe('workspace SettingsSidebar organization rollout', () => {
       expect(links).toHaveLength(1)
       expect(links[0]).toHaveAttribute('href', '/o/host-org/settings/members')
       expect(links[0]).toHaveTextContent('Organization')
-      if (role === 'admin')
-        expect(workspaceLink('connected-accounts')).toHaveTextContent('Credential Groups')
-      else expect(workspaceLink('connected-accounts')).toBeNull()
-      for (const section of ['organization', 'billing', 'usage', 'sso']) {
+      for (const section of ['organization', 'billing', 'usage', 'sso', 'connected-accounts']) {
         expect(workspaceLink(section)).toBeNull()
       }
       expectWorkspaceLinks()
diff --git a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/settings-sidebar/settings-sidebar.tsx b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/settings-sidebar/settings-sidebar.tsx
index c9f4f040c84..acf4cb1cf8f 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/settings-sidebar/settings-sidebar.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/settings-sidebar/settings-sidebar.tsx
@@ -152,13 +152,6 @@ export function SettingsSidebar({
 
   const navigationItems = useMemo(() => {
     return allNavigationItems.filter((item) => {
-      if (item.id === 'connected-accounts') {
-        return Boolean(
-          hostContext.hostOrganizationId &&
-            isOrgAdminOrOwner &&
-            hostContext.features?.credentialGroups
-        )
-      }
       if (
         hostContext.hostOrganizationId &&
         ORGANIZATION_PLANE_UNIFIED_SECTIONS.has(item.id) &&
@@ -166,6 +159,13 @@ export function SettingsSidebar({
       ) {
         return false
       }
+      if (item.id === 'connected-accounts') {
+        return Boolean(
+          hostContext.hostOrganizationId &&
+            isOrgAdminOrOwner &&
+            hostContext.features?.credentialGroups
+        )
+      }
       if (item.id === 'organization') {
         return Boolean(
           hostContext.hostOrganizationId && hostContext.viewer.isHostOrganizationMember