Fix syntax error in StagePanel.tsx from merge conflict artifact

Remove duplicate inline-style JSX block that was left behind after a
merge, causing esbuild parse errors. Restore hasMergeFailure border and
background colors in the cardStyle object.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
Dave
2026-02-27 11:24:46 +00:00
parent 1433115f9b
commit 15a1783d2e

View File

@@ -169,11 +169,7 @@ export function StagePanel({
const borderColor = TYPE_COLORS[itemType];
const typeLabel = TYPE_LABELS[itemType];
const hasMergeFailure = Boolean(item.merge_failure);
return (
<div
key={`${title}-${item.story_id}`}
data-testid={`card-${item.story_id}`}
style={{
const cardStyle = {
border: hasMergeFailure
? "1px solid #6e1b1b"
: item.agent
@@ -187,16 +183,6 @@ export function StagePanel({
? "#161e2a"
: "#191919",
display: "flex",
flexDirection: "column",
gap: "2px",
}}
>
const cardStyle = {
border: item.agent ? "1px solid #2a3a4a" : "1px solid #2a2a2a",
borderRadius: "8px",
padding: "8px 12px",
background: item.agent ? "#161e2a" : "#191919",
display: "flex",
flexDirection: "column" as const,
gap: "2px",
width: "100%",