Skip to content

fix(mobile): keep the machine glyph next to the environment label#9486

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
juliusmarminge merged 1 commit into from
Sep 3, 2026
Merged

fix(mobile): keep the machine glyph next to the environment label #9486

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
83 changes: 44 additions & 39 deletions apps/mobile/src/features/threads/thread-list-v2-items.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -746,49 +746,54 @@ export const ThreadListV2Row = memo(function ThreadListV2Row(props: {
) : thread.branch || props.environmentLabel ? (
/* "branch · machine" share one truncating line. The machine sits
last so a tight fit cuts the repetitive label, not the branch —
and machine-only fills the row for non-git projects. */
<Text
className={cn(
"flex-1 text-xs",
selected ? "text-user-bubble-foreground-muted" : "text-foreground-muted",
)}
numberOfLines={1}
>
{thread.branch ? (
<Text
className={cn(
"text-xs",
selected ? "text-user-bubble-foreground-muted" : "text-foreground-muted",
)}
style={{ fontFamily: MONO_FONT }}
>
{thread.branch}
</Text>
) : null}
{thread.branch && props.environmentLabel ? " · " : null}
{props.environmentLabel ? (
<Text
className={cn(
"text-xs",
selected ? "text-user-bubble-foreground-muted" : "text-foreground-tertiary",
)}
>
{props.environmentLabel}
</Text>
and machine-only fills the row for non-git projects. The glyph
hugs the label (it cannot live inside the Text without breaking
truncation), and the wrapper takes the slack so the trailers
stay pinned right. */
<View className="min-w-0 flex-1 flex-row items-center gap-1">
<Text
className={cn(
"shrink text-xs",
selected ? "text-user-bubble-foreground-muted" : "text-foreground-muted",
)}
numberOfLines={1}
>
{thread.branch ? (
<Text
className={cn(
"text-xs",
selected ? "text-user-bubble-foreground-muted" : "text-foreground-muted",
)}
style={{ fontFamily: MONO_FONT }}
>
{thread.branch}
</Text>
) : null}
{thread.branch && props.environmentLabel ? " · " : null}
{props.environmentLabel ? (
<Text
className={cn(
"text-xs",
selected ? "text-user-bubble-foreground-muted" : "text-foreground-tertiary",
)}
>
{props.environmentLabel}
</Text>
) : null}
</Text>
{props.environmentLabel && props.environmentMachine ? (

@macroscopeappmacroscopeappBotSep 3, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🟡 Mediumthreads/thread-list-v2-items.tsx:784

Failed rows now render the machine glyph whenever environmentLabel and environmentMachine are present, including failures without lastError; this regresses the intended failed-row presentation. Restore the status !== "failed" guard on the glyph condition.

🚀 Reply "fix it for me" or copy this AI Prompt for your agent:
In file @apps/mobile/src/features/threads/thread-list-v2-items.tsx around line 784:
Failed rows now render the machine glyph whenever `environmentLabel` and `environmentMachine` are present, including failures without `lastError`; this regresses the intended failed-row presentation. Restore the `status !== "failed"` guard on the glyph condition.

@juliusmarmingejuliusmarmingeSep 3, 2026

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not a regression. The glyph now lives inside the thread.branch || environmentLabel branch, which only renders when status === "failed" && lastError is false, so a failed row that has an error message still shows the red text and no glyph, exactly as before. A failed row without an error message never had a distinct presentation: the old code also fell through to the "branch · env" line and drew the label, and the old status !== "failed" guard only suppressed the icon next to that label. Drawing the label without its glyph was an accidental asymmetry, so the glyph following the label whenever the label renders is the intended behavior.

@macroscopeappmacroscopeappBotSep 3, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This does change failed rows without lastError: the previous explicit guard hid their glyph. I found no evidence that removing that distinction was intended, so the original concern stands.

<EnvironmentMachineSymbol
kind={props.environmentMachine}
size={11}
tintColorClassName={
selected ? "accent-user-bubble-foreground-muted" : "accent-foreground-tertiary"
}
/>
) : null}
</Text>
</View>
) : (
<View className="flex-1" />
)}
{status !== "failed" && props.environmentLabel && props.environmentMachine ? (
<EnvironmentMachineSymbol
kind={props.environmentMachine}
size={11}
tintColorClassName={
selected ? "accent-user-bubble-foreground-muted" : "accent-foreground-tertiary"
}
/>
) : null}
{pr ? (
<Text
accessibilityLabel={pr.accessibilityLabel}
Expand Down
Loading