From 7a7bb4656b8656a298ae0b025b5a13c3ef0b5206 Mon Sep 17 00:00:00 2001
From: Brett Kolodny <brett.kolodny@coder.com>
Date: Thu, 14 Aug 2025 13:40:24 +0000
Subject: [PATCH 01/10] chore: convert SSHButton to tailwind and use
 non-deprecated popover

---
 .../modules/resources/SSHButton/SSHButton.tsx | 34 ++++---------------
 1 file changed, 6 insertions(+), 28 deletions(-)

diff --git a/site/src/modules/resources/SSHButton/SSHButton.tsx b/site/src/modules/resources/SSHButton/SSHButton.tsx
index a1ac3c6819361..9ed8501bb32f4 100644
--- a/site/src/modules/resources/SSHButton/SSHButton.tsx
+++ b/site/src/modules/resources/SSHButton/SSHButton.tsx
@@ -1,4 +1,3 @@
-import type { Interpolation, Theme } from "@emotion/react";
 import { deploymentSSHConfig } from "api/queries/deployment";
 import { Button } from "components/Button/Button";
 import { CodeExample } from "components/CodeExample/CodeExample";
@@ -7,13 +6,12 @@ import {
 	HelpTooltipLinksGroup,
 	HelpTooltipText,
 } from "components/HelpTooltip/HelpTooltip";
-import { Stack } from "components/Stack/Stack";
 import {
 	Popover,
 	PopoverContent,
 	PopoverTrigger,
-} from "components/deprecated/Popover/Popover";
-import { type ClassName, useClassName } from "hooks/useClassName";
+} from "components/Popover/Popover";
+import { Stack } from "components/Stack/Stack";
 import { ChevronDownIcon } from "lucide-react";
 import type { FC } from "react";
 import { useQuery } from "react-query";
