Skip to content

Report can be selected on confirm page when expense cannot be added #79583

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
MariaHCD merged 6 commits into from
Jan 27, 2026
Merged

Report can be selected on confirm page when expense cannot be added #79583

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4fc1ab6
fix: report can be selected on confirm page
mkzie2 Jan 14, 2026
3deca48
Merge branch 'main' into mkzie2-issue/77661
mkzie2 Jan 23, 2026
ae8519d
Merge branch 'main' into mkzie2-issue/77661
mkzie2 Jan 26, 2026
7cd8860
fix: apply suggestions
mkzie2 Jan 26, 2026
c47f3cb
Merge branch 'main' into mkzie2-issue/77661
mkzie2 Jan 27, 2026
ca9e676
fix: apply suggestions
mkzie2 Jan 27, 2026
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
31 changes: 17 additions & 14 deletions src/libs/ReportUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11355,25 +11355,28 @@ function isReportOutstanding(
reportNameValuePairs: OnyxCollection<ReportNameValuePairs> = allReportNameValuePair,
allowSubmitted = true,
): boolean {
if (!iouReport || isEmptyObject(iouReport)) {
if (
!iouReport ||
isEmptyObject(iouReport) ||
!isExpenseReport(iouReport) ||
iouReport?.stateNum === undefined ||
iouReport?.statusNum === undefined ||
iouReport?.policyID !== policyID ||
hasForwardedAction(iouReport.reportID)
) {
return false;
}
const reportNameValuePair = reportNameValuePairs?.[`${ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS}${iouReport.reportID}`];
if (isArchivedReport(reportNameValuePair)) {
return false;
}
const currentRoute = navigationRef.getCurrentRoute();
const params = currentRoute?.params as MoneyRequestNavigatorParamList[typeof SCREENS.MONEY_REQUEST.STEP_CONFIRMATION] | ReportsSplitNavigatorParamList[typeof SCREENS.REPORT];
const activeReport = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${params?.reportID}`];
const policy = allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${policyID}`];
const reportNameValuePair = reportNameValuePairs?.[`${ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS}${iouReport.reportID}`];
const shouldAllowSubmittedReport = allowSubmitted || isInstantSubmitEnabled(policy) || isProcessingReport(activeReport);
return (
isExpenseReport(iouReport) &&
iouReport?.stateNum !== undefined &&
iouReport?.statusNum !== undefined &&
iouReport?.policyID === policyID &&
(shouldAllowSubmittedReport ? iouReport?.stateNum <= CONST.REPORT.STATE_NUM.SUBMITTED : iouReport?.stateNum < CONST.REPORT.STATE_NUM.SUBMITTED) &&
(shouldAllowSubmittedReport ? iouReport?.statusNum <= CONST.REPORT.STATE_NUM.SUBMITTED : iouReport?.statusNum < CONST.REPORT.STATE_NUM.SUBMITTED) &&
!hasForwardedAction(iouReport.reportID) &&
!isArchivedReport(reportNameValuePair)
);
if (allowSubmitted || isProcessingReport(activeReport) || canAddTransaction(iouReport, false, false)) {
return iouReport.stateNum <= CONST.REPORT.STATE_NUM.SUBMITTED && iouReport.statusNum <= CONST.REPORT.STATE_NUM.SUBMITTED;
}
return iouReport.stateNum < CONST.REPORT.STATE_NUM.SUBMITTED && iouReport.statusNum < CONST.REPORT.STATE_NUM.SUBMITTED;
}

/**
Expand Down
Loading