Merge pull request #36407 from shahinyan11/issues/34418

Fix displaying edited amount in IOU preview for scan failed receipt
Expensify · Mar 12, 2024 · 59c98ce · 59c98ce
2 parents d1a7dca + 64259b3
commit 59c98ce
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 8 deletions.
diff --git a/src/components/ReportActionItem/MoneyRequestPreview/MoneyRequestPreviewContent.tsx b/src/components/ReportActionItem/MoneyRequestPreview/MoneyRequestPreviewContent.tsx
@@ -24,7 +24,6 @@ import ControlSelection from '@libs/ControlSelection';
 import * as CurrencyUtils from '@libs/CurrencyUtils';
 import * as DeviceCapabilities from '@libs/DeviceCapabilities';
 import * as IOUUtils from '@libs/IOUUtils';
-import * as Localize from '@libs/Localize';
 import * as OptionsListUtils from '@libs/OptionsListUtils';
 import * as ReceiptUtils from '@libs/ReceiptUtils';
 import * as ReportActionsUtils from '@libs/ReportActionsUtils';
@@ -152,12 +151,25 @@ function MoneyRequestPreviewContent({
         }
 
         let message = translate('iou.cash');
-        if (hasViolations && transaction) {
+        if (shouldShowRBR && transaction) {
             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}`;
+                const violationsCount = violations.filter((v) => v.type === 'violation').length;
+                const isTooLong = violationsCount > 1 || violationMessage.length > 15;
+                const hasViolationsAndFieldErrors = violationsCount > 0 && hasFieldErrors;
+
+                return `${message} • ${isTooLong || hasViolationsAndFieldErrors ? 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')}`;
@@ -180,10 +192,6 @@ function MoneyRequestPreviewContent({
             return translate('iou.routePending');
         }
 
-        if (!isSettled && TransactionUtils.hasMissingSmartscanFields(transaction)) {
-            return Localize.translateLocal('iou.receiptMissingDetails');
-        }
-
         return CurrencyUtils.convertToDisplayString(requestAmount, requestCurrency);
     };
 

diff --git a/src/languages/en.ts b/src/languages/en.ts
@@ -605,6 +605,8 @@ export default {
         routePending: 'Route pending...',
         receiptScanning: 'Scan in progress…',
         receiptMissingDetails: 'Receipt missing details',
+        missingAmount: 'Missing amount',
+        missingMerchant: 'Missing merchant',
         receiptStatusTitle: 'Scanning…',
         receiptStatusText: "Only you can see this receipt when it's scanning. Check back later or enter the details now.",
         receiptScanningFailed: 'Receipt scanning failed. Enter the details manually.',

diff --git a/src/languages/es.ts b/src/languages/es.ts
@@ -598,6 +598,8 @@ export default {
         routePending: 'Ruta pendiente...',
         receiptScanning: 'Escaneo en curso…',
         receiptMissingDetails: 'Recibo con campos vacíos',
+        missingAmount: 'Falta importe',
+        missingMerchant: 'Falta comerciante',
         receiptStatusTitle: 'Escaneando…',
         receiptStatusText: 'Solo tú puedes ver este recibo cuando se está escaneando. Vuelve más tarde o introduce los detalles ahora.',
         receiptScanningFailed: 'El escaneo de recibo ha fallado. Introduce los detalles manualmente.',