From 21f840d774cc7f00905aff2b1b9b1d06432ab577 Mon Sep 17 00:00:00 2001
From: kabirrajsingh <kabirrajsingh10@gmail.com>
Date: Wed, 27 Mar 2024 12:23:00 +0530
Subject: [PATCH 1/5] fixes "Set average weekly working hour" button in user
 tab is not responsive  #7309

---
 src/Components/Users/ManageUsers.tsx | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/Components/Users/ManageUsers.tsx b/src/Components/Users/ManageUsers.tsx
index dbfca3a815a..29a4b8dbb87 100644
--- a/src/Components/Users/ManageUsers.tsx
+++ b/src/Components/Users/ManageUsers.tsx
@@ -410,10 +410,10 @@ export default function ManageUsers() {
                   {["DistrictAdmin", "StateAdmin"].includes(
                     authUser.user_type
                   ) && (
-                    <div className="flex-col md:flex-row">
+                    <div className="">
                       <ButtonV2
                         id="avg-workinghour"
-                        className="flex w-full items-center md:w-full"
+                        className="flex w-full"
                         onClick={() => {
                           setExpandWorkingHours(true);
                           setSelectedUser(user.username);
@@ -421,7 +421,9 @@ export default function ManageUsers() {
                         }}
                       >
                         <CareIcon className="care-l-clock text-xl" />
-                        <p>Set Average weekly working hours</p>
+                        <p className="whitespace-nowrap md:whitespace-normal">
+                          Set Average weekly working hours
+                        </p>
                       </ButtonV2>
                     </div>
                   )}

From fd5fd8a77a2c39c42ff32f2436ccc97e27105cee Mon Sep 17 00:00:00 2001
From: Kabir Raj Singh <kabirrajsingh10@gmail.com>
Date: Sun, 21 Apr 2024 17:31:31 +0530
Subject: [PATCH 2/5] Update ManageUsers.tsx

---
 src/Components/Users/ManageUsers.tsx | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/Components/Users/ManageUsers.tsx b/src/Components/Users/ManageUsers.tsx
index 02c2abf18cb..7af021ca2a0 100644
--- a/src/Components/Users/ManageUsers.tsx
+++ b/src/Components/Users/ManageUsers.tsx
@@ -410,10 +410,10 @@ export default function ManageUsers() {
                   {["DistrictAdmin", "StateAdmin"].includes(
                     authUser.user_type,
                   ) && (
-                    <div className="">
+                    <div>
                       <ButtonV2
                         id="avg-workinghour"
-                        className="flex w-full"
+                        className="w-full"
                         onClick={() => {
                           setExpandWorkingHours(true);
                           setSelectedUser(user.username);
@@ -424,7 +424,6 @@ export default function ManageUsers() {
                         <p className="whitespace-nowrap md:whitespace-normal">
                           Set Average weekly working hours
                         </p>
-             
                       </ButtonV2>
                     </div>
                   )}

From 3c938d7a65f3d62bec2b1671efbacbc90424032c Mon Sep 17 00:00:00 2001
From: Kabir Raj Singh <kabirrajsingh10@gmail.com>
Date: Sun, 21 Apr 2024 17:39:06 +0530
Subject: [PATCH 3/5] Update ManageUsers.tsx

---
 src/Components/Users/ManageUsers.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Components/Users/ManageUsers.tsx b/src/Components/Users/ManageUsers.tsx
index 7af021ca2a0..fdc2b544367 100644
--- a/src/Components/Users/ManageUsers.tsx
+++ b/src/Components/Users/ManageUsers.tsx
@@ -420,7 +420,7 @@ export default function ManageUsers() {
                           setWeeklyHours(user.weekly_working_hours);
                         }}
                       >
-                        <CareIcon className="care-l-clock text-xl" />
+                        <CareIcon icon="l-clock" className="text-xl" /> 
                         <p className="whitespace-nowrap md:whitespace-normal">
                           Set Average weekly working hours
                         </p>

From a64bd638729bfde16df2fbac70373266f08652be Mon Sep 17 00:00:00 2001
From: Mohammed Nihal <57055998+nihal467@users.noreply.github.com>
Date: Tue, 23 Apr 2024 15:33:40 +0530
Subject: [PATCH 4/5] fix lint

---
 src/Components/Users/ManageUsers.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Components/Users/ManageUsers.tsx b/src/Components/Users/ManageUsers.tsx
index fdc2b544367..fc8c2f81cb2 100644
--- a/src/Components/Users/ManageUsers.tsx
+++ b/src/Components/Users/ManageUsers.tsx
@@ -420,7 +420,7 @@ export default function ManageUsers() {
                           setWeeklyHours(user.weekly_working_hours);
                         }}
                       >
-                        <CareIcon icon="l-clock" className="text-xl" /> 
+                        <CareIcon icon="l-clock" className="text-xl" />
                         <p className="whitespace-nowrap md:whitespace-normal">
                           Set Average weekly working hours
                         </p>

From 00d4c66212a56722ead9e50313578d079b6816fa Mon Sep 17 00:00:00 2001
From: Rithvik Nishad <rithvikn2001@gmail.com>
Date: Mon, 6 May 2024 16:31:15 +0530
Subject: [PATCH 5/5] Update src/Components/Users/ManageUsers.tsx

---
 src/Components/Users/ManageUsers.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Components/Users/ManageUsers.tsx b/src/Components/Users/ManageUsers.tsx
index fc8c2f81cb2..2be2d7c7866 100644
--- a/src/Components/Users/ManageUsers.tsx
+++ b/src/Components/Users/ManageUsers.tsx
@@ -421,7 +421,7 @@ export default function ManageUsers() {
                         }}
                       >
                         <CareIcon icon="l-clock" className="text-xl" />
-                        <p className="whitespace-nowrap md:whitespace-normal">
+                        <p className="whitespace-normal md:whitespace-nowrap">
                           Set Average weekly working hours
                         </p>
                       </ButtonV2>