Skip to content
TypeScript

fix(web): show the project pin before the remote badge (#29704)

mariae1e520c93c99
diff --git a/apps/web/src/components/Sidebar.tsx b/apps/web/src/components/Sidebar.tsx
index 8eb32a60582..cbf0191a7f4 100644
--- a/apps/web/src/components/Sidebar.tsx
+++ b/apps/web/src/components/Sidebar.tsx
@@ -3138,13 +3138,6 @@ export default function Sidebar({ routeReveal }: { routeReveal: SidebarRouteReve
)}
</ProjectScopeRowIcon>
<span className="min-w-0 flex-1 truncate text-sm">{item.label}</span>
- {project && showProjectEnvironments ? (
- <ProjectEnvironmentBadge
- group={project}
- primaryEnvironmentId={primaryEnvironmentId}
- machineByEnvironmentId={environmentMachineById}
- />
- ) : null}
{project && canPinProject(project) ? (
<ProjectPinButton
name={project.displayName}
@@ -3153,6 +3146,13 @@ export default function Sidebar({ routeReveal }: { routeReveal: SidebarRouteReve
onToggle={() => toggleProjectGroupPin(project)}
/>
) : null}
+ {project && showProjectEnvironments ? (
+ <ProjectEnvironmentBadge
+ group={project}
+ primaryEnvironmentId={primaryEnvironmentId}
+ machineByEnvironmentId={environmentMachineById}
+ />
+ ) : null}
{project ? (
<Button
size="icon-xs"
diff --git a/apps/web/src/components/chat/DraftHeroHeadline.tsx b/apps/web/src/components/chat/DraftHeroHeadline.tsx
index dac76937a9c..600608a231d 100644
--- a/apps/web/src/components/chat/DraftHeroHeadline.tsx
+++ b/apps/web/src/components/chat/DraftHeroHeadline.tsx
@@ -344,13 +344,6 @@ export function DraftHeroHeadline({
</TooltipTrigger>
<TooltipPopup side="top">{item.label}</TooltipPopup>
</Tooltip>
- {entry && showProjectEnvironments ? (
- <ProjectEnvironmentBadge
- group={entry.group}
- primaryEnvironmentId={primaryEnvironmentId}
- machineByEnvironmentId={environmentMachineById}
- />
- ) : null}
{entry && canPinProjectGroup(entry.group) ? (
<ProjectPinButton
name={entry.group.displayName}
@@ -359,6 +352,13 @@ export function DraftHeroHeadline({
onToggle={() => toggleProjectGroupPin(entry.group)}
/>
) : null}
+ {entry && showProjectEnvironments ? (
+ <ProjectEnvironmentBadge
+ group={entry.group}
+ primaryEnvironmentId={primaryEnvironmentId}
+ machineByEnvironmentId={environmentMachineById}
+ />
+ ) : null}
</ComboboxItem>
);
}}