Skip to content

Commit 03dfc95

Browse files
Merge pull request #61072 from Krishna2323/krishna2323/issue/60793
fix: Expense - Approved expense that has violation is not marked as approved in the expense preview.
2 parents 1641201 + 10e02f7 commit 03dfc95

File tree

2 files changed

+13
-4
lines changed

2 files changed

+13
-4
lines changed

src/libs/TransactionPreviewUtils.ts

-4
Original file line numberDiff line numberDiff line change
@@ -229,10 +229,6 @@ function getTransactionPreviewTextAndTranslationPaths({
229229
isPreviewHeaderTextComplete = true;
230230
}
231231

232-
if (shouldShowRBR && transaction) {
233-
isPreviewHeaderTextComplete = true;
234-
}
235-
236232
if (!isPreviewHeaderTextComplete) {
237233
if (hasViolationsOfTypeNotice && transaction && !isReportApproved({report: iouReport}) && !isSettled(iouReport?.reportID)) {
238234
previewHeaderText.push(dotSeparator, {translationPath: 'violations.reviewRequired'});

tests/unit/TransactionPreviewUtils.test.ts

+13
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import {buildOptimisticIOUReport, buildOptimisticIOUReportAction} from '@libs/Re
22
import {createTransactionPreviewConditionals, getTransactionPreviewTextAndTranslationPaths} from '@libs/TransactionPreviewUtils';
33
import {buildOptimisticTransaction} from '@libs/TransactionUtils';
44
import CONST from '@src/CONST';
5+
import * as ReportUtils from '@src/libs/ReportUtils';
56

67
const basicProps = {
78
iouReport: buildOptimisticIOUReport(123, 234, 1000, '1', 'USD'),
@@ -118,6 +119,18 @@ describe('TransactionPreviewUtils', () => {
118119
const result = getTransactionPreviewTextAndTranslationPaths(functionArgs);
119120
expect(result.previewHeaderText).toContainEqual({translationPath: 'iou.canceled'});
120121
});
122+
123+
it('should include "Approved" in the preview when the report is approved, regardless of whether RBR is shown', () => {
124+
const functionArgs = {
125+
...basicProps,
126+
iouReport: {...basicProps.iouReport, stateNum: CONST.REPORT.STATE_NUM.APPROVED, statusNum: CONST.REPORT.STATUS_NUM.APPROVED},
127+
shouldShowRBR: true,
128+
};
129+
jest.spyOn(ReportUtils, 'isPaidGroupPolicyExpenseReport').mockReturnValue(true);
130+
const result = getTransactionPreviewTextAndTranslationPaths(functionArgs);
131+
132+
expect(result.previewHeaderText).toContainEqual({translationPath: 'iou.approved'});
133+
});
121134
});
122135

123136
describe('createTransactionPreviewConditionals', () => {

0 commit comments

Comments
 (0)