Dec 18, 2025 · Dec 18, 2025 · Dec 19, 2025 · Dec 19, 2025 · Dec 19, 2025 · Dec 19, 2025
diff --git a/site/src/components/Popover/Popover.tsx b/site/src/components/Popover/Popover.tsx
 sideOffset={sideOffset}
 collisionPadding={16}
 className={cn(
 `z-50 w-72 rounded-md border border-solid bg-surface-primary
 text-content-primary shadow-md outline-none
 data-[state=open]:animate-in data-[state=closed]:animate-out
 data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0
 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95
 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2
 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2`,
 // z-[1400] is required to appear above MUI dialogs (z-index: 1300) during
 // migration. Can be reduced to z-50 once MUI is fully removed.
 `z-[1400] w-72 rounded-md border border-solid bg-surface-primary
 text-content-primary shadow-md outline-none
 data-[state=open]:animate-in data-[state=closed]:animate-out
 data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0
 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95
 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2
 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2`,
 className,
 )}
 {...props}
diff --git a/site/src/modules/workspaces/WorkspaceMoreActions/ChangeWorkspaceVersionDialog.tsx b/site/src/modules/workspaces/WorkspaceMoreActions/ChangeWorkspaceVersionDialog.tsx
 import { FormFields } from "components/Form/Form";
 import { Loader } from "components/Loader/Loader";
 import { Pill } from "components/Pill/Pill";
 import { Stack } from "components/Stack/Stack";
 import { InfoIcon } from "lucide-react";
 import { TemplateUpdateMessage } from "modules/templates/TemplateUpdateMessage";
 import { type FC, useState } from "react";
 confirmText="Change"
 title="Change version"
 description={
 <Stack>
 <div className="flex flex-col gap-2">
 <p>You are about to change the version of this workspace.</p>
 {validVersions ? (
 <>
 />
 }
 title={
 <Stack
 direction="row"
 justifyContent="space-between"
 style={{ width: "100%" }}
 >
 <Stack
 direction="row"
 alignItems="center"
 spacing={1}
 >
 <div className="flex flex-row items-center justify-between w-full">
 <div className="flex flex-row items-center gap-1">
 {option.name}
 {option.message && (
 <InfoIcon
 aria-hidden="true"
 className="size-icon-xs"
 />
 )}
 </Stack>
 </div>
 {workspace.template_active_version_id ===
 option.id && <Pill type="success">Active</Pill>}
 </Stack>
 </div>
 }
 subtitle={createDayString(option.created_at)}
 />
 ) : (
 <Loader />
 )}
 </Stack>
 </div>
 }
 />
 );
diff --git a/site/src/pages/SetupPage/SetupPageView.tsx b/site/src/pages/SetupPage/SetupPageView.tsx
 renderOption={(option) => (
 <span className="flex-1">{`${option.flag} ${option.name}`}</span>
 )}
 placeholder={Language.countryLabel}
 label={Language.countryLabel}
 placeholder={"Select a country"}
 id="trial_info.country"
 data-testid="trial_info.country"
 />
 {form.touched.trial_info?.country &&
 form.errors.trial_info?.country && (
 <p className="text-xs text-content-danger">
 <p className="text-xs text-content-destructive">
 {form.errors.trial_info.country}
 </p>
 )}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -31,13 +31,15 @@ export const PopoverContent = forwardRef<
		sideOffset={sideOffset}
		collisionPadding={16}
		className={cn(
		`z-50 w-72 rounded-md border border-solid bg-surface-primary
		text-content-primary shadow-md outline-none
		data-[state=open]:animate-in data-[state=closed]:animate-out
		data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0
		data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95
		data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2
		data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2`,
		// z-[1400] is required to appear above MUI dialogs (z-index: 1300) during
		// migration. Can be reduced to z-50 once MUI is fully removed.
		`z-[1400] w-72 rounded-md border border-solid bg-surface-primary
		text-content-primary shadow-md outline-none
		data-[state=open]:animate-in data-[state=closed]:animate-out
		data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0
		data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95
		data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2
		data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2`,
		className,
		)}
		{...props}
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -10,7 +10,6 @@ import type { DialogProps } from "components/Dialogs/Dialog";
		import { FormFields } from "components/Form/Form";
		import { Loader } from "components/Loader/Loader";
		import { Pill } from "components/Pill/Pill";
		import { Stack } from "components/Stack/Stack";
		import { InfoIcon } from "lucide-react";
		import { TemplateUpdateMessage } from "modules/templates/TemplateUpdateMessage";
		import { type FC, useState } from "react";
Expand DownExpand Up		@@ -52,7 +51,7 @@ export const ChangeWorkspaceVersionDialog: FC<
		confirmText="Change"
		title="Change version"
		description={
		<Stack>
		<div className="flex flex-col gap-2">
		<p>You are about to change the version of this workspace.</p>
		{validVersions ? (
		<>
Expand All		@@ -77,27 +76,19 @@ export const ChangeWorkspaceVersionDialog: FC<
		/>
		}
		title={
		<Stack
		direction="row"
		justifyContent="space-between"
		style={{ width: "100%" }}
		>
		<Stack
		direction="row"
		alignItems="center"
		spacing={1}
		>
		<div className="flex flex-row items-center justify-between w-full">
		<div className="flex flex-row items-center gap-1">
		{option.name}
		{option.message && (
		<InfoIcon
		aria-hidden="true"
		className="size-icon-xs"
		/>
		)}
		</Stack>
		</div>
		{workspace.template_active_version_id ===
		option.id && <Pill type="success">Active</Pill>}
		</Stack>
		</div>
		}
		subtitle={createDayString(option.created_at)}
		/>
Expand DownExpand Up		@@ -126,7 +117,7 @@ export const ChangeWorkspaceVersionDialog: FC<
		) : (
		<Loader />
		)}
		</Stack>
		</div>
		}
		/>
		);
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -305,13 +305,14 @@ export const SetupPageView: FC<SetupPageViewProps> = ({
		renderOption={(option) => (
		<span className="flex-1">{`${option.flag} ${option.name}`}</span>
		)}
		placeholder={Language.countryLabel}
		label={Language.countryLabel}
		placeholder={"Select a country"}
		id="trial_info.country"
		data-testid="trial_info.country"
		/>
		{form.touched.trial_info?.country &&
		form.errors.trial_info?.country && (
		<p className="text-xs text-content-danger">
		<p className="text-xs text-content-destructive">
		{form.errors.trial_info.country}
		</p>
		)}
Expand Down