From a7b6d6a9501df1e144831fae2fd0c9ca4ca7eaf5 Mon Sep 17 00:00:00 2001 From: Shahe Shahinyan Date: Mon, 4 Mar 2024 22:06:54 +0400 Subject: [PATCH] Always Display 'Review required' if there is a violations error --- .../MoneyRequestPreviewContent.tsx | 30 +++++++++---------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/src/components/ReportActionItem/MoneyRequestPreview/MoneyRequestPreviewContent.tsx b/src/components/ReportActionItem/MoneyRequestPreview/MoneyRequestPreviewContent.tsx index 58c9965af4fa..0a40c6463325 100644 --- a/src/components/ReportActionItem/MoneyRequestPreview/MoneyRequestPreviewContent.tsx +++ b/src/components/ReportActionItem/MoneyRequestPreview/MoneyRequestPreviewContent.tsx @@ -152,27 +152,25 @@ function MoneyRequestPreviewContent({ let message = translate('iou.cash'); if (shouldShowRBR && transaction) { - if (hasFieldErrors) { - const isMerchantMissing = TransactionUtils.isMerchantMissing(transaction); - const isAmountMissing = TransactionUtils.isAmountMissing(transaction); - - if (isAmountMissing && isMerchantMissing) { - message += ` • ${translate('violations.reviewRequired')}`; - } else if (isAmountMissing) { - message += ` • ${translate('iou.missingAmount')}`; - } else { - message += ` • ${translate('iou.missingMerchant')}`; - } - - return message; - } - const violations = TransactionUtils.getTransactionViolations(transaction.transactionID, transactionViolations); if (violations?.[0]) { const violationMessage = ViolationsUtils.getViolationTranslation(violations[0], translate); const isTooLong = violations.filter((v) => v.type === 'violation').length > 1 || violationMessage.length > 15; - message += ` • ${isTooLong ? translate('violations.reviewRequired') : violationMessage}`; + + return `${message} • ${isTooLong ? translate('violations.reviewRequired') : violationMessage}`; } + + const isMerchantMissing = TransactionUtils.isMerchantMissing(transaction); + const isAmountMissing = TransactionUtils.isAmountMissing(transaction); + + if (isAmountMissing && isMerchantMissing) { + message += ` • ${translate('violations.reviewRequired')}`; + } else if (isAmountMissing) { + message += ` • ${translate('iou.missingAmount')}`; + } else { + message += ` • ${translate('iou.missingMerchant')}`; + } + } else if (ReportUtils.isPaidGroupPolicyExpenseReport(iouReport) && ReportUtils.isReportApproved(iouReport) && !ReportUtils.isSettled(iouReport?.reportID)) { message += ` • ${translate('iou.approved')}`; } else if (iouReport?.isWaitingOnBankAccount) {