From cd890eff08bf9da909b6d9349ed71009b7ebd58a Mon Sep 17 00:00:00 2001
From: Don Xavier <mail.donxavier@gmail.com>
Date: Mon, 3 Feb 2025 00:41:56 +0530
Subject: [PATCH 1/3] Add Word breaks,Remove Extra padding

---
 src/components/Users/UserListAndCard.tsx                     | 5 ++++-
 .../settings/organizations/FacilityOrganizationUsers.tsx     | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/components/Users/UserListAndCard.tsx b/src/components/Users/UserListAndCard.tsx
index ee6753c1472..eafe2b1d393 100644
--- a/src/components/Users/UserListAndCard.tsx
+++ b/src/components/Users/UserListAndCard.tsx
@@ -57,7 +57,10 @@ export const UserStatusIndicator = ({
           <span className="text-xs text-green-700">{t("online")}</span>
         </Badge>
       ) : user.last_login ? (
-        <Badge variant="secondary" className="bg-yellow-100 whitespace-nowrap">
+        <Badge
+          variant="secondary"
+          className="bg-yellow-100 whitespace md:px-0 md:py-0 "
+        >
           <span className="inline-block h-2 w-2 shrink-0 rounded-full bg-yellow-500 mr-2" />
           <span className="text-xs text-yellow-700">
             {relativeTime(user.last_login)}
diff --git a/src/pages/Facility/settings/organizations/FacilityOrganizationUsers.tsx b/src/pages/Facility/settings/organizations/FacilityOrganizationUsers.tsx
index ba50a278d52..316007f5b32 100644
--- a/src/pages/Facility/settings/organizations/FacilityOrganizationUsers.tsx
+++ b/src/pages/Facility/settings/organizations/FacilityOrganizationUsers.tsx
@@ -115,7 +115,7 @@ export default function FacilityOrganizationUsers({ id, facilityId }: Props) {
                             {userRole.user.first_name} {userRole.user.last_name}
                           </h1>
                           <span className="text-sm text-gray-500">
-                            <span className="mr-2">
+                            <span className="mr-2 md:break-words">
                               {userRole.user.username}
                             </span>
                             <UserStatusIndicator user={userRole.user} />

From f158583e776b891f5aadfbe285933973c85bf3f7 Mon Sep 17 00:00:00 2001
From: Don Xavier <mail.donxavier@gmail.com>
Date: Mon, 3 Feb 2025 12:39:04 +0530
Subject: [PATCH 2/3] Switch to 2 containers for lg

---
 src/components/Users/UserListAndCard.tsx                     | 5 +----
 .../settings/organizations/FacilityOrganizationUsers.tsx     | 4 ++--
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/components/Users/UserListAndCard.tsx b/src/components/Users/UserListAndCard.tsx
index eafe2b1d393..ee6753c1472 100644
--- a/src/components/Users/UserListAndCard.tsx
+++ b/src/components/Users/UserListAndCard.tsx
@@ -57,10 +57,7 @@ export const UserStatusIndicator = ({
           <span className="text-xs text-green-700">{t("online")}</span>
         </Badge>
       ) : user.last_login ? (
-        <Badge
-          variant="secondary"
-          className="bg-yellow-100 whitespace md:px-0 md:py-0 "
-        >
+        <Badge variant="secondary" className="bg-yellow-100 whitespace-nowrap">
           <span className="inline-block h-2 w-2 shrink-0 rounded-full bg-yellow-500 mr-2" />
           <span className="text-xs text-yellow-700">
             {relativeTime(user.last_login)}
diff --git a/src/pages/Facility/settings/organizations/FacilityOrganizationUsers.tsx b/src/pages/Facility/settings/organizations/FacilityOrganizationUsers.tsx
index 316007f5b32..dc8a95d671a 100644
--- a/src/pages/Facility/settings/organizations/FacilityOrganizationUsers.tsx
+++ b/src/pages/Facility/settings/organizations/FacilityOrganizationUsers.tsx
@@ -90,7 +90,7 @@ export default function FacilityOrganizationUsers({ id, facilityId }: Props) {
           </div>
         </div>
 
-        <div className="grid grid-cols-1 md:grid-cols-2 xl:grid-cols-3 gap-4">
+        <div className="grid grid-cols-1 lg:grid-cols-2 xl:grid-cols-3 gap-4">
           {users?.results?.length === 0 ? (
             <Card className="col-span-full">
               <CardContent className="p-6 text-center text-gray-500">
@@ -115,7 +115,7 @@ export default function FacilityOrganizationUsers({ id, facilityId }: Props) {
                             {userRole.user.first_name} {userRole.user.last_name}
                           </h1>
                           <span className="text-sm text-gray-500">
-                            <span className="mr-2 md:break-words">
+                            <span className="mr-2">
                               {userRole.user.username}
                             </span>
                             <UserStatusIndicator user={userRole.user} />

From 08b0418519ce0996828a91259b181622131b19af Mon Sep 17 00:00:00 2001
From: Don Xavier <mail.donxavier@gmail.com>
Date: Mon, 3 Feb 2025 22:33:18 +0530
Subject: [PATCH 3/3] adjust button margin.

---
 .../settings/organizations/FacilityOrganizationUsers.tsx        | 2 +-
 src/pages/Organization/components/AddUserSheet.tsx              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/Facility/settings/organizations/FacilityOrganizationUsers.tsx b/src/pages/Facility/settings/organizations/FacilityOrganizationUsers.tsx
index dc8a95d671a..509f451a592 100644
--- a/src/pages/Facility/settings/organizations/FacilityOrganizationUsers.tsx
+++ b/src/pages/Facility/settings/organizations/FacilityOrganizationUsers.tsx
@@ -115,7 +115,7 @@ export default function FacilityOrganizationUsers({ id, facilityId }: Props) {
                             {userRole.user.first_name} {userRole.user.last_name}
                           </h1>
                           <span className="text-sm text-gray-500">
-                            <span className="mr-2">
+                            <span className="mr-2 break-words">
                               {userRole.user.username}
                             </span>
                             <UserStatusIndicator user={userRole.user} />
diff --git a/src/pages/Organization/components/AddUserSheet.tsx b/src/pages/Organization/components/AddUserSheet.tsx
index b6054eb4a56..1efba82ca81 100644
--- a/src/pages/Organization/components/AddUserSheet.tsx
+++ b/src/pages/Organization/components/AddUserSheet.tsx
@@ -33,7 +33,7 @@ export default function AddUserSheet({
   return (
     <Sheet open={open} onOpenChange={setOpen}>
       <SheetTrigger asChild>
-        <Button variant="outline" data-cy="add-user-button">
+        <Button variant="outline" data-cy="add-user-button" className="ml-3">
           <CareIcon icon="l-plus" className="mr-2 h-4 w-4" />
           {t("add_user")}
         </Button>