@@ -30,26 +28,25 @@ export const AgentSSHButton: FC<AgentSSHButtonProps> = ({
 	agentName,
 	workspaceOwnerUsername,
 }) => {
-	const paper = useClassName(classNames.paper, []);
 	const { data } = useQuery(deploymentSSHConfig());
 	const sshSuffix = data?.hostname_suffix;
 
 	return (
 		<Popover>
-			<PopoverTrigger>
+			<PopoverTrigger asChild={true}>
 				<Button size="sm" variant="subtle">
 					Connect via SSH
 					<ChevronDownIcon />
 				</Button>
 			</PopoverTrigger>
 
-			<PopoverContent horizontal="right" classes={{ paper }}>
+			<PopoverContent className="py-4 px-6 w-80 text-content-secondary mt-[2px] bg-surface-secondary">
 				<HelpTooltipText>
 					Run the following commands to connect with SSH:
 				</HelpTooltipText>
 
 				<ol style={{ margin: 0, padding: 0 }}>
-					<Stack spacing={0.5} css={styles.codeExamples}>
+					<Stack spacing={0.5} className="mt-3">
 						<SSHStep
 							helpText="Configure SSH hosts on machine:"
 							codeExample="coder config-ssh"
@@ -93,27 +90,8 @@ interface SSHStepProps {
 const SSHStep: FC<SSHStepProps> = ({ helpText, codeExample }) => (
 	<li style={{ listStylePosition: "inside" }}>
 		<HelpTooltipText style={{ display: "inline" }}>
-			<strong css={styles.codeExampleLabel}>{helpText}</strong>
+			<strong className="text-xs">{helpText}</strong>
 		</HelpTooltipText>
 		<CodeExample secret={false} code={codeExample} />
 	</li>
 );
-
-const classNames = {
-	paper: (css, theme) => css`
-		padding: 16px 24px 24px;
-		width: 304px;
-		color: ${theme.palette.text.secondary};
-		margin-top: 2px;
-	`,
-} satisfies Record<string, ClassName>;
-
-const styles = {
-	codeExamples: {
-		marginTop: 12,
-	},
-
-	codeExampleLabel: {
-		fontSize: 12,
-	},
-} satisfies Record<string, Interpolation<Theme>>;

From c248d6bb98da4322cee50568700a6cda234f0f85 Mon Sep 17 00:00:00 2001
From: Brett Kolodny <brett.kolodny@coder.com>
Date: Thu, 14 Aug 2025 13:45:41 +0000
Subject: [PATCH 02/10] chore: convert AppLink to tailwind

---
 site/src/modules/resources/AppLink/AppLink.tsx | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/site/src/modules/resources/AppLink/AppLink.tsx b/site/src/modules/resources/AppLink/AppLink.tsx
index 637f0287a4088..5d27eae8a9630 100644
--- a/site/src/modules/resources/AppLink/AppLink.tsx
+++ b/site/src/modules/resources/AppLink/AppLink.tsx
@@ -1,4 +1,3 @@
-import { useTheme } from "@emotion/react";
 import type * as TypesGen from "api/typesGenerated";
 import { DropdownMenuItem } from "components/DropdownMenu/DropdownMenu";
 import { Spinner } from "components/Spinner/Spinner";
@@ -41,7 +40,6 @@ export const AppLink: FC<AppLinkProps> = ({
 	const { proxy } = useProxy();
 	const host = proxy.preferredWildcardHostname;
 	const [iconError, setIconError] = useState(false);
-	const theme = useTheme();
 	const link = useAppLink(app, { agent, workspace });
 
 	// canClick is ONLY false when it's a subdomain app and the admin hasn't
@@ -64,8 +62,7 @@ export const AppLink: FC<AppLinkProps> = ({
 		icon = (
 			<CircleAlertIcon
 				aria-hidden="true"
-				className="size-icon-sm"
-				css={{ color: theme.palette.warning.light }}
+				className="size-icon-sm text-content-warning"
 			/>
 		);
 		primaryTooltip = "Unhealthy";
@@ -76,8 +73,7 @@ export const AppLink: FC<AppLinkProps> = ({
 		icon = (
 			<CircleAlertIcon
 				aria-hidden="true"
-				className="size-icon-sm"
-				css={{ color: theme.palette.grey[300] }}
+				className="size-icon-sm text-content-secondary"
 			/>
 		);
 		primaryTooltip =

From 062ff52f20b018aae32a92804fde9156c1e0d330 Mon Sep 17 00:00:00 2001
From: Brett Kolodny <brett.kolodny@coder.com>
Date: Thu, 14 Aug 2025 13:50:51 +0000
Subject: [PATCH 03/10] chore: convert Resources component to tailwind

---
 site/src/modules/resources/Resources.tsx | 23 +++--------------------
 1 file changed, 3 insertions(+), 20 deletions(-)

diff --git a/site/src/modules/resources/Resources.tsx b/site/src/modules/resources/Resources.tsx
index 18c2a65db30ac..df33d8f3de454 100644
--- a/site/src/modules/resources/Resources.tsx
+++ b/site/src/modules/resources/Resources.tsx
@@ -1,4 +1,3 @@
-import { type Interpolation, type Theme, useTheme } from "@emotion/react";
 import Button from "@mui/material/Button";
 import type { WorkspaceAgent, WorkspaceResource } from "api/typesGenerated";
 import { DropdownArrow } from "components/DropdownArrow/DropdownArrow";
@@ -16,7 +15,6 @@ interface ResourcesProps {
 }
 
 export const Resources: FC<ResourcesProps> = ({ resources, agentRow }) => {
-	const theme = useTheme();
 	const [shouldDisplayHideResources, setShouldDisplayHideResources] =
 		useState(false);
 	const displayResources = shouldDisplayHideResources
@@ -31,7 +29,7 @@ export const Resources: FC<ResourcesProps> = ({ resources, agentRow }) => {
 		<Stack
 			direction="column"
 			spacing={0}
-			css={{ background: theme.palette.background.default }}
+			className="bg-surface-primary"
 		>
 			{displayResources.map((resource) => (
 				<ResourceCard
@@ -41,9 +39,9 @@ export const Resources: FC<ResourcesProps> = ({ resources, agentRow }) => {
 				/>
 			))}
 			{hasHideResources && (
-				<div css={styles.buttonWrapper}>
+				<div className="flex items-center justify-center mt-4">
 					<Button
-						css={styles.showMoreButton}
+						className="rounded-full w-full max-w-[260px]"
 						size="small"
 						onClick={() => setShouldDisplayHideResources((v) => !v)}
 					>
@@ -55,18 +53,3 @@ export const Resources: FC<ResourcesProps> = ({ resources, agentRow }) => {
 		</Stack>
 	);
 };
-
-const styles = {
-	buttonWrapper: {
-		display: "flex",
-		alignItems: "center",
-		justifyContent: "center",
-		marginTop: 16,
-	},
-
-	showMoreButton: {
-		borderRadius: 9999,
-		width: "100%",
-		maxWidth: 260,
-	},
-} satisfies Record<string, Interpolation<Theme>>;

From 79eec1982568c5ce76b2364288396ac75661a469 Mon Sep 17 00:00:00 2001
From: Brett Kolodny <brett.kolodny@coder.com>
Date: Thu, 14 Aug 2025 13:51:08 +0000
Subject: [PATCH 04/10] chore: fmt

---
 site/src/modules/resources/Resources.tsx | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/site/src/modules/resources/Resources.tsx b/site/src/modules/resources/Resources.tsx
index df33d8f3de454..b68fe4b8d0e80 100644
--- a/site/src/modules/resources/Resources.tsx
+++ b/site/src/modules/resources/Resources.tsx
@@ -26,11 +26,7 @@ export const Resources: FC<ResourcesProps> = ({ resources, agentRow }) => {
 	const hasHideResources = resources.some((r) => r.hide);
 
 	return (
-		<Stack
-			direction="column"
-			spacing={0}
-			className="bg-surface-primary"
-		>
+		<Stack direction="column" spacing={0} className="bg-surface-primary">
 			{displayResources.map((resource) => (
 				<ResourceCard
 					key={resource.id}

From 252793cca2c38e0f29efcceadd950ce855993473 Mon Sep 17 00:00:00 2001
From: Brett Kolodny <brett.kolodny@coder.com>
Date: Thu, 14 Aug 2025 14:03:10 +0000
Subject: [PATCH 05/10] chore: convert AppPreview component totailwind

---
 site/src/modules/resources/AppLink/AppPreview.tsx | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/site/src/modules/resources/AppLink/AppPreview.tsx b/site/src/modules/resources/AppLink/AppPreview.tsx
index 2f86297e05343..8254164f9ce65 100644
--- a/site/src/modules/resources/AppLink/AppPreview.tsx
+++ b/site/src/modules/resources/AppLink/AppPreview.tsx
@@ -4,20 +4,7 @@ import type { FC, PropsWithChildren } from "react";
 export const AppPreview: FC<PropsWithChildren> = ({ children }) => {
 	return (
 		<Stack
-			css={(theme) => ({
-				padding: "2px 12px",
-				borderRadius: 9999,
-				border: `1px solid ${theme.palette.divider}`,
-				color: theme.palette.text.primary,
-				background: theme.palette.background.paper,
-				flexShrink: 0,
-				width: "fit-content",
-				fontSize: 12,
-
-				"& img, & svg": {
-					width: 13,
-				},
-			})}
+			className="flex items-center h-8 px-3 rounded-full border border-solid border-surface-quaternary text-content-primary bg-surface-secondary flex-shrink-0 w-fit text-xs [&>svg]:w-[13px] [&>img]:w-[13px]"
 			alignItems="center"
 			direction="row"
 			spacing={1}

From db61095b5425371f8627d3a5a76410ae2006bca7 Mon Sep 17 00:00:00 2001
From: Brett Kolodny <brett.kolodny@coder.com>
Date: Thu, 14 Aug 2025 14:18:50 +0000
Subject: [PATCH 06/10] chore: convert AgentMetadata to tailwind

---
 site/src/modules/resources/AgentMetadata.tsx | 95 ++++----------------
 1 file changed, 16 insertions(+), 79 deletions(-)

diff --git a/site/src/modules/resources/AgentMetadata.tsx b/site/src/modules/resources/AgentMetadata.tsx
index 5c6986a4dc618..e54b8336e689c 100644
--- a/site/src/modules/resources/AgentMetadata.tsx
+++ b/site/src/modules/resources/AgentMetadata.tsx
@@ -1,4 +1,3 @@
-import type { Interpolation, Theme } from "@emotion/react";
 import Skeleton from "@mui/material/Skeleton";
 import Tooltip from "@mui/material/Tooltip";
 import { watchAgentMetadata } from "api/api";
@@ -18,8 +17,8 @@ import {
 	useRef,
 	useState,
 } from "react";
-import { MONOSPACE_FONT_FAMILY } from "theme/constants";
 import type { OneWayWebSocket } from "utils/OneWayWebSocket";
+import { cn } from "utils/cn";
 
 type ItemStatus = "stale" | "valid" | "loading";
 
@@ -32,7 +31,7 @@ export const AgentMetadataView: FC<AgentMetadataViewProps> = ({ metadata }) => {
 		return null;
 	}
 	return (
-		<section css={styles.root}>
+		<section className="flex items-baseline flex-wrap gap-8 gap-y-4">
 			{metadata.map((m) => (
 				<MetadataItem key={m.description.key} item={m} />
 			))}
@@ -122,7 +121,7 @@ export const AgentMetadata: FC<AgentMetadataProps> = ({
 
 	if (activeMetadata === undefined) {
 		return (
-			<section css={styles.root}>
+			<section className="flex items-baseline flex-wrap gap-8 gap-y-4">
 				<AgentMetadataSkeleton />
 			</section>
 		);
@@ -134,17 +133,17 @@ export const AgentMetadata: FC<AgentMetadataProps> = ({
 const AgentMetadataSkeleton: FC = () => {
 	return (
 		<Stack alignItems="baseline" direction="row" spacing={6}>
-			<div css={styles.metadata}>
+			<div className="leading-relaxed flex flex-col overflow-visible flex-shrink-0">
 				<Skeleton width={40} height={12} variant="text" />
 				<Skeleton width={65} height={14} variant="text" />
 			</div>
 
-			<div css={styles.metadata}>
+			<div className="leading-relaxed flex flex-col overflow-visible flex-shrink-0">
 				<Skeleton width={40} height={12} variant="text" />
 				<Skeleton width={65} height={14} variant="text" />
 			</div>
 
-			<div css={styles.metadata}>
+			<div className="leading-relaxed flex flex-col overflow-visible flex-shrink-0">
 				<Skeleton width={40} height={12} variant="text" />
 				<Skeleton width={65} height={14} variant="text" />
 			</div>
@@ -182,29 +181,29 @@ const MetadataItem: FC<MetadataItemProps> = ({ item }) => {
 	// could be buggy. But, how common is that anyways?
 	const value =
 		status === "loading" ? (
-			<Skeleton width={65} height={12} variant="text" css={styles.skeleton} />
+			<Skeleton width={65} height={12} variant="text" className="mt-[6px]" />
 		) : status === "stale" ? (
 			<Tooltip title="This data is stale and no longer up to date">
-				<StaticWidth css={[styles.metadataValue, styles.metadataStale]}>
+				<StaticWidth className="text-ellipsis overflow-hidden whitespace-nowrap max-w-64 text-sm text-content-disabled cursor-pointer">
 					{item.result.value}
 				</StaticWidth>
 			</Tooltip>
 		) : (
 			<StaticWidth
-				css={[
-					styles.metadataValue,
-					item.result.error.length === 0
-						? styles.metadataValueSuccess
-						: styles.metadataValueError,
-				]}
+				className={cn(
+					"text-ellipsis overflow-hidden whitespace-nowrap max-w-64 text-sm text-content-success",
+					item.result.error.length > 0 && "text-content-destructive",
+				)}
 			>
 				{item.result.value}
 			</StaticWidth>
 		);
 
 	return (
-		<div css={styles.metadata}>
-			<div css={styles.metadataLabel}>{item.description.display_name}</div>
+		<div className="leading-relaxed flex flex-col overflow-visible flex-shrink-0">
+			<div className="text-content-secondary text-ellipsis overflow-hidden whitespace-nowrap text-[13px]">
+				{item.description.display_name}
+			</div>
 			<div>{value}</div>
 		</div>
 	);
@@ -236,65 +235,3 @@ const StaticWidth: FC<HTMLAttributes<HTMLDivElement>> = ({
 		</div>
 	);
 };
-
-// These are more or less copied from
-// site/src/modules/resources/ResourceCard.tsx
-const styles = {
-	root: {
-		display: "flex",
-		alignItems: "baseline",
-		flexWrap: "wrap",
-		gap: 32,
-		rowGap: 16,
-	},
-
-	metadata: {
-		lineHeight: "1.6",
-		display: "flex",
-		flexDirection: "column",
-		overflow: "visible",
-		flexShrink: 0,
-	},
-
-	metadataLabel: (theme) => ({
-		color: theme.palette.text.secondary,
-		textOverflow: "ellipsis",
-		overflow: "hidden",
-		whiteSpace: "nowrap",
-		fontSize: 13,
-	}),
-
-	metadataValue: {
-		textOverflow: "ellipsis",
-		overflow: "hidden",
-		whiteSpace: "nowrap",
-		maxWidth: "16em",
-		fontSize: 14,
-	},
-
-	metadataValueSuccess: (theme) => ({
-		color: theme.roles.success.fill.outline,
-	}),
-
-	metadataValueError: (theme) => ({
-		color: theme.palette.error.main,
-	}),
-
-	metadataStale: (theme) => ({
-		color: theme.palette.text.disabled,
-		cursor: "pointer",
-	}),
-
-	skeleton: {
-		marginTop: 4,
-	},
-
-	inlineCommand: (theme) => ({
-		fontFamily: MONOSPACE_FONT_FAMILY,
-		display: "inline-block",
-		fontWeight: 600,
-		margin: 0,
-		borderRadius: 4,
-		color: theme.palette.text.primary,
-	}),
-} satisfies Record<string, Interpolation<Theme>>;

From a83f163df36e4ff64cc41e640551c14d2ef1259d Mon Sep 17 00:00:00 2001
From: Brett Kolodny <brett.kolodny@coder.com>
Date: Thu, 14 Aug 2025 14:41:09 +0000
Subject: [PATCH 07/10] chore: fmt

---
 site/src/modules/resources/AgentMetadata.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/site/src/modules/resources/AgentMetadata.tsx b/site/src/modules/resources/AgentMetadata.tsx
index e54b8336e689c..6c47b427a979a 100644
--- a/site/src/modules/resources/AgentMetadata.tsx
+++ b/site/src/modules/resources/AgentMetadata.tsx
@@ -17,8 +17,8 @@ import {
 	useRef,
 	useState,
 } from "react";
-import type { OneWayWebSocket } from "utils/OneWayWebSocket";
 import { cn } from "utils/cn";
+import type { OneWayWebSocket } from "utils/OneWayWebSocket";
 
 type ItemStatus = "stale" | "valid" | "loading";
 

From 46ed6fbf52726555d86160309ef8d9ad4e7b9e18 Mon Sep 17 00:00:00 2001
From: Brett Kolodny <brett.kolodny@coder.com>
Date: Thu, 14 Aug 2025 14:46:58 +0000
Subject: [PATCH 08/10] chore: convert AgentOutdatedTooltip to tailwind and
 replace deprecated component

---
 .../src/modules/resources/AgentOutdatedTooltip.tsx | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/site/src/modules/resources/AgentOutdatedTooltip.tsx b/site/src/modules/resources/AgentOutdatedTooltip.tsx
index c961def910589..6c196b593b1b2 100644
--- a/site/src/modules/resources/AgentOutdatedTooltip.tsx
+++ b/site/src/modules/resources/AgentOutdatedTooltip.tsx
@@ -1,4 +1,3 @@
-import { useTheme } from "@emotion/react";
 import type { WorkspaceAgent } from "api/typesGenerated";
 import {
 	HelpTooltip,
@@ -8,8 +7,8 @@ import {
 	HelpTooltipText,
 	HelpTooltipTitle,
 } from "components/HelpTooltip/HelpTooltip";
+import { PopoverTrigger } from "components/Popover/Popover";
 import { Stack } from "components/Stack/Stack";
-import { PopoverTrigger } from "components/deprecated/Popover/Popover";
 import { RotateCcwIcon } from "lucide-react";
 import type { FC } from "react";
 import { agentVersionStatus } from "../../utils/workspace";
@@ -27,11 +26,6 @@ export const AgentOutdatedTooltip: FC<AgentOutdatedTooltipProps> = ({
 	status,
 	onUpdate,
 }) => {
-	const theme = useTheme();
-	const versionLabelStyles = {
-		fontWeight: 600,
-		color: theme.palette.text.primary,
-	};
 	const title =
 		status === agentVersionStatus.Outdated
 			? "Agent Outdated"
@@ -45,7 +39,7 @@ export const AgentOutdatedTooltip: FC<AgentOutdatedTooltipProps> = ({
 	return (
 		<HelpTooltip>
 			<PopoverTrigger>
-				<span role="status" css={{ cursor: "pointer" }}>
+				<span role="status" className="cursor-pointer">
 					{status === agentVersionStatus.Outdated ? "Outdated" : "Deprecated"}
 				</span>
 			</PopoverTrigger>
@@ -57,12 +51,12 @@ export const AgentOutdatedTooltip: FC<AgentOutdatedTooltipProps> = ({
 					</div>
 
 					<Stack spacing={0.5}>
-						<span css={versionLabelStyles}>Agent version</span>
+						<span  className="font-semibold text-content-primary">Agent version</span>
 						<span>{agent.version}</span>
 					</Stack>
 
 					<Stack spacing={0.5}>
-						<span css={versionLabelStyles}>Server version</span>
+						<span className="font-semibold text-content-primary">Server version</span>
 						<span>{serverVersion}</span>
 					</Stack>
 

From ec714e8848c4316ccc8681d4e5185ad3e8d6e863 Mon Sep 17 00:00:00 2001
From: Brett Kolodny <brett.kolodny@coder.com>
Date: Thu, 14 Aug 2025 15:32:30 +0000
Subject: [PATCH 09/10] chore: format

---
 site/src/modules/resources/AgentMetadata.tsx        | 2 +-
 site/src/modules/resources/AgentOutdatedTooltip.tsx | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/site/src/modules/resources/AgentMetadata.tsx b/site/src/modules/resources/AgentMetadata.tsx
index 6c47b427a979a..e54b8336e689c 100644
--- a/site/src/modules/resources/AgentMetadata.tsx
+++ b/site/src/modules/resources/AgentMetadata.tsx
@@ -17,8 +17,8 @@ import {
 	useRef,
 	useState,
 } from "react";
-import { cn } from "utils/cn";
 import type { OneWayWebSocket } from "utils/OneWayWebSocket";
+import { cn } from "utils/cn";
 
 type ItemStatus = "stale" | "valid" | "loading";
 
diff --git a/site/src/modules/resources/AgentOutdatedTooltip.tsx b/site/src/modules/resources/AgentOutdatedTooltip.tsx
index 6c196b593b1b2..36959498cb282 100644
--- a/site/src/modules/resources/AgentOutdatedTooltip.tsx
+++ b/site/src/modules/resources/AgentOutdatedTooltip.tsx
@@ -51,12 +51,16 @@ export const AgentOutdatedTooltip: FC<AgentOutdatedTooltipProps> = ({
 					</div>
 
 					<Stack spacing={0.5}>
-						<span  className="font-semibold text-content-primary">Agent version</span>
+						<span className="font-semibold text-content-primary">
+							Agent version
+						</span>
 						<span>{agent.version}</span>
 					</Stack>
 
 					<Stack spacing={0.5}>
-						<span className="font-semibold text-content-primary">Server version</span>
+						<span className="font-semibold text-content-primary">
+							Server version
+						</span>
 						<span>{serverVersion}</span>
 					</Stack>
 

From 54836cbb7dbba876377788ffe76ab51736ed7f29 Mon Sep 17 00:00:00 2001
From: Brett Kolodny <brett.kolodny@coder.com>
Date: Thu, 14 Aug 2025 19:57:27 +0000
Subject: [PATCH 10/10] fix: keep using deprecated popover

---
 site/src/modules/resources/AgentOutdatedTooltip.tsx | 2 +-
 site/src/modules/resources/AgentRow.stories.tsx     | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/site/src/modules/resources/AgentOutdatedTooltip.tsx b/site/src/modules/resources/AgentOutdatedTooltip.tsx
index 36959498cb282..c6ba613c6b348 100644
--- a/site/src/modules/resources/AgentOutdatedTooltip.tsx
+++ b/site/src/modules/resources/AgentOutdatedTooltip.tsx
@@ -7,7 +7,7 @@ import {
 	HelpTooltipText,
 	HelpTooltipTitle,
 } from "components/HelpTooltip/HelpTooltip";
-import { PopoverTrigger } from "components/Popover/Popover";
+import { PopoverTrigger } from "components/deprecated/Popover/Popover";
 import { Stack } from "components/Stack/Stack";
 import { RotateCcwIcon } from "lucide-react";
 import type { FC } from "react";
diff --git a/site/src/modules/resources/AgentRow.stories.tsx b/site/src/modules/resources/AgentRow.stories.tsx
index 6717c0e6043ab..abf4db3e295ae 100644
--- a/site/src/modules/resources/AgentRow.stories.tsx
+++ b/site/src/modules/resources/AgentRow.stories.tsx
@@ -1,7 +1,3 @@
-import type { Meta, StoryObj } from "@storybook/react-vite";
-import { API } from "api/api";
-import { getPreferredProxy } from "contexts/ProxyContext";
-import { spyOn, userEvent, within } from "storybook/test";
 import { chromatic } from "testHelpers/chromatic";
 import * as M from "testHelpers/entities";
 import {
@@ -9,6 +5,10 @@ import {
 	withProxyProvider,
 	withWebSocket,
 } from "testHelpers/storybook";
+import type { Meta, StoryObj } from "@storybook/react-vite";
+import { API } from "api/api";
+import { getPreferredProxy } from "contexts/ProxyContext";
+import { spyOn, userEvent, within } from "storybook/test";
 import { AgentRow } from "./AgentRow";
 
 const defaultAgentMetadata = [