From 592a32531858d003928b496c9a8a4e2a7221a735 Mon Sep 17 00:00:00 2001
From: NJ-2020 <ntt.london@gmail.com>
Date: Mon, 2 Feb 2026 19:59:53 +0700
Subject: [PATCH 01/11] fix: prevent changing payer role to member

---
 src/languages/en.ts                           |  2 ++
 src/pages/workspace/WorkspaceMembersPage.tsx  |  3 ++-
 .../members/WorkspaceMemberDetailsPage.tsx    | 24 ++++++++++++-------
 3 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/src/languages/en.ts b/src/languages/en.ts
index e9750ea9ad09..278c2173c792 100644
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -495,6 +495,8 @@ const translations = {
         member: 'Member',
         auditor: 'Auditor',
         role: 'Role',
+        roleCannotBeChanged: (workflowsLinkPage: string) =>
+            `Role cannot be changed because this member is a <a href="${workflowsLinkPage}">Payer</a> on this workspace.`,
         currency: 'Currency',
         groupCurrency: 'Group currency',
         rate: 'Rate',
diff --git a/src/pages/workspace/WorkspaceMembersPage.tsx b/src/pages/workspace/WorkspaceMembersPage.tsx
index fcea3732c47f..1786d7e102de 100644
--- a/src/pages/workspace/WorkspaceMembersPage.tsx
+++ b/src/pages/workspace/WorkspaceMembersPage.tsx
@@ -418,7 +418,8 @@ function WorkspaceMembersPage({personalDetails, route, policy}: WorkspaceMembers
                 login: details.login ?? '',
                 customField1: policyEmployee.employeeUserID,
                 customField2: policyEmployee.employeePayrollID,
-                isDisabledCheckbox: !(isPolicyAdmin && accountID !== policy?.ownerAccountID && accountID !== session?.accountID),
+                isDisabledCheckbox:
+                    !(isPolicyAdmin && accountID !== policy?.ownerAccountID && accountID !== session?.accountID) || email === policy?.achAccount?.reimburser,
                 isDisabled: isPendingDeleteOrError,
                 isInteractive: !details.isOptimisticPersonalDetail,
                 cursorStyle: details.isOptimisticPersonalDetail ? styles.cursorDefault : {},
diff --git a/src/pages/workspace/members/WorkspaceMemberDetailsPage.tsx b/src/pages/workspace/members/WorkspaceMemberDetailsPage.tsx
index 2ae06486029b..b2cfaeb42931 100644
--- a/src/pages/workspace/members/WorkspaceMemberDetailsPage.tsx
+++ b/src/pages/workspace/members/WorkspaceMemberDetailsPage.tsx
@@ -26,6 +26,7 @@ import usePrevious from '@hooks/usePrevious';
 import useStyleUtils from '@hooks/useStyleUtils';
 import useThemeIllustrations from '@hooks/useThemeIllustrations';
 import useThemeStyles from '@hooks/useThemeStyles';
+import useEnvironment from '@hooks/useEnvironment';
 import {setPolicyPreventSelfApproval} from '@libs/actions/Policy/Policy';
 import {removeApprovalWorkflow as removeApprovalWorkflowAction, updateApprovalWorkflow} from '@libs/actions/Workflow';
 import {
@@ -83,6 +84,7 @@ function WorkspaceMemberDetailsPage({personalDetails, policy, route}: WorkspaceM
     const illustrations = useThemeIllustrations();
     const companyCardFeedIcons = useCompanyCardFeedIcons();
     const currentUserPersonalDetails = useCurrentUserPersonalDetails();
+    const {environmentURL} = useEnvironment();
     const [cardFeeds] = useCardFeeds(policyID);
     const [cardList] = useOnyx(`${ONYXKEYS.COLLECTION.WORKSPACE_CARDS_LIST}`, {canBeMissing: true});
     const [customCardNames] = useOnyx(ONYXKEYS.NVP_EXPENSIFY_COMPANY_CARDS_CUSTOM_NAMES, {canBeMissing: true});
@@ -106,6 +108,7 @@ function WorkspaceMemberDetailsPage({personalDetails, policy, route}: WorkspaceM
     const policyOwnerDisplayName = formatPhoneNumber(getDisplayNameOrDefault(ownerDetails)) ?? policy?.owner ?? '';
     const hasMultipleFeeds = Object.keys(getCompanyFeeds(cardFeeds, false, true)).length > 0;
     const {cardList: assignableCards, ...workspaceCards} = getAllCardsForWorkspace(workspaceAccountID, cardList, cardFeeds, expensifyCardSettings);
+    const workspaceWorkflowsPageURL = `${environmentURL}/${ROUTES.WORKSPACE_WORKFLOWS.getRoute(policyID)}`;
     const isSMSLogin = Str.isSMSLogin(memberLogin);
     const phoneNumber = getPhoneNumber(details);
     const isReimburser = policy?.achAccount?.reimburser === memberLogin;
@@ -303,13 +306,15 @@ function WorkspaceMemberDetailsPage({personalDetails, policy, route}: WorkspaceM
                                     />
                                 )
                             ) : (
-                                <Button
-                                    text={translate('workspace.people.removeWorkspaceMemberButtonTitle')}
-                                    onPress={isAccountLocked ? showLockedAccountModal : askForConfirmationToRemove}
-                                    isDisabled={isSelectedMemberOwner || isSelectedMemberCurrentUser}
-                                    icon={icons.RemoveMembers}
-                                    style={styles.mb5}
-                                />
+                                !isReimburser && (
+                                    <Button
+                                        text={translate('workspace.people.removeWorkspaceMemberButtonTitle')}
+                                        onPress={isAccountLocked ? showLockedAccountModal : askForConfirmationToRemove}
+                                        isDisabled={isSelectedMemberOwner || isSelectedMemberCurrentUser}
+                                        icon={icons.RemoveMembers}
+                                        style={styles.mb5}
+                                    />
+                                )
                             )}
                             <ConfirmModal
                                 danger
@@ -344,9 +349,12 @@ function WorkspaceMemberDetailsPage({personalDetails, policy, route}: WorkspaceM
                             <MenuItemWithTopDescription
                                 disabled={isSelectedMemberOwner || isSelectedMemberCurrentUser}
                                 title={translate(`workspace.common.roleName`, {role: member?.role})}
+                                interactive={!isReimburser}
                                 description={translate('common.role')}
-                                shouldShowRightIcon
+                                shouldShowRightIcon={!isReimburser}
                                 onPress={() => Navigation.navigate(ROUTES.WORKSPACE_MEMBER_DETAILS_ROLE.getRoute(policyID, accountID))}
+                                hintText={isReimburser ? translate('common.roleCannotBeChanged', workspaceWorkflowsPageURL) : undefined}
+                                shouldRenderHintAsHTML
                             />
                             {isControlPolicy(policy) && (
                                 <>

From 8691b4fa52add00c7638df3377bb0244729340e6 Mon Sep 17 00:00:00 2001
From: NJ-2020 <ntt.london@gmail.com>
Date: Mon, 9 Feb 2026 10:59:38 +0700
Subject: [PATCH 02/11] revert selection box check condition

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

diff --git a/src/pages/workspace/WorkspaceMembersPage.tsx b/src/pages/workspace/WorkspaceMembersPage.tsx
index c64939ef755d..c3468a9f8fde 100644
--- a/src/pages/workspace/WorkspaceMembersPage.tsx
+++ b/src/pages/workspace/WorkspaceMembersPage.tsx
@@ -425,8 +425,7 @@ function WorkspaceMembersPage({personalDetails, route, policy}: WorkspaceMembers
                 login: details.login ?? '',
                 customField1: policyEmployee.employeeUserID,
                 customField2: policyEmployee.employeePayrollID,
-                isDisabledCheckbox:
-                    !(isPolicyAdmin && accountID !== policy?.ownerAccountID && accountID !== session?.accountID) || email === policy?.achAccount?.reimburser,
+                isDisabledCheckbox: !(isPolicyAdmin && accountID !== policy?.ownerAccountID && accountID !== session?.accountID),
                 isDisabled: isPendingDeleteOrError,
                 isInteractive: !details.isOptimisticPersonalDetail,
                 cursorStyle: details.isOptimisticPersonalDetail ? styles.cursorDefault : {},

From 73d73d252f473bbe706ca00a6a4ba60f7dc40b30 Mon Sep 17 00:00:00 2001
From: NJ-2020 <ntt.london@gmail.com>
Date: Mon, 9 Feb 2026 11:00:06 +0700
Subject: [PATCH 03/11] revert workspace member detail page remove button

---
 .../members/WorkspaceMemberDetailsPage.tsx       | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/pages/workspace/members/WorkspaceMemberDetailsPage.tsx b/src/pages/workspace/members/WorkspaceMemberDetailsPage.tsx
index b43b58abffdb..13bb537cce11 100644
--- a/src/pages/workspace/members/WorkspaceMemberDetailsPage.tsx
+++ b/src/pages/workspace/members/WorkspaceMemberDetailsPage.tsx
@@ -323,15 +323,13 @@ function WorkspaceMemberDetailsPage({personalDetails, policy, route}: WorkspaceM
                                     />
                                 )
                             ) : (
-                                !isReimburser && (
-                                    <Button
-                                        text={translate('workspace.people.removeWorkspaceMemberButtonTitle')}
-                                        onPress={isAccountLocked ? showLockedAccountModal : askForConfirmationToRemove}
-                                        isDisabled={isSelectedMemberOwner || isSelectedMemberCurrentUser}
-                                        icon={icons.RemoveMembers}
-                                        style={styles.mb5}
-                                    />
-                                )
+                                <Button
+                                    text={translate('workspace.people.removeWorkspaceMemberButtonTitle')}
+                                    onPress={isAccountLocked ? showLockedAccountModal : askForConfirmationToRemove}
+                                    isDisabled={isSelectedMemberOwner || isSelectedMemberCurrentUser}
+                                    icon={icons.RemoveMembers}
+                                    style={styles.mb5}
+                                />
                             )}
                         </View>
                         <View style={styles.w100}>

From a3c296951446952d8196b18588fe72984c50985b Mon Sep 17 00:00:00 2001
From: NJ-2020 <ntt.london@gmail.com>
Date: Mon, 9 Feb 2026 14:56:25 +0700
Subject: [PATCH 04/11] fix: hide change role actions

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

diff --git a/src/pages/workspace/WorkspaceMembersPage.tsx b/src/pages/workspace/WorkspaceMembersPage.tsx
index c3468a9f8fde..cab05b24fca8 100644
--- a/src/pages/workspace/WorkspaceMembersPage.tsx
+++ b/src/pages/workspace/WorkspaceMembersPage.tsx
@@ -659,6 +659,11 @@ function WorkspaceMembersPage({personalDetails, route, policy}: WorkspaceMembers
         const hasAtLeastOneNonAuditorRole = selectedEmployeesRoles.some((role) => role !== CONST.POLICY.ROLE.AUDITOR);
         const hasAtLeastOneNonMemberRole = selectedEmployeesRoles.some((role) => role !== CONST.POLICY.ROLE.USER);
         const hasAtLeastOneNonAdminRole = selectedEmployeesRoles.some((role) => role !== CONST.POLICY.ROLE.ADMIN);
+        const shouldShowChangeRoleAction = policy?.achAccount?.reimburser ? !selectedEmployees.includes(policy?.achAccount?.reimburser) : true;
+
+        if(!shouldShowChangeRoleAction) {
+            return options;
+        }
 
         if (hasAtLeastOneNonMemberRole) {
             options.push(memberOption);

From 68709fe53577b310a66b6d13f25be64797ad81d0 Mon Sep 17 00:00:00 2001
From: NJ-2020 <ntt.london@gmail.com>
Date: Wed, 11 Feb 2026 14:22:12 +0700
Subject: [PATCH 05/11] fix: admin change action is not showing

---
 src/pages/workspace/WorkspaceMembersPage.tsx | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/pages/workspace/WorkspaceMembersPage.tsx b/src/pages/workspace/WorkspaceMembersPage.tsx
index 2828ed075299..1e87fef7e69b 100644
--- a/src/pages/workspace/WorkspaceMembersPage.tsx
+++ b/src/pages/workspace/WorkspaceMembersPage.tsx
@@ -661,6 +661,10 @@ function WorkspaceMembersPage({personalDetails, route, policy}: WorkspaceMembers
         const hasAtLeastOneNonAdminRole = selectedEmployeesRoles.some((role) => role !== CONST.POLICY.ROLE.ADMIN);
         const shouldShowChangeRoleAction = policy?.achAccount?.reimburser ? !selectedEmployees.includes(policy?.achAccount?.reimburser) : true;
 
+        if (hasAtLeastOneNonAdminRole) {
+            options.push(adminOption);
+        }
+
         if(!shouldShowChangeRoleAction) {
             return options;
         }
@@ -669,9 +673,6 @@ function WorkspaceMembersPage({personalDetails, route, policy}: WorkspaceMembers
             options.push(memberOption);
         }
 
-        if (hasAtLeastOneNonAdminRole) {
-            options.push(adminOption);
-        }
 
         if (hasAtLeastOneNonAuditorRole && isControlPolicy(policy)) {
             options.push(auditorOption);

From 868ec551b64102756fcb3f5632a0390cdb7f4982 Mon Sep 17 00:00:00 2001
From: NJ-2020 <ntt.london@gmail.com>
Date: Thu, 12 Feb 2026 17:54:20 +0700
Subject: [PATCH 06/11] fix translation

---
 src/languages/en.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/languages/en.ts b/src/languages/en.ts
index 4826f44f95eb..ed8f374f7b33 100644
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -475,7 +475,7 @@ const translations = {
         auditor: 'Auditor',
         role: 'Role',
         roleCannotBeChanged: (workflowsLinkPage: string) =>
-            `Role cannot be changed because this member is a <a href="${workflowsLinkPage}">Payer</a> on this workspace.`,
+            `Role can't be changed because this member is a <a href="${workflowsLinkPage}">Payer</a> on this workspace.`,
         currency: 'Currency',
         groupCurrency: 'Group currency',
         rate: 'Rate',

From 63a1a4076ccf27e23e970fffe09437831af074fe Mon Sep 17 00:00:00 2001
From: NJ-2020 <ntt.london@gmail.com>
Date: Thu, 12 Feb 2026 17:56:29 +0700
Subject: [PATCH 07/11] add spanish translation

---
 src/languages/en.ts | 3 +--
 src/languages/es.ts | 1 +
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/languages/en.ts b/src/languages/en.ts
index ed8f374f7b33..32513db4306d 100644
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -474,8 +474,7 @@ const translations = {
         member: 'Member',
         auditor: 'Auditor',
         role: 'Role',
-        roleCannotBeChanged: (workflowsLinkPage: string) =>
-            `Role can't be changed because this member is a <a href="${workflowsLinkPage}">Payer</a> on this workspace.`,
+        roleCannotBeChanged: (workflowsLinkPage: string) => `Role can't be changed because this member is a <a href="${workflowsLinkPage}">Payer</a> on this workspace.`,
         currency: 'Currency',
         groupCurrency: 'Group currency',
         rate: 'Rate',
diff --git a/src/languages/es.ts b/src/languages/es.ts
index 05785d05c4c5..bcf497a7b652 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -268,6 +268,7 @@ const translations: TranslationDeepObject<typeof en> = {
         success: 'Éxito',
         auditor: 'Auditor',
         role: 'Role',
+        roleCannotBeChanged: (workflowsLinkPage: string) => `El rol no se puede cambiar porque este miembro es un <a href="${workflowsLinkPage}">Pagador</a> en este espacio de trabajo.`,
         currency: 'Divisa',
         groupCurrency: 'Moneda del grupo',
         rate: 'Tarifa',

From d0ef30c396c2139517eebf4d526aa3c08da033e1 Mon Sep 17 00:00:00 2001
From: NJ-2020 <ntt.london@gmail.com>
Date: Thu, 12 Feb 2026 18:00:22 +0700
Subject: [PATCH 08/11] fix prettier

---
 src/pages/workspace/WorkspaceMembersPage.tsx               | 3 +--
 src/pages/workspace/members/WorkspaceMemberDetailsPage.tsx | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/pages/workspace/WorkspaceMembersPage.tsx b/src/pages/workspace/WorkspaceMembersPage.tsx
index 4e33d9db1172..6aaa91b86ccd 100644
--- a/src/pages/workspace/WorkspaceMembersPage.tsx
+++ b/src/pages/workspace/WorkspaceMembersPage.tsx
@@ -665,7 +665,7 @@ function WorkspaceMembersPage({personalDetails, route, policy}: WorkspaceMembers
             options.push(adminOption);
         }
 
-        if(!shouldShowChangeRoleAction) {
+        if (!shouldShowChangeRoleAction) {
             return options;
         }
 
@@ -673,7 +673,6 @@ function WorkspaceMembersPage({personalDetails, route, policy}: WorkspaceMembers
             options.push(memberOption);
         }
 
-
         if (hasAtLeastOneNonAuditorRole && isControlPolicy(policy)) {
             options.push(auditorOption);
         }
diff --git a/src/pages/workspace/members/WorkspaceMemberDetailsPage.tsx b/src/pages/workspace/members/WorkspaceMemberDetailsPage.tsx
index e7f2e75f3eb3..025d87a32493 100644
--- a/src/pages/workspace/members/WorkspaceMemberDetailsPage.tsx
+++ b/src/pages/workspace/members/WorkspaceMemberDetailsPage.tsx
@@ -19,6 +19,7 @@ import useCardFeeds from '@hooks/useCardFeeds';
 import {useCompanyCardFeedIcons} from '@hooks/useCompanyCardIcons';
 import useConfirmModal from '@hooks/useConfirmModal';
 import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
+import useEnvironment from '@hooks/useEnvironment';
 import useExpensifyCardFeeds from '@hooks/useExpensifyCardFeeds';
 import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset';
 import useLocalize from '@hooks/useLocalize';
@@ -27,7 +28,6 @@ import usePrevious from '@hooks/usePrevious';
 import useStyleUtils from '@hooks/useStyleUtils';
 import useThemeIllustrations from '@hooks/useThemeIllustrations';
 import useThemeStyles from '@hooks/useThemeStyles';
-import useEnvironment from '@hooks/useEnvironment';
 import {setPolicyPreventSelfApproval} from '@libs/actions/Policy/Policy';
 import {removeApprovalWorkflow as removeApprovalWorkflowAction, updateApprovalWorkflow} from '@libs/actions/Workflow';
 import {

From d220c58dd2e908d7117c149acf45f18eb73ada71 Mon Sep 17 00:00:00 2001
From: NJ-2020 <ntt.london@gmail.com>
Date: Sat, 14 Feb 2026 13:44:52 +0700
Subject: [PATCH 09/11] fix translations & add missing translations

---
 src/languages/de.ts      | 1 +
 src/languages/en.ts      | 2 +-
 src/languages/es.ts      | 2 +-
 src/languages/fr.ts      | 1 +
 src/languages/it.ts      | 1 +
 src/languages/ja.ts      | 1 +
 src/languages/nl.ts      | 1 +
 src/languages/pl.ts      | 1 +
 src/languages/pt-BR.ts   | 1 +
 src/languages/zh-hans.ts | 1 +
 10 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/languages/de.ts b/src/languages/de.ts
index e6e196879b7f..b83ea6a4b1d1 100644
--- a/src/languages/de.ts
+++ b/src/languages/de.ts
@@ -441,6 +441,7 @@ const translations: TranslationDeepObject<typeof en> = {
         member: 'Mitglied',
         auditor: 'Prüfer',
         role: 'Rolle',
+        roleCannotBeChanged: (workflowsLinkPage: string) => `Die Rolle kann nicht geändert werden, da dieses Mitglied ein <a href="${workflowsLinkPage}">zahler</a> in diesem Arbeitsbereich ist.`,
         currency: 'Währung',
         groupCurrency: 'Gruppenwährung',
         rate: 'Bewerten',
diff --git a/src/languages/en.ts b/src/languages/en.ts
index 8e410e01e9c1..5d05ce684179 100644
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -453,7 +453,7 @@ const translations = {
         member: 'Member',
         auditor: 'Auditor',
         role: 'Role',
-        roleCannotBeChanged: (workflowsLinkPage: string) => `Role can't be changed because this member is a <a href="${workflowsLinkPage}">Payer</a> on this workspace.`,
+        roleCannotBeChanged: (workflowsLinkPage: string) => `Role can't be changed because this member is a <a href="${workflowsLinkPage}">payer</a> on this workspace.`,
         currency: 'Currency',
         groupCurrency: 'Group currency',
         rate: 'Rate',
diff --git a/src/languages/es.ts b/src/languages/es.ts
index 77e307df7660..6e2a63c0976f 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -267,7 +267,7 @@ const translations: TranslationDeepObject<typeof en> = {
         success: 'Éxito',
         auditor: 'Auditor',
         role: 'Role',
-        roleCannotBeChanged: (workflowsLinkPage: string) => `El rol no se puede cambiar porque este miembro es un <a href="${workflowsLinkPage}">Pagador</a> en este espacio de trabajo.`,
+        roleCannotBeChanged: (workflowsLinkPage: string) => `El rol no se puede cambiar porque este miembro es un <a href="${workflowsLinkPage}">pagador</a> en este espacio de trabajo.`,
         currency: 'Divisa',
         groupCurrency: 'Moneda del grupo',
         rate: 'Tarifa',
diff --git a/src/languages/fr.ts b/src/languages/fr.ts
index de8ee551b715..a7805e0c7adf 100644
--- a/src/languages/fr.ts
+++ b/src/languages/fr.ts
@@ -441,6 +441,7 @@ const translations: TranslationDeepObject<typeof en> = {
         member: 'Membre',
         auditor: 'Auditeur',
         role: 'Rôle',
+        roleCannotBeChanged: (workflowsLinkPage: string) => `Le rôle ne peut pas être modifié car ce membre est un <a href="${workflowsLinkPage}">payeur</a> dans cet espace de travail.`,
         currency: 'Devise',
         groupCurrency: 'Devise du groupe',
         rate: 'Taux',
diff --git a/src/languages/it.ts b/src/languages/it.ts
index 7500619ebca8..73b6c1ae6126 100644
--- a/src/languages/it.ts
+++ b/src/languages/it.ts
@@ -441,6 +441,7 @@ const translations: TranslationDeepObject<typeof en> = {
         member: 'Membro',
         auditor: 'Revisore',
         role: 'Ruolo',
+        roleCannotBeChanged: (workflowsLinkPage: string) => `Il ruolo non può essere modificato perché questo membro è un <a href="${workflowsLinkPage}">pagatore</a> in questo spazio di lavoro.`,
         currency: 'Valuta',
         groupCurrency: 'Valuta del gruppo',
         rate: 'Valuta',
diff --git a/src/languages/ja.ts b/src/languages/ja.ts
index cf18bfec0d42..cd1da7712624 100644
--- a/src/languages/ja.ts
+++ b/src/languages/ja.ts
@@ -441,6 +441,7 @@ const translations: TranslationDeepObject<typeof en> = {
         member: 'メンバー',
         auditor: '監査人',
         role: '役割',
+        roleCannotBeChanged: (workflowsLinkPage: string) => `このメンバーはこのワークスペースの<a href="${workflowsLinkPage}">支払者</a>であるため、役割を変更できません。`,
         currency: '通貨',
         groupCurrency: 'グループ通貨',
         rate: '評価',
diff --git a/src/languages/nl.ts b/src/languages/nl.ts
index bd446b207cef..2f11942bf683 100644
--- a/src/languages/nl.ts
+++ b/src/languages/nl.ts
@@ -441,6 +441,7 @@ const translations: TranslationDeepObject<typeof en> = {
         member: 'Lid',
         auditor: 'Auditor',
         role: 'Rol',
+        roleCannotBeChanged: (workflowsLinkPage: string) => `De rol kan niet worden gewijzigd omdat dit lid een <a href="${workflowsLinkPage}">betaler</a> is in deze werkruimte.`,
         currency: 'Valuta',
         groupCurrency: 'Groepsvaluta',
         rate: 'Beoordeling',
diff --git a/src/languages/pl.ts b/src/languages/pl.ts
index 4cc16d308508..fcf5a43becc2 100644
--- a/src/languages/pl.ts
+++ b/src/languages/pl.ts
@@ -441,6 +441,7 @@ const translations: TranslationDeepObject<typeof en> = {
         member: 'Członek',
         auditor: 'Audytor',
         role: 'Rola',
+        roleCannotBeChanged: (workflowsLinkPage: string) => `Nie można zmienić roli, ponieważ ten członek jest <a href="${workflowsLinkPage}">płatnikiem</a> w tym obszarze roboczym.`,
         currency: 'Waluta',
         groupCurrency: 'Waluta grupy',
         rate: 'Oceń',
diff --git a/src/languages/pt-BR.ts b/src/languages/pt-BR.ts
index 03c08e51ee5e..7320404dd900 100644
--- a/src/languages/pt-BR.ts
+++ b/src/languages/pt-BR.ts
@@ -441,6 +441,7 @@ const translations: TranslationDeepObject<typeof en> = {
         member: 'Membro',
         auditor: 'Auditor',
         role: 'Função',
+        roleCannotBeChanged: (workflowsLinkPage: string) => `A função não pode ser alterada porque este membro é um <a href="${workflowsLinkPage}">pagador</a> neste espaço de trabalho.`,
         currency: 'Moeda',
         groupCurrency: 'Moeda do grupo',
         rate: 'Avaliar',
diff --git a/src/languages/zh-hans.ts b/src/languages/zh-hans.ts
index d465f940236f..1e694412b405 100644
--- a/src/languages/zh-hans.ts
+++ b/src/languages/zh-hans.ts
@@ -441,6 +441,7 @@ const translations: TranslationDeepObject<typeof en> = {
         member: '成员',
         auditor: '审计员',
         role: '角色',
+        roleCannotBeChanged: (workflowsLinkPage: string) => `该角色无法更改，因为此成员是此工作区中的<a href="${workflowsLinkPage}">付款人</a>。`,
         currency: '货币',
         groupCurrency: '群组货币',
         rate: '评分',

From 00157a690373e11ef36d57c9a783a0a0380ed688 Mon Sep 17 00:00:00 2001
From: NJ-2020 <ntt.london@gmail.com>
Date: Sat, 14 Feb 2026 14:07:44 +0700
Subject: [PATCH 10/11] fix prettier

---
 src/languages/de.ts | 3 ++-
 src/languages/it.ts | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/languages/de.ts b/src/languages/de.ts
index b83ea6a4b1d1..42b8d2315733 100644
--- a/src/languages/de.ts
+++ b/src/languages/de.ts
@@ -441,7 +441,8 @@ const translations: TranslationDeepObject<typeof en> = {
         member: 'Mitglied',
         auditor: 'Prüfer',
         role: 'Rolle',
-        roleCannotBeChanged: (workflowsLinkPage: string) => `Die Rolle kann nicht geändert werden, da dieses Mitglied ein <a href="${workflowsLinkPage}">zahler</a> in diesem Arbeitsbereich ist.`,
+        roleCannotBeChanged: (workflowsLinkPage: string) =>
+            `Die Rolle kann nicht geändert werden, da dieses Mitglied ein <a href="${workflowsLinkPage}">zahler</a> in diesem Arbeitsbereich ist.`,
         currency: 'Währung',
         groupCurrency: 'Gruppenwährung',
         rate: 'Bewerten',
diff --git a/src/languages/it.ts b/src/languages/it.ts
index 73b6c1ae6126..06273c273fce 100644
--- a/src/languages/it.ts
+++ b/src/languages/it.ts
@@ -441,7 +441,8 @@ const translations: TranslationDeepObject<typeof en> = {
         member: 'Membro',
         auditor: 'Revisore',
         role: 'Ruolo',
-        roleCannotBeChanged: (workflowsLinkPage: string) => `Il ruolo non può essere modificato perché questo membro è un <a href="${workflowsLinkPage}">pagatore</a> in questo spazio di lavoro.`,
+        roleCannotBeChanged: (workflowsLinkPage: string) =>
+            `Il ruolo non può essere modificato perché questo membro è un <a href="${workflowsLinkPage}">pagatore</a> in questo spazio di lavoro.`,
         currency: 'Valuta',
         groupCurrency: 'Valuta del gruppo',
         rate: 'Valuta',

From b3eff8c197b05841431b8f64ec78651b20100d5b Mon Sep 17 00:00:00 2001
From: NJ-2020 <ntt.london@gmail.com>
Date: Tue, 17 Feb 2026 07:09:36 +0700
Subject: [PATCH 11/11] fix: selection menu options order & reimburser check

---
 src/pages/workspace/WorkspaceMembersPage.tsx    | 17 +++++++----------
 .../members/WorkspaceMemberDetailsPage.tsx      |  2 +-
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/src/pages/workspace/WorkspaceMembersPage.tsx b/src/pages/workspace/WorkspaceMembersPage.tsx
index 6aaa91b86ccd..8cb39c736044 100644
--- a/src/pages/workspace/WorkspaceMembersPage.tsx
+++ b/src/pages/workspace/WorkspaceMembersPage.tsx
@@ -659,21 +659,18 @@ function WorkspaceMembersPage({personalDetails, route, policy}: WorkspaceMembers
         const hasAtLeastOneNonAuditorRole = selectedEmployeesRoles.some((role) => role !== CONST.POLICY.ROLE.AUDITOR);
         const hasAtLeastOneNonMemberRole = selectedEmployeesRoles.some((role) => role !== CONST.POLICY.ROLE.USER);
         const hasAtLeastOneNonAdminRole = selectedEmployeesRoles.some((role) => role !== CONST.POLICY.ROLE.ADMIN);
-        const shouldShowChangeRoleAction = policy?.achAccount?.reimburser ? !selectedEmployees.includes(policy?.achAccount?.reimburser) : true;
+        const isReimbursementEnabled = policy?.reimbursementChoice === CONST.POLICY.REIMBURSEMENT_CHOICES.REIMBURSEMENT_YES;
+        const hasAtLeastOnePayer = isReimbursementEnabled && policy?.achAccount?.reimburser ? selectedEmployees.includes(policy?.achAccount?.reimburser) : false;
 
-        if (hasAtLeastOneNonAdminRole) {
-            options.push(adminOption);
-        }
-
-        if (!shouldShowChangeRoleAction) {
-            return options;
+        if (hasAtLeastOneNonMemberRole && !hasAtLeastOnePayer) {
+            options.push(memberOption);
         }
 
-        if (hasAtLeastOneNonMemberRole) {
-            options.push(memberOption);
+        if (hasAtLeastOneNonAdminRole) {
+            options.push(adminOption);
         }
 
-        if (hasAtLeastOneNonAuditorRole && isControlPolicy(policy)) {
+        if (hasAtLeastOneNonAuditorRole && isControlPolicy(policy) && !hasAtLeastOnePayer) {
             options.push(auditorOption);
         }
 
diff --git a/src/pages/workspace/members/WorkspaceMemberDetailsPage.tsx b/src/pages/workspace/members/WorkspaceMemberDetailsPage.tsx
index b1d725d9e768..0b58a15adbbc 100644
--- a/src/pages/workspace/members/WorkspaceMemberDetailsPage.tsx
+++ b/src/pages/workspace/members/WorkspaceMemberDetailsPage.tsx
@@ -111,7 +111,7 @@ function WorkspaceMemberDetailsPage({personalDetails, policy, route}: WorkspaceM
     const workspaceWorkflowsPageURL = `${environmentURL}/${ROUTES.WORKSPACE_WORKFLOWS.getRoute(policyID)}`;
     const isSMSLogin = Str.isSMSLogin(memberLogin);
     const phoneNumber = getPhoneNumber(details);
-    const isReimburser = policy?.achAccount?.reimburser === memberLogin;
+    const isReimburser = policy?.reimbursementChoice === CONST.POLICY.REIMBURSEMENT_CHOICES.REIMBURSEMENT_YES && policy?.achAccount?.reimburser === memberLogin;
     const {isAccountLocked, showLockedAccountModal} = useContext(LockedAccountContext);
 
     const {approvalWorkflows} = convertPolicyEmployeesToApprovalWorkflows({