Skip to content

fix: Unexpected error when approver hold expense #90881

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

Draft
paulnjs wants to merge 1 commit into
base: main
Choose a base branch
from
+13 −0
Draft

fix: Unexpected error when approver hold expense #90881

Show file tree
Hide file tree
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
7 changes: 7 additions & 0 deletions src/libs/ReportSecondaryActionUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ import {
hasOnlyNonReimbursableTransactions,
hasReportBeenReopened as hasReportBeenReopenedUtils,
hasReportBeenRetracted as hasReportBeenRetractedUtils,
isActionCreator,
isArchivedReport,
isAwaitingFirstLevelApproval,
isClosedReport as isClosedReportUtils,
Expand All @@ -68,6 +69,7 @@ import {
isInvoiceReport as isInvoiceReportUtils,
isIOUReport as isIOUReportUtils,
isMoneyRequestReportEligibleForMerge,
isOpenExpenseReport,
isOpenReport as isOpenReportUtils,
isPayer as isPayerUtils,
isProcessingReport as isProcessingReportUtils,
Expand Down Expand Up @@ -562,6 +564,11 @@ function isHoldActionForTransaction(
const iouOrExpenseReport = isExpenseReport || isIOUReport;
const holdReportAction = getReportAction(reportAction?.childReportID, `${reportTransaction?.comment?.hold ?? ''}`);
const {canHoldRequest} = canHoldUnholdReportAction(report, reportAction, holdReportAction, reportTransaction, policy, currentUserAccountID);
const isActionOwner = isActionCreator(reportAction);

if (isOpenExpenseReport(report)) {
return isActionOwner;
}

if (!iouOrExpenseReport || !canHoldRequest) {
return false;
Expand Down
6 changes: 6 additions & 0 deletions src/libs/actions/IOU/Hold.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,7 @@ function putOnHold(
| typeof ONYXKEYS.COLLECTION.REPORT
| typeof ONYXKEYS.COLLECTION.REPORT_METADATA
| typeof ONYXKEYS.COLLECTION.NEXT_STEP
| typeof ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS
>
> = [
{
Expand Down Expand Up @@ -189,6 +190,11 @@ function putOnHold(
lastVisibleActionCreated: transactionThreadReport.lastVisibleActionCreated,
},
},
{
onyxMethod: Onyx.METHOD.MERGE,
key: `${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${transactionID}`,
value: transactionViolations,
},
];

// If the transaction thread report wasn't created before, we create it optimistically
Expand Down
Loading