{/* @ts-expect-error - disable because of non-ts component and type mismatch */}
diff --git a/src/ui/Avatar/Avatar.jsx b/src/ui/Avatar/Avatar.jsx
index cb458ee00e..89ba5dcdc8 100644
--- a/src/ui/Avatar/Avatar.jsx
+++ b/src/ui/Avatar/Avatar.jsx
@@ -1,15 +1,19 @@
-import cs from 'classnames'
import PropTypes from 'prop-types'
import { useImage } from 'services/image'
+import { cn } from 'shared/utils/cn'
import AvatarSVG from './AvatarSVG'
-let baseClasses = 'rounded-full h-6 w-6 flex items-center justify-center'
-let borderedClasses = 'border-ds-grey-secondary border-2'
+const baseClasses = 'rounded-full h-6 w-6 flex items-center justify-center'
+const borderClasses = {
+ none: '',
+ light: 'border-ds-gray-secondary border-2',
+ dark: 'border-ds-gray-octonary border-2',
+}
-function Avatar({ user, bordered, ariaLabel }) {
- const classes = cs(baseClasses, bordered ? borderedClasses : '')
+function Avatar({ user, border = 'none', ariaLabel }) {
+ const classes = cn(baseClasses, borderClasses[border])
const { src, error, isLoading } = useImage({
src: user?.avatarUrl,
@@ -36,7 +40,7 @@ Avatar.propTypes = {
username: PropTypes.string.isRequired,
avatarUrl: PropTypes.string,
}),
- bordered: PropTypes.bool,
+ border: PropTypes.oneOf(['light', 'dark', 'none']),
ariaLabel: PropTypes.string,
}
diff --git a/src/ui/ContextSwitcher/ContextSwitcher.jsx b/src/ui/ContextSwitcher/ContextSwitcher.jsx
index 43cee1ed8e..71c0c4461c 100644
--- a/src/ui/ContextSwitcher/ContextSwitcher.jsx
+++ b/src/ui/ContextSwitcher/ContextSwitcher.jsx
@@ -53,7 +53,7 @@ function ContextItem({ context, defaultOrgUsername, setToggle, owner }) {
mutate({ username: orgUsername })
}}
>
-
+
{orgUsername}
@@ -146,7 +146,7 @@ function ContextSwitcher({
aria-expanded={toggle}
onClick={() => setToggle((toggle) => !toggle)}
>
-
+
{activeContext?.username}
{
name: org.username,
value: (
),