From 2d92914aea6027c4be4676344f2fb3a49a0d9367 Mon Sep 17 00:00:00 2001
From: Jon Rohan <yes@jonrohan.codes>
Date: Thu, 3 Oct 2024 23:43:01 +0000
Subject: [PATCH 1/2] Move Avatar feature flag from staff to ga

---
 e2e/components/Avatar.test.ts        | 16 ++++++++--------
 packages/react/src/Avatar/Avatar.tsx |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/e2e/components/Avatar.test.ts b/e2e/components/Avatar.test.ts
index 3fd9ec03779..e739d794124 100644
--- a/e2e/components/Avatar.test.ts
+++ b/e2e/components/Avatar.test.ts
@@ -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,
                 },
               })
 
@@ -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({
@@ -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,
                 },
               })
 
@@ -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({
@@ -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,
                 },
               })
 
@@ -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({
@@ -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,
                 },
               })
 
@@ -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({
diff --git a/packages/react/src/Avatar/Avatar.tsx b/packages/react/src/Avatar/Avatar.tsx
index 79d7a1dfefb..4f5f066a147 100644
--- a/packages/react/src/Avatar/Avatar.tsx
+++ b/packages/react/src/Avatar/Avatar.tsx
@@ -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>(

From 45c2a14d5ac4f1203352a3bfcd90411159266444 Mon Sep 17 00:00:00 2001
From: Jon Rohan <yes@jonrohan.codes>
Date: Thu, 3 Oct 2024 17:04:36 -0700
Subject: [PATCH 2/2] Create five-seas-scream.md

---
 .changeset/five-seas-scream.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changeset/five-seas-scream.md

diff --git a/.changeset/five-seas-scream.md b/.changeset/five-seas-scream.md
new file mode 100644
index 00000000000..3f7aac42e6a
--- /dev/null
+++ b/.changeset/five-seas-scream.md
@@ -0,0 +1,5 @@
+---
+"@primer/react": patch
+---
+
+Move CSS modules feature flag from staff to ga for Avatar component