Allow non-admin approvers to reassign reports when workflow enforcement is disabled

src/components/MoneyReportHeaderActions/MoneyReportHeaderSecondaryActions.tsx

@@ -39,6 +39,7 @@ import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useSearchShouldCalculateTotals from '@hooks/useSearchShouldCalculateTotals';
 import useShareActions from '@hooks/useShareActions';
 import useShouldReturnTripRooms from '@hooks/useShouldReturnTripRooms';
+import useStrictPolicyRules from '@hooks/useStrictPolicyRules';
 import useStyleUtils from '@hooks/useStyleUtils';
 import useThemeStyles from '@hooks/useThemeStyles';
 import useTransactionsAndViolationsForReport from '@hooks/useTransactionsAndViolationsForReport';
@@ -103,6 +104,7 @@ const MORE_MENU_SUBMIT_TO_POPOVER_ANCHOR_ALIGNMENT = {
 };
 
 function MoneyReportHeaderSecondaryActionsInner({reportID, primaryAction, isReportInSearch, backTo, dropdownMenuRef, isDisabled}: MoneyReportHeaderSecondaryActionsProps) {
+    const {areStrictPolicyRulesEnabled} = useStrictPolicyRules();
     const {isPaidAnimationRunning, isApprovedAnimationRunning, startAnimation, startApprovedAnimation, startSubmittingAnimation} = usePaymentAnimationsContext();
     const {openHoldMenu, openPDFDownload, openHoldEducational, openRejectModal} = useMoneyReportHeaderModals();
 
@@ -416,6 +418,7 @@ function MoneyReportHeaderSecondaryActionsInner({reportID, primaryAction, isRepo
     // Compute list of applicable secondary action keys
     const secondaryActions = moneyRequestReport
         ? getSecondaryReportActions({
+              areStrictPolicyRulesEnabled,
               currentUserLogin: currentUserLogin ?? '',
               currentUserAccountID: accountID,
               submitterLogin,

src/components/MoneyReportHeaderActions/MoneyReportHeaderSelectionDropdown.tsx

@@ -22,6 +22,7 @@ import {usePersonalDetail} from '@hooks/usePersonalDetails';
 import useReportIsArchived from '@hooks/useReportIsArchived';
 import useSelectedTransactionsActions from '@hooks/useSelectedTransactionsActions';
 import useSelectionModePayment from '@hooks/useSelectionModePayment';
+import useStrictPolicyRules from '@hooks/useStrictPolicyRules';
 import useTransactionsAndViolationsForReport from '@hooks/useTransactionsAndViolationsForReport';
 import useTransactionThreadReport from '@hooks/useTransactionThreadReport';
 
@@ -56,6 +57,7 @@ type MoneyReportHeaderSelectionDropdownProps = {
 };
 
 function MoneyReportHeaderSelectionDropdown({reportID, primaryAction, isReportInSearch, wrapperStyle}: MoneyReportHeaderSelectionDropdownProps) {
+    const {areStrictPolicyRulesEnabled} = useStrictPolicyRules();
     const route = useRoute();
     const {startAnimation, startApprovedAnimation, startSubmittingAnimation} = usePaymentAnimationsContext();
     const {openHoldMenu: openHoldMenuAsync, openRejectModal} = useMoneyReportHeaderModals();
@@ -153,6 +155,7 @@ function MoneyReportHeaderSelectionDropdown({reportID, primaryAction, isReportIn
 
     const computedSecondaryActions = moneyRequestReport
         ? getSecondaryReportActions({
+              areStrictPolicyRulesEnabled,
               currentUserLogin: currentUserLogin ?? '',
               currentUserAccountID: accountID,
               submitterLogin,

src/hooks/useSearchBulkActions.ts

@@ -80,6 +80,8 @@ import {
     isIndividualInvoiceRoom,
     isInvoiceReport,
     isIOUReport as isIOUReportUtil,
+    isMoneyRequestReportPendingDeletion,
+    isProcessingReport,
     isSelfDM,
     shouldShowMarkAsDone,
 } from '@libs/ReportUtils';
@@ -190,6 +192,7 @@ import useSearchShouldCalculateTotals from './useSearchShouldCalculateTotals';
 import useSelfDMReport from './useSelfDMReport';
 import useShouldReturnTripRooms from './useShouldReturnTripRooms';
 import useSplitEffectivePolicy from './useSplitEffectivePolicy';
+import useStrictPolicyRules from './useStrictPolicyRules';
 import useTheme from './useTheme';
 import useThemeStyles from './useThemeStyles';
 import useUndeleteTransactions from './useUndeleteTransactions';
@@ -691,6 +694,7 @@ function getChatReportForBulkPay(
 type ExportMenuItem = DropdownOption<SearchHeaderOptionValue> & Pick<PopoverMenuItem, 'accessibilityLabel' | 'shouldCallAfterModalHide'>;
 
 function useSearchBulkActions({queryJSON}: UseSearchBulkActionsParams) {
+    const {areStrictPolicyRulesEnabled} = useStrictPolicyRules();
     const {translate, localeCompare, dateFnsLocale} = useLocalize();
     const styles = useThemeStyles();
     const theme = useTheme();
@@ -3269,7 +3273,23 @@ function useSearchBulkActions({queryJSON}: UseSearchBulkActionsParams) {
             !isAnyTransactionOnHold &&
             areSelectedTransactionsIncludedInReports &&
             selectedReports.length &&
-            selectedReports.every((report) => report.canChangeApprover);
+            selectedReports.every((selectedReport) => {
+                if (selectedReport.canChangeApprover) {
+                    return true;
+                }
+                const report = getReportFromSearchSnapshot(selectedReport.reportID, currentSearchResults?.data, allReports);
+                if (
+                    areStrictPolicyRulesEnabled ||
+                    report?.managerID !== accountID ||
+                    !isExpenseReportUtil(report) ||
+                    !isProcessingReport(report) ||
+                    isMoneyRequestReportPendingDeletion(report)
+                ) {
+                    return false;
+                }
+                const policy = getPolicyFromSearchSnapshot(selectedReport.policyID, currentSearchResults?.data, policies);
+                return !!policy?.approvalMode && policy.approvalMode !== CONST.POLICY.APPROVAL_MODE.OPTIONAL;
+            });
 
         if (shouldShowChangeApproverOption) {
             options.push({
@@ -3622,6 +3642,7 @@ function useSearchBulkActions({queryJSON}: UseSearchBulkActionsParams) {
         return buildResult(options);
     }, [
         selectedTransactionsKeys,
+        areStrictPolicyRulesEnabled,
         showOfflineModal,
         showDownloadErrorModal,
         cardList,

src/hooks/useSelectionModeReportActions.ts

@@ -36,6 +36,7 @@ import useOnyx from './useOnyx';
 import {usePersonalDetail} from './usePersonalDetails';
 import useReportIsArchived from './useReportIsArchived';
 import useSelectionModePayment from './useSelectionModePayment';
+import useStrictPolicyRules from './useStrictPolicyRules';
 
 type UseSelectionModeReportActionsParams = {
     report: OnyxEntry<OnyxTypes.Report>;
@@ -58,6 +59,7 @@ function useSelectionModeReportActions({
     transactions,
     selectedTransactionIDs,
 }: UseSelectionModeReportActionsParams) {
+    const {areStrictPolicyRulesEnabled} = useStrictPolicyRules();
     const {translate} = useLocalize();
     const {isOffline} = useNetwork();
     const {convertToDisplayString} = useCurrencyListActions();
@@ -180,6 +182,7 @@ function useSelectionModeReportActions({
             return [];
         }
         return getSecondaryReportActions({
+            areStrictPolicyRulesEnabled,
             currentUserLogin: currentUserEmail,
             currentUserAccountID,
             submitterLogin,

src/libs/ReportSecondaryActionUtils.ts

@@ -1048,6 +1048,7 @@ function getSecondaryReportActions({
     isOffline,
     rules,
     cardList,
+    areStrictPolicyRulesEnabled = true,
 }: {
     currentUserLogin: string;
     currentUserAccountID: number;
@@ -1071,6 +1072,7 @@ function getSecondaryReportActions({
     isOffline?: boolean;
     rules: OnyxCollection<Rule>;
     cardList: OnyxEntry<CardList>;
+    areStrictPolicyRulesEnabled?: boolean;
 }): Array<ValueOf<typeof CONST.REPORT.SECONDARY_ACTIONS>> {
     const options: Array<ValueOf<typeof CONST.REPORT.SECONDARY_ACTIONS>> = [];
     const reportNameValuePairs = moveExpenseReportNameValuePairs?.[`${ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS}${report.reportID}`];
@@ -1236,7 +1238,8 @@ function getSecondaryReportActions({
     }
 
     const isApprovalEnabled = policy?.approvalMode && policy.approvalMode !== CONST.POLICY.APPROVAL_MODE.OPTIONAL;
-    if (isExpenseReportUtils(report) && isProcessingReportUtils(report) && isPolicyAdmin(policy) && isApprovalEnabled) {
+    const canReassignAsApprover = report.managerID === currentUserAccountID && !areStrictPolicyRulesEnabled;
+    if (isExpenseReportUtils(report) && isProcessingReportUtils(report) && (isPolicyAdmin(policy) || canReassignAsApprover) && isApprovalEnabled) {
         options.push(CONST.REPORT.SECONDARY_ACTIONS.CHANGE_APPROVER);
     }
 

src/pages/DynamicReportChangeApproverPage.tsx

@@ -11,6 +11,7 @@ import useEnvironment from '@hooks/useEnvironment';
 import useLocalize from '@hooks/useLocalize';
 import useOnyx from '@hooks/useOnyx';
 import usePermissions from '@hooks/usePermissions';
+import useStrictPolicyRules from '@hooks/useStrictPolicyRules';
 import useThemeStyles from '@hooks/useThemeStyles';
 
 import {assignReportToMe} from '@libs/actions/IOU/ReportWorkflow';
@@ -54,6 +55,7 @@ function DynamicReportChangeApproverPage({report, policy, isLoadingReportData}:
     const currentUserDetails = useCurrentUserPersonalDetails();
     const [selectedApproverType, setSelectedApproverType] = useState<ApproverType>(APPROVER_TYPE.ADD_APPROVER);
     const {isBetaEnabled} = usePermissions();
+    const {areStrictPolicyRulesEnabled} = useStrictPolicyRules();
 
     const [transactionViolations] = useOnyx(ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS);
     const isASAPSubmitBetaEnabled = isBetaEnabled(CONST.BETAS.ASAP_SUBMIT);
@@ -62,6 +64,8 @@ function DynamicReportChangeApproverPage({report, policy, isLoadingReportData}:
     const [rules] = useOnyx(ONYXKEYS.COLLECTION.RULE);
     const backPath = useDynamicBackPath(DYNAMIC_ROUTES.REPORT_CHANGE_APPROVER.path);
 
+    const canMemberReassignApprover = !areStrictPolicyRulesEnabled && currentUserDetails.accountID === report?.managerID;
+
     const goBack = () => {
         Navigation.goBack(backPath);
     };
@@ -106,7 +110,7 @@ function DynamicReportChangeApproverPage({report, policy, isLoadingReportData}:
             isSelected: selectedApproverType === APPROVER_TYPE.BYPASS_APPROVER,
         });
     }
-    if (isPolicyAdmin(policy) && !isPendingDeletePolicy(policy)) {
+    if ((isPolicyAdmin(policy) || canMemberReassignApprover) && !isPendingDeletePolicy(policy)) {
         data.push({
             text: translate('iou.changeApprover.actions.reassignApprover'),
             keyForList: APPROVER_TYPE.REASSIGN_APPROVER,

src/pages/Search/SearchChangeApproverPage.tsx

@@ -15,6 +15,7 @@ import useLocalize from '@hooks/useLocalize';
 import useNetwork from '@hooks/useNetwork';
 import useOnyx from '@hooks/useOnyx';
 import usePermissions from '@hooks/usePermissions';
+import useStrictPolicyRules from '@hooks/useStrictPolicyRules';
 import useThemeStyles from '@hooks/useThemeStyles';
 
 import {assignReportToMe} from '@libs/actions/IOU/ReportWorkflow';
@@ -78,22 +79,27 @@ function canReassignAllReports({
     selectedReports,
     onyxReports,
     allPolicies,
+    currentUserAccountID,
+    areStrictPolicyRulesEnabled,
 }: {
     selectedReports: SelectedReportRef[];
     onyxReports: Record<string, Report> | undefined;
     allPolicies: OnyxCollection<Policy>;
+    currentUserAccountID: number;
+    areStrictPolicyRulesEnabled: boolean;
 }): boolean {
     return (
         selectedReports.length > 0 &&
         selectedReports.every((selectedReport) => {
             const policy = allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${selectedReport.policyID}`];
             const report = selectedReport.reportID ? onyxReports?.[selectedReport.reportID] : undefined;
             const isApprovalEnabled = !!policy?.approvalMode && policy.approvalMode !== CONST.POLICY.APPROVAL_MODE.OPTIONAL;
+            const canReassignAsApprover = report?.managerID === currentUserAccountID && !areStrictPolicyRulesEnabled;
 
             return (
                 !!policy &&
                 !!report &&
-                isPolicyAdmin(policy) &&
+                (isPolicyAdmin(policy) || canReassignAsApprover) &&
                 !isPendingDeletePolicy(policy) &&
                 isMoneyRequestReport(report) &&
                 !isMoneyRequestReportPendingDeletion(report) &&
@@ -113,6 +119,7 @@ function SearchChangeApproverPage() {
     const currentUserDetails = useCurrentUserPersonalDetails();
     const [selectedApproverType, setSelectedApproverType] = useState<ApproverType>(APPROVER_TYPE.ADD_APPROVER);
     const {isBetaEnabled} = usePermissions();
+    const {areStrictPolicyRulesEnabled} = useStrictPolicyRules();
     const [transactionViolations] = useOnyx(ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS);
     const isASAPSubmitBetaEnabled = isBetaEnabled(CONST.BETAS.ASAP_SUBMIT);
     const [allPolicies] = useOnyx(ONYXKEYS.COLLECTION.POLICY);
@@ -244,7 +251,7 @@ function SearchChangeApproverPage() {
             const policy = allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${selectedReport.policyID}`];
             return !!policy && isPolicyAdmin(policy) && !isPendingDeletePolicy(policy);
         });
-        const canReassign = canReassignAllReports({selectedReports, onyxReports, allPolicies});
+        const canReassign = canReassignAllReports({selectedReports, onyxReports, allPolicies, currentUserAccountID: currentUserDetails.accountID, areStrictPolicyRulesEnabled});
 
         const isAllowedToBypassApprovers =
             hasAdminPermission &&

tests/unit/ReportSecondaryActionUtilsTest.ts

@@ -149,6 +149,47 @@ describe('getSecondaryAction', () => {
         Onyx.clear();
     });
 
+    it.each([
+        [false, false, MANAGER_ACCOUNT_ID, true],
+        [false, true, MANAGER_ACCOUNT_ID, false],
+        [false, false, APPROVER_ACCOUNT_ID, false],
+        [true, true, APPROVER_ACCOUNT_ID, true],
+    ])('change approver visibility: admin=%s, enforcement=%s, manager=%s', (isAdmin, areStrictPolicyRulesEnabled, managerID, expected) => {
+        // Given an outstanding report and the caller's workspace enforcement setting.
+        jest.mocked(jest.requireMock<typeof PolicyUtils>('@libs/PolicyUtils').isPolicyAdmin).mockReturnValue(isAdmin);
+        const report = createMock<Report>({
+            reportID: REPORT_ID,
+            type: CONST.REPORT.TYPE.EXPENSE,
+            stateNum: CONST.REPORT.STATE_NUM.SUBMITTED,
+            statusNum: CONST.REPORT.STATUS_NUM.SUBMITTED,
+            managerID,
+        });
+        const policy = createMock<Policy>({
+            approvalMode: CONST.POLICY.APPROVAL_MODE.BASIC,
+        });
+
+        // When the caller opens the report menu.
+        const actions = getSecondaryReportActions({
+            currentUserLogin: MANAGER_EMAIL,
+            currentUserAccountID: MANAGER_ACCOUNT_ID,
+            submitterLogin: EMPLOYEE_EMAIL,
+            report,
+            chatReport,
+            reportTransactions: [],
+            originalTransaction: undefined,
+            violations: {},
+            bankAccountList: {},
+            policy,
+            rules: undefined,
+            cardList: undefined,
+            areStrictPolicyRulesEnabled,
+        });
+
+        // Then only admins and eligible current approvers can change the approver.
+        expect(actions.includes(CONST.REPORT.SECONDARY_ACTIONS.CHANGE_APPROVER)).toBe(expected);
+        jest.mocked(jest.requireMock<typeof PolicyUtils>('@libs/PolicyUtils').isPolicyAdmin).mockReturnValue(true);
+    });
+
     it('should always return default options', () => {
         const report = createMock<Report>({});
         const policy = createMock<Policy>({});

tests/unit/hooks/useSearchBulkActionsTest.ts

@@ -124,6 +124,12 @@ jest.mock('@hooks/useTheme', () => ({
     default: () => ({icon: ''}),
 }));
 
+let mockAreStrictPolicyRulesEnabled = false;
+jest.mock('@hooks/useStrictPolicyRules', () => ({
+    __esModule: true,
+    default: () => ({areStrictPolicyRulesEnabled: mockAreStrictPolicyRulesEnabled}),
+}));
+
 let mockIsOffline = false;
 jest.mock('@hooks/useNetwork', () => ({
     __esModule: true,
@@ -330,6 +336,7 @@ describe('useSearchBulkActions - CSV export flow', () => {
     beforeEach(async () => {
         jest.clearAllMocks();
         mockIsOffline = false;
+        mockAreStrictPolicyRulesEnabled = false;
         mockAreAllMatchingItemsSelected = false;
         await Onyx.clear();
         mockSelectedTransactions = {};
@@ -345,6 +352,55 @@ describe('useSearchBulkActions - CSV export flow', () => {
         await Onyx.clear();
     });
 
+    it.each([
+        [false, CURRENT_USER_ACCOUNT_ID, false, CONST.REPORT.STATUS_NUM.SUBMITTED, true],
+        [true, CURRENT_USER_ACCOUNT_ID, false, CONST.REPORT.STATUS_NUM.SUBMITTED, false],
+        [false, 2, false, CONST.REPORT.STATUS_NUM.SUBMITTED, false],
+        [true, 2, true, CONST.REPORT.STATUS_NUM.SUBMITTED, true],
+        [false, CURRENT_USER_ACCOUNT_ID, false, CONST.REPORT.STATUS_NUM.APPROVED, false],
+    ])('change approver visibility: enforcement=%s, manager=%s, admin capability=%s, status=%s', (enforcement, managerID, canChangeApprover, statusNum, expected) => {
+        // Given a selected report whose snapshot may not grant the admin-only capability.
+        mockAreStrictPolicyRulesEnabled = enforcement;
+        mockSelectedTransactions = {transaction1: makeSelectedTransaction()};
+        mockSelectedReports = [
+            {
+                reportID: 'report1',
+                policyID: 'policy1',
+                chatReportID: 'chat1',
+                action: CONST.SEARCH.ACTION_TYPES.VIEW,
+                canPay: false,
+                canApprove: false,
+                canSubmit: false,
+                canChangeApprover,
+                managerID,
+                total: 100,
+            },
+        ];
+        mockCurrentSearchResults = {
+            search: {type: CONST.SEARCH.DATA_TYPES.EXPENSE_REPORT},
+            data: {
+                [`${ONYXKEYS.COLLECTION.REPORT}report1`]: {
+                    reportID: 'report1',
+                    policyID: 'policy1',
+                    type: CONST.REPORT.TYPE.EXPENSE,
+                    stateNum: CONST.REPORT.STATE_NUM.SUBMITTED,
+                    statusNum,
+                    managerID,
+                },
+                [`${ONYXKEYS.COLLECTION.POLICY}policy1`]: {
+                    id: 'policy1',
+                    approvalMode: CONST.POLICY.APPROVAL_MODE.BASIC,
+                },
+            },
+        };
+
+        // When the bulk action menu is rendered from search snapshot data.
+        const {result} = renderHook(() => useSearchBulkActions({queryJSON: expenseReportQueryJSON}), {wrapper: OnyxListItemProvider});
+
+        // Then the menu respects assignment and enforcement while preserving admin capabilities.
+        expect(result.current.headerButtonsOptions.some((option) => option.value === CONST.SEARCH.BULK_ACTION_TYPES.CHANGE_APPROVER)).toBe(expected);
+    });
+
     it('uses the unreported-expenses warning for a single expense report', async () => {
         // Given a single selected expense report
         mockSelectedTransactions = {report1: makeSelectedTransaction()};