From 49643b673a3a93aeaea45cde3172098128574b4b Mon Sep 17 00:00:00 2001
From: I Nyoman Jyotisa <jyotisa1616@gmail.com>
Date: Tue, 13 Jan 2026 23:42:16 +0800
Subject: [PATCH 1/4] Fix: Badge Alignment on workspace members page

---
 src/pages/workspace/MemberRightIcon.tsx      | 11 +++++++++--
 src/pages/workspace/WorkspaceMembersPage.tsx |  2 ++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/pages/workspace/MemberRightIcon.tsx b/src/pages/workspace/MemberRightIcon.tsx
index 84a7bdfe7632..8dfb0586cb61 100644
--- a/src/pages/workspace/MemberRightIcon.tsx
+++ b/src/pages/workspace/MemberRightIcon.tsx
@@ -1,4 +1,5 @@
 import React from 'react';
+import {StyleProp, ViewStyle} from 'react-native';
 import Badge from '@components/Badge';
 import useLocalize from '@hooks/useLocalize';
 import CONST from '@src/CONST';
@@ -8,9 +9,10 @@ type MemberRightIconProps = {
     owner?: string;
     role?: string;
     login?: string;
+    badgeStyles?: StyleProp<ViewStyle>;
 };
 
-export default function MemberRightIcon({role, owner, login}: MemberRightIconProps) {
+export default function MemberRightIcon({role, owner, login, badgeStyles}: MemberRightIconProps) {
     const {translate} = useLocalize();
 
     let badgeText: TranslationPaths | undefined;
@@ -22,7 +24,12 @@ export default function MemberRightIcon({role, owner, login}: MemberRightIconPro
         badgeText = 'common.auditor';
     }
     if (badgeText) {
-        return <Badge text={translate(badgeText)} />;
+        return (
+            <Badge
+                text={translate(badgeText)}
+                badgeStyles={badgeStyles}
+            />
+        );
     }
     return null;
 }
diff --git a/src/pages/workspace/WorkspaceMembersPage.tsx b/src/pages/workspace/WorkspaceMembersPage.tsx
index 1255aa673b50..b8375d2f96c9 100644
--- a/src/pages/workspace/WorkspaceMembersPage.tsx
+++ b/src/pages/workspace/WorkspaceMembersPage.tsx
@@ -435,6 +435,7 @@ function WorkspaceMembersPage({personalDetails, route, policy}: WorkspaceMembers
                                 role={policyEmployee.role}
                                 owner={policy?.owner}
                                 login={details.login}
+                                badgeStyles={[styles.alignSelfEnd]}
                             />
                         </View>
                     </>
@@ -443,6 +444,7 @@ function WorkspaceMembersPage({personalDetails, route, policy}: WorkspaceMembers
                         role={policyEmployee.role}
                         owner={policy?.owner}
                         login={details.login}
+                        badgeStyles={[styles.alignSelfEnd]}
                     />
                 ),
                 icons: [

From 417f8262789a24e6a297e64202b197cba2e417cd Mon Sep 17 00:00:00 2001
From: I Nyoman Jyotisa <jyotisa1616@gmail.com>
Date: Tue, 13 Jan 2026 23:49:10 +0800
Subject: [PATCH 2/4] lint fix

---
 src/pages/workspace/MemberRightIcon.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/workspace/MemberRightIcon.tsx b/src/pages/workspace/MemberRightIcon.tsx
index 8dfb0586cb61..bcd48b4385e0 100644
--- a/src/pages/workspace/MemberRightIcon.tsx
+++ b/src/pages/workspace/MemberRightIcon.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import {StyleProp, ViewStyle} from 'react-native';
+import type {StyleProp, ViewStyle} from 'react-native';
 import Badge from '@components/Badge';
 import useLocalize from '@hooks/useLocalize';
 import CONST from '@src/CONST';

From 5da5744b0a24583805d63d3841ce9f8250bd9222 Mon Sep 17 00:00:00 2001
From: I Nyoman Jyotisa <jyotisa1616@gmail.com>
Date: Wed, 14 Jan 2026 01:03:32 +0800
Subject: [PATCH 3/4] lint fix

---
 src/pages/workspace/WorkspaceMembersPage.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/pages/workspace/WorkspaceMembersPage.tsx b/src/pages/workspace/WorkspaceMembersPage.tsx
index b8375d2f96c9..8b8b9b6ea66d 100644
--- a/src/pages/workspace/WorkspaceMembersPage.tsx
+++ b/src/pages/workspace/WorkspaceMembersPage.tsx
@@ -475,6 +475,7 @@ function WorkspaceMembersPage({personalDetails, route, policy}: WorkspaceMembers
         styles.flex1,
         styles.pr3,
         styles.alignSelfStart,
+        styles.alignSelfEnd,
         isControlPolicyWithWideLayout,
         StyleUtils,
         formatPhoneNumber,

From d2f93857e2aedfc29eeb78bb92449112c17f1192 Mon Sep 17 00:00:00 2001
From: I Nyoman Jyotisa <jyotisa1616@gmail.com>
Date: Wed, 14 Jan 2026 01:37:17 +0800
Subject: [PATCH 4/4] minor fix

---
 src/pages/workspace/WorkspaceMembersPage.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/workspace/WorkspaceMembersPage.tsx b/src/pages/workspace/WorkspaceMembersPage.tsx
index 8b8b9b6ea66d..219a01e50644 100644
--- a/src/pages/workspace/WorkspaceMembersPage.tsx
+++ b/src/pages/workspace/WorkspaceMembersPage.tsx
@@ -444,7 +444,6 @@ function WorkspaceMembersPage({personalDetails, route, policy}: WorkspaceMembers
                         role={policyEmployee.role}
                         owner={policy?.owner}
                         login={details.login}
-                        badgeStyles={[styles.alignSelfEnd]}
                     />
                 ),
                 icons: [