Fix missed src

BrunoQuaresma · BrunoQuaresma · commit 37a678ddb84c · 2024-12-19T15:05:38.000Z
diff --git a/site/src/components/Avatar/Avatar.tsx b/site/src/components/Avatar/Avatar.tsx
@@ -54,7 +54,7 @@ const avatarVariants = cva(
 	},
 );
 
-export type AvatarProps = Omit<AvatarPrimitive.AvatarProps, "children"> &
+export type AvatarProps = AvatarPrimitive.AvatarProps &
 	VariantProps<typeof avatarVariants> & {
 		src?: string;
 		alt?: string;
@@ -64,28 +64,35 @@ export type AvatarProps = Omit<AvatarPrimitive.AvatarProps, "children"> &
 const Avatar = React.forwardRef<
 	React.ElementRef<typeof AvatarPrimitive.Root>,
 	AvatarProps
->(({ className, size, variant, alt, fallback, ...props }, ref) => {
-	const theme = useTheme();
+>(
+	(
+		{ className, size, variant, src, alt, fallback, children, ...props },
+		ref,
+	) => {
+		const theme = useTheme();
 
-	return (
-		<AvatarPrimitive.Root
-			ref={ref}
-			className={cn(avatarVariants({ size, variant, className }))}
-			{...props}
-		>
-			<AvatarPrimitive.Image
-				className="aspect-square h-full w-full object-contain"
-				css={getExternalImageStylesFromUrl(theme.externalImages, props.src)}
-				alt={alt}
-			/>
-			{fallback && (
-				<AvatarPrimitive.Fallback className="flex h-full w-full items-center justify-center rounded-full">
-					{fallback.charAt(0).toUpperCase()}
-				</AvatarPrimitive.Fallback>
-			)}
-		</AvatarPrimitive.Root>
-	);
-});
+		return (
+			<AvatarPrimitive.Root
+				ref={ref}
+				className={cn(avatarVariants({ size, variant, className }))}
+				{...props}
+			>
+				<AvatarPrimitive.Image
+					src={src}
+					className="aspect-square h-full w-full object-contain"
+					css={getExternalImageStylesFromUrl(theme.externalImages, src)}
+					alt={alt}
+				/>
+				{fallback && (
+					<AvatarPrimitive.Fallback className="flex h-full w-full items-center justify-center rounded-full">
+						{fallback.charAt(0).toUpperCase()}
+					</AvatarPrimitive.Fallback>
+				)}
+				{children}
+			</AvatarPrimitive.Root>
+		);
+	},
+);
 Avatar.displayName = AvatarPrimitive.Root.displayName;
 
 export { Avatar };
diff --git a/site/src/modules/builds/BuildAvatar/BuildAvatar.tsx b/site/src/modules/builds/BuildAvatar/BuildAvatar.tsx
@@ -1,6 +1,4 @@
-import { css, cx } from "@emotion/css";
 import { useTheme } from "@emotion/react";
-import Badge from "@mui/material/Badge";
 import type { WorkspaceBuild } from "api/typesGenerated";
 import { Avatar, type AvatarProps } from "components/Avatar/Avatar";
 import { BuildIcon } from "components/BuildIcon/BuildIcon";
diff --git a/site/src/modules/management/OrganizationSettingsLayout.tsx b/site/src/modules/management/OrganizationSettingsLayout.tsx
@@ -8,13 +8,13 @@ import {
 	BreadcrumbSeparator,
 } from "components/Breadcrumb/Breadcrumb";
 import { Loader } from "components/Loader/Loader";
-import { UserAvatar } from "components/UserAvatar/UserAvatar";
 import { useAuthenticated } from "contexts/auth/RequireAuth";
 import { RequirePermission } from "contexts/auth/RequirePermission";
 import { useDashboard } from "modules/dashboard/useDashboard";
 import { type FC, Suspense, createContext, useContext } from "react";
 import { Outlet, useParams } from "react-router-dom";
 import { OrganizationSidebar } from "./OrganizationSidebar";
+import { UserAvatar } from "modules/users/UserAvatar/UserAvatar";
 
 export const OrganizationSettingsContext = createContext<
 	OrganizationSettingsValue | undefined
@@ -92,7 +92,7 @@ const OrganizationSettingsLayout: FC = () => {
 										<BreadcrumbPage className="text-content-primary">
 											<UserAvatar
 												key={organization.id}
-												size="xs"
+												size="sm"
 												username={organization.display_name}
 												avatarURL={organization.icon}
 											/>
