Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 6 additions & 2 deletions src/libs/TransactionPreviewUtils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import DateUtils from './DateUtils';
import type {PlatformStackRouteProp} from './Navigation/PlatformStackNavigation/types';
import type {TransactionDuplicateNavigatorParamList} from './Navigation/types';
import {getOriginalMessage, isMessageDeleted, isMoneyRequestAction} from './ReportActionsUtils';
import {hasActionsWithErrors, hasReportViolations, isPaidGroupPolicy, isPaidGroupPolicyExpenseReport, isReportApproved, isReportOwner, isSettled} from './ReportUtils';
import {hasActionsWithErrors, hasReceiptError, hasReportViolations, isPaidGroupPolicy, isPaidGroupPolicyExpenseReport, isReportApproved, isReportOwner, isSettled} from './ReportUtils';
import type {TransactionDetails} from './ReportUtils';
import StringUtils from './StringUtils';
import {
Expand Down Expand Up @@ -194,6 +194,10 @@ function getTransactionPreviewTextAndTranslationPaths({
RBRMessage = path;
}

if (hasReceiptError(transaction) && RBRMessage === undefined) {
RBRMessage = {translationPath: 'iou.error.receiptFailureMessageShort'};
}

if (hasFieldErrors && RBRMessage === undefined) {
const merchantMissing = isMerchantMissing(transaction);
const amountMissing = isAmountMissing(transaction);
Expand Down Expand Up @@ -331,7 +335,7 @@ function createTransactionPreviewConditionals({
hasViolation(transaction, violations, true);
const hasErrorOrOnHold = hasFieldErrors || (!isFullySettled && !isFullyApproved && isTransactionOnHold);
const hasReportViolationsOrActionErrors = (isReportOwner(iouReport) && hasReportViolations(iouReport?.reportID)) || hasActionsWithErrors(iouReport?.reportID);
const shouldShowRBR = hasAnyViolations || hasErrorOrOnHold || hasReportViolationsOrActionErrors;
const shouldShowRBR = hasAnyViolations || hasErrorOrOnHold || hasReportViolationsOrActionErrors || hasReceiptError(transaction);

// When there are no settled transactions in duplicates, show the "Keep this one" button
const shouldShowKeepButton = areThereDuplicates;
Expand Down
44 changes: 44 additions & 0 deletions tests/unit/TransactionPreviewUtils.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,29 @@ describe('TransactionPreviewUtils', () => {
expect(result.RBRMessage.translationPath).toContain('iou.expenseWasPutOnHold');
});

it('returns correct receipt error message when the transaction has receipt error', () => {
const functionArgs = {
...basicProps,
transaction: {
...basicProps.transaction,
errors: {
error1: {
error: CONST.IOU.RECEIPT_ERROR,
source: 'source.com',
filename: 'file_name.png',
action: 'replaceReceipt',
retryParams: {transactionID: basicProps.transaction.transactionID, source: 'source.com'},
},
},
},
originalTransaction: undefined,
shouldShowRBR: true,
};

const result = getTransactionPreviewTextAndTranslationPaths(functionArgs);
expect(result.RBRMessage.translationPath).toContain('iou.error.receiptFailureMessageShort');
});

it('should handle missing iouReport and transaction correctly', () => {
const functionArgs = {...basicProps, iouReport: undefined, transaction: undefined, originalTransaction: undefined};
const result = getTransactionPreviewTextAndTranslationPaths(functionArgs);
Expand Down Expand Up @@ -208,6 +231,27 @@ describe('TransactionPreviewUtils', () => {
expect(result.shouldShowRBR).toBeTruthy();
});

it('should determine RBR visibility according to whether there is a receipt error', () => {
const functionArgs = {
...basicProps,
transaction: {
...basicProps.transaction,
errors: {
error1: {
error: CONST.IOU.RECEIPT_ERROR,
source: 'source.com',
filename: 'file_name.png',
action: 'replaceReceipt',
retryParams: {transactionID: basicProps.transaction.transactionID, source: 'source.com'},
},
},
},
};

const result = createTransactionPreviewConditionals(functionArgs);
expect(result.shouldShowRBR).toBeTruthy();
});

it("should not show category if it's not a policy expense chat", () => {
const functionArgs = {...basicProps, isReportAPolicyExpenseChat: false};
const result = createTransactionPreviewConditionals(functionArgs);
Expand Down
Loading