Merge pull request Expensify#65842 from thelullabyy/fix/64531-unexpected-error-displayed

Author: iwiznia

src/libs/ReportUtils.ts

@@ -9678,14 +9678,22 @@ function getTripIDFromTransactionParentReportID(transactionParentReportID: strin
 /**
  * Checks if report contains actions with errors
  */
-function hasActionsWithErrors(reportID: string | undefined): boolean {
+function hasActionWithErrorsForTransaction(reportID: string | undefined, transaction: Transaction | undefined): boolean {
     if (!reportID) {
         return false;
     }
     const reportActions = allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`] ?? {};
     return Object.values(reportActions)
         .filter(Boolean)
-        .some((action) => !isEmptyObject(action.errors));
+        .some((action) => {
+            if (isMoneyRequestAction(action) && getOriginalMessage(action)?.IOUTransactionID) {
+                if (getOriginalMessage(action)?.IOUTransactionID === transaction?.transactionID) {
+                    return !isEmptyObject(action.errors);
+                }
+                return false;
+            }
+            return !isEmptyObject(action.errors);
+        });
 }
 
 function isNonAdminOrOwnerOfPolicyExpenseChat(report: OnyxInputOrEntry<Report>, policy: OnyxInputOrEntry<Policy>): boolean {
@@ -11272,7 +11280,7 @@ export {
     getInvoicesChatName,
     getPayeeName,
     getQuickActionDetails,
-    hasActionsWithErrors,
+    hasActionWithErrorsForTransaction,
     hasAutomatedExpensifyAccountIDs,
     hasExpensifyGuidesEmails,
     hasHeldExpenses,

src/libs/TransactionPreviewUtils.ts

@@ -13,7 +13,16 @@ 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, hasReceiptError, hasReportViolations, isPaidGroupPolicy, isPaidGroupPolicyExpenseReport, isReportApproved, isReportOwner, isSettled} from './ReportUtils';
+import {
+    hasActionWithErrorsForTransaction,
+    hasReceiptError,
+    hasReportViolations,
+    isPaidGroupPolicy,
+    isPaidGroupPolicyExpenseReport,
+    isReportApproved,
+    isReportOwner,
+    isSettled,
+} from './ReportUtils';
 import type {TransactionDetails} from './ReportUtils';
 import StringUtils from './StringUtils';
 import {
@@ -130,11 +139,17 @@ function getViolationTranslatePath(violations: OnyxTypes.TransactionViolations,
  * it returns an empty array. It identifies the latest error in each action and filters out duplicates to
  * ensure only unique error messages are returned.
  */
-function getUniqueActionErrors(reportActions: OnyxTypes.ReportActions) {
+function getUniqueActionErrorsForTransaction(reportActions: OnyxTypes.ReportActions, transaction: OnyxTypes.Transaction | undefined) {
     const reportErrors = Object.values(reportActions).map((reportAction) => {
         const errors = reportAction.errors ?? {};
         const key = Object.keys(errors).sort().reverse().at(0) ?? '';
         const error = errors[key];
+        if (isMoneyRequestAction(reportAction) && getOriginalMessage(reportAction)?.IOUTransactionID) {
+            if (getOriginalMessage(reportAction)?.IOUTransactionID === transaction?.transactionID) {
+                return typeof error === 'string' ? error : '';
+            }
+            return '';
+        }
         return typeof error === 'string' ? error : '';
     });
 
@@ -175,7 +190,7 @@ function getTransactionPreviewTextAndTranslationPaths({
     const isTransactionScanning = isScanning(transaction);
     const hasFieldErrors = hasMissingSmartscanFields(transaction);
     const hasViolationsOfTypeNotice = hasNoticeTypeViolation(transaction, violations, true) && isPaidGroupPolicy(iouReport);
-    const hasActionWithErrors = hasActionsWithErrors(iouReport?.reportID);
+    const hasActionWithErrors = hasActionWithErrorsForTransaction(iouReport?.reportID, transaction);
 
     const {amount: requestAmount, currency: requestCurrency} = transactionDetails;
 
@@ -211,7 +226,7 @@ function getTransactionPreviewTextAndTranslationPaths({
     }
 
     if (RBRMessage === undefined && hasActionWithErrors && !!reportActions) {
-        const actionsWithErrors = getUniqueActionErrors(reportActions);
+        const actionsWithErrors = getUniqueActionErrorsForTransaction(reportActions, transaction);
         RBRMessage = actionsWithErrors.length > 1 ? {translationPath: 'violations.reviewRequired'} : {text: actionsWithErrors.at(0)};
     }
 
@@ -334,7 +349,7 @@ function createTransactionPreviewConditionals({
         hasWarningTypeViolation(transaction, violations, true) ||
         hasViolation(transaction, violations, true);
     const hasErrorOrOnHold = hasFieldErrors || (!isFullySettled && !isFullyApproved && isTransactionOnHold);
-    const hasReportViolationsOrActionErrors = (isReportOwner(iouReport) && hasReportViolations(iouReport?.reportID)) || hasActionsWithErrors(iouReport?.reportID);
+    const hasReportViolationsOrActionErrors = (isReportOwner(iouReport) && hasReportViolations(iouReport?.reportID)) || hasActionWithErrorsForTransaction(iouReport?.reportID, transaction);
     const shouldShowRBR = hasAnyViolations || hasErrorOrOnHold || hasReportViolationsOrActionErrors || hasReceiptError(transaction);
 
     // When there are no settled transactions in duplicates, show the "Keep this one" button
@@ -372,6 +387,6 @@ export {
     getTransactionPreviewTextAndTranslationPaths,
     createTransactionPreviewConditionals,
     getViolationTranslatePath,
-    getUniqueActionErrors,
+    getUniqueActionErrorsForTransaction,
 };
 export type {TranslationPathOrText};

tests/unit/TransactionPreviewUtils.test.ts

@@ -1,7 +1,12 @@
 import Onyx from 'react-native-onyx';
 import {convertAmountToDisplayString} from '@libs/CurrencyUtils';
 import {buildOptimisticIOUReport, buildOptimisticIOUReportAction} from '@libs/ReportUtils';
-import {createTransactionPreviewConditionals, getTransactionPreviewTextAndTranslationPaths, getUniqueActionErrors, getViolationTranslatePath} from '@libs/TransactionPreviewUtils';
+import {
+    createTransactionPreviewConditionals,
+    getTransactionPreviewTextAndTranslationPaths,
+    getUniqueActionErrorsForTransaction,
+    getViolationTranslatePath,
+} from '@libs/TransactionPreviewUtils';
 import {buildOptimisticTransaction} from '@libs/TransactionUtils';
 import CONST from '@src/CONST';
 import * as ReportUtils from '@src/libs/ReportUtils';
@@ -401,9 +406,9 @@ describe('TransactionPreviewUtils', () => {
         });
     });
 
-    describe('getUniqueActionErrors', () => {
+    describe('getUniqueActionErrorsForTransaction', () => {
         test('returns an empty array if there are no actions', () => {
-            expect(getUniqueActionErrors({})).toEqual([]);
+            expect(getUniqueActionErrorsForTransaction({}, undefined)).toEqual([]);
         });
 
         test('returns unique error messages from report actions', () => {
@@ -416,7 +421,7 @@ describe('TransactionPreviewUtils', () => {
             } as unknown as ReportActions;
 
             const expectedErrors = ['Error B', 'Error C', 'Error D'];
-            expect(getUniqueActionErrors(actions).sort()).toEqual(expectedErrors.sort());
+            expect(getUniqueActionErrorsForTransaction(actions, undefined).sort()).toEqual(expectedErrors.sort());
         });
 
         test('returns the latest error message if multiple errors exist under a single action', () => {
@@ -426,7 +431,7 @@ describe('TransactionPreviewUtils', () => {
                 /* eslint-enable @typescript-eslint/naming-convention */
             } as unknown as ReportActions;
 
-            expect(getUniqueActionErrors(actions)).toEqual(['Error Z2']);
+            expect(getUniqueActionErrorsForTransaction(actions, undefined)).toEqual(['Error Z2']);
         });
 
         test('filters out non-string error messages', () => {
@@ -437,7 +442,7 @@ describe('TransactionPreviewUtils', () => {
                 /* eslint-enable @typescript-eslint/naming-convention */
             } as unknown as ReportActions;
 
-            expect(getUniqueActionErrors(actions)).toEqual(['Error B', 'Error D']);
+            expect(getUniqueActionErrorsForTransaction(actions, undefined)).toEqual(['Error B', 'Error D']);
         });
     });
 });