Skip to content

Commit

Permalink
Merge 2d92914 into b00874c
Browse files Browse the repository at this point in the history
  • Loading branch information
jonrohan authored Oct 4, 2024
2 parents b00874c + 2d92914 commit 8837795
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
16 changes: 8 additions & 8 deletions e2e/components/Avatar.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ test.describe('Avatar', () => {
id: 'components-avatar--default',
globals: {
colorScheme: theme,
primer_react_css_modules_staff: enabled,
primer_react_css_modules_ga: enabled,
},
})

Expand All @@ -26,7 +26,7 @@ test.describe('Avatar', () => {
id: 'components-avatar--default',
globals: {
colorScheme: theme,
primer_react_css_modules_staff: enabled,
primer_react_css_modules_ga: enabled,
},
})
await expect(page).toHaveNoViolations({
Expand All @@ -49,7 +49,7 @@ test.describe('Avatar', () => {
id: 'components-avatar-features--size',
globals: {
colorScheme: theme,
primer_react_css_modules_staff: enabled,
primer_react_css_modules_ga: enabled,
},
})

Expand All @@ -62,7 +62,7 @@ test.describe('Avatar', () => {
id: 'components-avatar-features--size',
globals: {
colorScheme: theme,
primer_react_css_modules_staff: enabled,
primer_react_css_modules_ga: enabled,
},
})
await expect(page).toHaveNoViolations({
Expand All @@ -85,7 +85,7 @@ test.describe('Avatar', () => {
id: 'components-avatar-features--size-responsive',
globals: {
colorScheme: theme,
primer_react_css_modules_staff: enabled,
primer_react_css_modules_ga: enabled,
},
})

Expand All @@ -98,7 +98,7 @@ test.describe('Avatar', () => {
id: 'components-avatar-features--size-responsive',
globals: {
colorScheme: theme,
primer_react_css_modules_staff: enabled,
primer_react_css_modules_ga: enabled,
},
})
await expect(page).toHaveNoViolations({
Expand All @@ -121,7 +121,7 @@ test.describe('Avatar', () => {
id: 'components-avatar-features--square',
globals: {
colorScheme: theme,
primer_react_css_modules_staff: enabled,
primer_react_css_modules_ga: enabled,
},
})

Expand All @@ -134,7 +134,7 @@ test.describe('Avatar', () => {
id: 'components-avatar-features--square',
globals: {
colorScheme: theme,
primer_react_css_modules_staff: enabled,
primer_react_css_modules_ga: enabled,
},
})
await expect(page).toHaveNoViolations({
Expand Down
2 changes: 1 addition & 1 deletion packages/react/src/Avatar/Avatar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ const Avatar = React.forwardRef<HTMLImageElement, AvatarProps>(function Avatar(
{alt = '', size = DEFAULT_AVATAR_SIZE, square = false, sx: sxProp = defaultSxProp, className, ...rest},
ref,
) {
const enabled = useFeatureFlag('primer_react_css_modules_staff')
const enabled = useFeatureFlag('primer_react_css_modules_ga')
const isResponsive = isResponsiveValue(size)
const avatarSx = isResponsive
? merge<BetterCssProperties | BetterSystemStyleObject>(
Expand Down

0 comments on commit 8837795

Please sign in to comment.