Skip to content

Commit 73ec4ca

Browse files
authored
Merge pull request Expensify#89467 from mkzie2/mkzie2-issue/85217
fix: scan expense add to 2nd report
2 parents f01635e + eade079 commit 73ec4ca

2 files changed

Lines changed: 5 additions & 2 deletions

File tree

src/libs/ReportUtils.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11107,6 +11107,7 @@ function shouldCreateNewMoneyRequestReport(
1110711107
isScanRequest: boolean,
1110811108
betas: OnyxEntry<Beta[]>,
1110911109
action?: IOUAction,
11110+
isFromExistingReport?: boolean,
1111011111
): boolean {
1111111112
if (existingIOUReport && !!existingIOUReport.errorFields?.createChat) {
1111211113
return true;
@@ -11117,7 +11118,7 @@ function shouldCreateNewMoneyRequestReport(
1111711118
!existingIOUReport ||
1111811119
hasIOUWaitingOnCurrentUserBankAccount(chatReport) ||
1111911120
!canAddTransaction(existingIOUReport) ||
11120-
(action !== CONST.IOU.ACTION.SUBMIT && isScanRequest && isASAPSubmitBetaEnabled)
11121+
(!isFromExistingReport && action !== CONST.IOU.ACTION.SUBMIT && isScanRequest && isASAPSubmitBetaEnabled)
1112111122
);
1112211123
}
1112311124

src/libs/actions/IOU/MoneyRequestBuilder.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1228,7 +1228,9 @@ function getMoneyRequestInformation(moneyRequestInformation: MoneyRequestInforma
12281228
}),
12291229
});
12301230

1231-
const shouldCreateNewMoneyRequestReport = isSplitExpense ? false : shouldCreateNewMoneyRequestReportReportUtils(iouReport, chatReport, isScanRequest, betas, action);
1231+
const shouldCreateNewMoneyRequestReport = isSplitExpense
1232+
? false
1233+
: shouldCreateNewMoneyRequestReportReportUtils(iouReport, chatReport, isScanRequest, betas, action, !!moneyRequestReportID);
12321234

12331235
// Generate IDs upfront so we can pass them to buildOptimisticExpenseReport for formula computation
12341236
const optimisticTransactionID = existingTransactionID ?? rand64();

0 commit comments

Comments
 (0)