Skip to content

Commit 0d9c788

Browse files
authored
Merge pull request #77967 from daledah/fix/77779
fix: header shows wrong amount after dismissing distance rate error
2 parents b541a18 + 073c2f2 commit 0d9c788

1 file changed

Lines changed: 11 additions & 1 deletion

File tree

src/components/ReportActionItem/MoneyRequestReceiptView.tsx

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,6 +205,14 @@ function MoneyRequestReceiptView({
205205

206206
const [showConfirmDismissReceiptError, setShowConfirmDismissReceiptError] = useState(false);
207207

208+
const transactionAndReportActionErrors = useMemo(
209+
() => ({
210+
...transaction?.errors,
211+
...parentReportAction?.errors,
212+
}),
213+
[transaction?.errors, parentReportAction?.errors],
214+
);
215+
208216
const dismissReceiptError = useCallback(() => {
209217
if (!report?.reportID) {
210218
return;
@@ -227,8 +235,10 @@ function MoneyRequestReceiptView({
227235
clearAllRelatedReportActionErrors(report.reportID, parentReportAction);
228236
return;
229237
}
230-
if (!isEmptyObject(errorsWithoutReportCreation)) {
238+
if (!isEmptyObject(transactionAndReportActionErrors)) {
231239
revert(transaction, getLastModifiedExpense(report?.reportID));
240+
}
241+
if (!isEmptyObject(errorsWithoutReportCreation)) {
232242
clearError(transaction.transactionID);
233243
clearAllRelatedReportActionErrors(report.reportID, parentReportAction);
234244
}

0 commit comments

Comments
 (0)