From 3b80e63b0138a06fb6eede306294b6e7a39295f3 Mon Sep 17 00:00:00 2001
From: Abhi <abhinandan13jan@gmail.com>
Date: Mon, 5 Aug 2024 17:54:34 +0530
Subject: [PATCH 1/2] fix(workspace): update user access tooltip

---
 .../UserAccess/UserAccessForm/UsernameSection.tsx         | 8 ++++----
 .../UserAccessForm/__tests__/UsernameSection.spec.tsx     | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/components/UserAccess/UserAccessForm/UsernameSection.tsx b/src/components/UserAccess/UserAccessForm/UsernameSection.tsx
index ef476ab23..636a0c210 100644
--- a/src/components/UserAccess/UserAccessForm/UsernameSection.tsx
+++ b/src/components/UserAccess/UserAccessForm/UsernameSection.tsx
@@ -68,9 +68,9 @@ export const UsernameSection: React.FC<React.PropsWithChildren<Props>> = ({ disa
         label="Enter usernames"
         labelIcon={
           <HelpPopover
-            aria-label="Usernames in RHTAP"
-            headerContent="Usernames in RHTAP"
-            bodyContent="To find their username, the user you want to invite should log into RHTAP and click Workspaces. Their username is the first item in the breadcrumb navigation."
+            aria-label="Usernames in KONFLUX"
+            headerContent="Usernames in KONFLUX"
+            bodyContent="Your username is the name of your default workspace. To find a list of your workspaces, navigate to the Applications pane and select the options icon in the breadcrumb navigation."
           />
         }
         isRequired
@@ -116,7 +116,7 @@ export const UsernameSection: React.FC<React.PropsWithChildren<Props>> = ({ disa
               </HelperTextItem>
             ) : (
               <HelperTextItem>
-                Provide RHTAP usernames for the users you want to invite.
+                Provide KONFLUX usernames for the users you want to invite.
               </HelperTextItem>
             )}
           </HelperText>
diff --git a/src/components/UserAccess/UserAccessForm/__tests__/UsernameSection.spec.tsx b/src/components/UserAccess/UserAccessForm/__tests__/UsernameSection.spec.tsx
index cddb978b1..18508e21d 100644
--- a/src/components/UserAccess/UserAccessForm/__tests__/UsernameSection.spec.tsx
+++ b/src/components/UserAccess/UserAccessForm/__tests__/UsernameSection.spec.tsx
@@ -47,7 +47,7 @@ describe('UsernameSection', () => {
     validateMock.mockResolvedValue(false);
     formikRenderer(<UsernameSection />, { usernames: [] });
     expect(
-      screen.getByText('Provide RHTAP usernames for the users you want to invite.'),
+      screen.getByText('Provide KONFLUX usernames for the users you want to invite.'),
     ).toBeVisible();
     await act(async () => {
       fireEvent.input(screen.getByRole('searchbox'), { target: { value: 'user!@#' } });

From 33a985a52e47cfa2df92d83613af40debb846dfe Mon Sep 17 00:00:00 2001
From: Abhinandan Das <abhinandan13jan@gmail.com>
Date: Tue, 13 Aug 2024 17:28:47 +0530
Subject: [PATCH 2/2] fix(workspaces): address review comments

---
 .../UserAccess/UserAccessForm/UsernameSection.tsx           | 6 +++---
 .../UserAccessForm/__tests__/UsernameSection.spec.tsx       | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/UserAccess/UserAccessForm/UsernameSection.tsx b/src/components/UserAccess/UserAccessForm/UsernameSection.tsx
index 636a0c210..8177c0418 100644
--- a/src/components/UserAccess/UserAccessForm/UsernameSection.tsx
+++ b/src/components/UserAccess/UserAccessForm/UsernameSection.tsx
@@ -68,8 +68,8 @@ export const UsernameSection: React.FC<React.PropsWithChildren<Props>> = ({ disa
         label="Enter usernames"
         labelIcon={
           <HelpPopover
-            aria-label="Usernames in KONFLUX"
-            headerContent="Usernames in KONFLUX"
+            aria-label="Usernames in Konflux"
+            headerContent="Usernames in Konflux"
             bodyContent="Your username is the name of your default workspace. To find a list of your workspaces, navigate to the Applications pane and select the options icon in the breadcrumb navigation."
           />
         }
@@ -116,7 +116,7 @@ export const UsernameSection: React.FC<React.PropsWithChildren<Props>> = ({ disa
               </HelperTextItem>
             ) : (
               <HelperTextItem>
-                Provide KONFLUX usernames for the users you want to invite.
+                Provide Konflux usernames for the users you want to invite.
               </HelperTextItem>
             )}
           </HelperText>
diff --git a/src/components/UserAccess/UserAccessForm/__tests__/UsernameSection.spec.tsx b/src/components/UserAccess/UserAccessForm/__tests__/UsernameSection.spec.tsx
index 18508e21d..a8079ef20 100644
--- a/src/components/UserAccess/UserAccessForm/__tests__/UsernameSection.spec.tsx
+++ b/src/components/UserAccess/UserAccessForm/__tests__/UsernameSection.spec.tsx
@@ -47,7 +47,7 @@ describe('UsernameSection', () => {
     validateMock.mockResolvedValue(false);
     formikRenderer(<UsernameSection />, { usernames: [] });
     expect(
-      screen.getByText('Provide KONFLUX usernames for the users you want to invite.'),
+      screen.getByText('Provide Konflux usernames for the users you want to invite.'),
     ).toBeVisible();
     await act(async () => {
       fireEvent.input(screen.getByRole('searchbox'), { target: { value: 'user!@#' } });