Skip to content

[CP Staging] Partial revert 72366 #73585

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
inimaga merged 1 commit into from
Oct 27, 2025
Merged

[CP Staging] Partial revert 72366 #73585

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 3 additions & 7 deletions src/pages/iou/HoldReasonPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import React, {useCallback, useEffect} from 'react';
import type {FormInputErrors, FormOnyxValues} from '@components/Form/types';
import useLocalize from '@hooks/useLocalize';
import useOnyx from '@hooks/useOnyx';
import useReportIsArchived from '@hooks/useReportIsArchived';
import {addErrorMessage} from '@libs/ErrorUtils';
import Navigation from '@libs/Navigation/Navigation';
import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types';
Expand All @@ -27,9 +26,6 @@ function HoldReasonPage({route}: HoldReasonPageProps) {
const {transactionID, reportID, backTo, searchHash} = route.params;

const [report] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${reportID}`, {canBeMissing: true});
const [policy] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${report?.policyID}`, {canBeMissing: true});
const [transaction] = useOnyx(`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`, {canBeMissing: true});
const isChatReportArchived = useReportIsArchived(report?.chatReportID);

// We first check if the report is part of a policy - if not, then it's a personal request (1:1 request)
// For personal requests, we need to allow both users to put the request on hold
Expand All @@ -40,7 +36,7 @@ function HoldReasonPage({route}: HoldReasonPageProps) {
// We have extra isWorkspaceRequest condition since, for 1:1 requests, canEditMoneyRequest will rightly return false
// as we do not allow requestee to edit fields like description and amount.
// But, we still want the requestee to be able to put the request on hold
if (isMoneyRequestAction(parentReportAction) && !canEditMoneyRequest(parentReportAction, isChatReportArchived, report, policy, transaction) && isWorkspaceRequest) {
if (isMoneyRequestAction(parentReportAction) && !canEditMoneyRequest(parentReportAction) && isWorkspaceRequest) {
return;
}

Expand All @@ -58,15 +54,15 @@ function HoldReasonPage({route}: HoldReasonPageProps) {
// We have extra isWorkspaceRequest condition since, for 1:1 requests, canEditMoneyRequest will rightly return false
// as we do not allow requestee to edit fields like description and amount.
// But, we still want the requestee to be able to put the request on hold
if (isMoneyRequestAction(parentReportAction) && !canEditMoneyRequest(parentReportAction, isChatReportArchived, report, policy, transaction) && isWorkspaceRequest) {
if (isMoneyRequestAction(parentReportAction) && !canEditMoneyRequest(parentReportAction) && isWorkspaceRequest) {
const formErrors = {};
addErrorMessage(formErrors, 'reportModified', translate('common.error.requestModified'));
setErrors(ONYXKEYS.FORMS.MONEY_REQUEST_HOLD_FORM, formErrors);
}

return errors;
},
[parentReportAction, isWorkspaceRequest, translate, isChatReportArchived, report, policy, transaction],
[parentReportAction, isWorkspaceRequest, translate],
);

useEffect(() => {
Expand Down
Loading