Fix merges

BrunoQuaresma · BrunoQuaresma · commit 199a13e4ef23 · 2025-08-26T15:32:58.000Z
diff --git a/site/src/pages/TaskPage/TaskPage.tsx b/site/src/pages/TaskPage/TaskPage.tsx
@@ -219,6 +219,12 @@ const TaskBuildingWorkspace: FC<TaskBuildingWorkspaceProps> = ({ task }) => {
 					</header>
 
 					<div className="w-full max-w-screen-lg flex flex-col gap-4 overflow-hidden">
+						<WorkspaceBuildProgress
+							workspace={task.workspace}
+							transitionStats={transitionStats}
+							variant="task"
+						/>
+
 						<ScrollArea
 							ref={scrollAreaRef}
 							className="h-96 border border-solid border-border rounded-lg"
@@ -229,12 +235,6 @@ const TaskBuildingWorkspace: FC<TaskBuildingWorkspaceProps> = ({ task }) => {
 								logs={buildLogs ?? []}
 							/>
 						</ScrollArea>
-
-						<WorkspaceBuildProgress
-							workspace={task.workspace}
-							transitionStats={transitionStats}
-							variant="task"
-						/>
 					</div>
 				</div>
 			</div>
diff --git a/site/src/pages/TaskPage/TaskTopbar.tsx b/site/src/pages/TaskPage/TaskTopbar.tsx
@@ -22,7 +22,7 @@ type TaskTopbarProps = { task: Task };
 
 export const TaskTopbar: FC<TaskTopbarProps> = ({ task }) => {
 	return (
-		<header className="flex items-center px-3 py-4 border-solid border-border border-0 border-b">
+		<header className="flex flex-shrink-0 items-center px-3 py-4 border-solid border-border border-0 border-b">
 			<TooltipProvider>
 				<Tooltip>
 					<TooltipTrigger asChild>
