From 43c38ba40b27b6f8450c4280f9cf6cd720640067 Mon Sep 17 00:00:00 2001
From: dukenv0307 <dukenv0307@gmail.com>
Date: Mon, 15 Jan 2024 14:02:07 +0700
Subject: [PATCH] only display pending message for foreign currency transaction

---
 src/components/ReportActionItem/MoneyRequestAction.js |  2 +-
 src/libs/IOUUtils.ts                                  | 10 ++++++----
 tests/unit/IOUUtilsTest.js                            |  6 +++---
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/components/ReportActionItem/MoneyRequestAction.js b/src/components/ReportActionItem/MoneyRequestAction.js
index 46226969636e..d242dbe23e86 100644
--- a/src/components/ReportActionItem/MoneyRequestAction.js
+++ b/src/components/ReportActionItem/MoneyRequestAction.js
@@ -116,7 +116,7 @@ function MoneyRequestAction({
     const isDeletedParentAction = ReportActionsUtils.isDeletedParentAction(action);
     const isReversedTransaction = ReportActionsUtils.isReversedTransaction(action);
     if (!_.isEmpty(iouReport) && !_.isEmpty(reportActions) && chatReport.iouReportID && action.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD && network.isOffline) {
-        shouldShowPendingConversionMessage = IOUUtils.isIOUReportPendingCurrencyConversion(iouReport);
+        shouldShowPendingConversionMessage = IOUUtils.isTransactionPendingCurrencyConversion(iouReport, (action && action.originalMessage && action.originalMessage.IOUTransactionID) || 0);
     }
 
     return isDeletedParentAction || isReversedTransaction ? (
diff --git a/src/libs/IOUUtils.ts b/src/libs/IOUUtils.ts
index 11dd0f5badda..aab9aac2391d 100644
--- a/src/libs/IOUUtils.ts
+++ b/src/libs/IOUUtils.ts
@@ -110,12 +110,14 @@ function updateIOUOwnerAndTotal(iouReport: OnyxEntry<Report>, actorAccountID: nu
 }
 
 /**
- * Returns whether or not an IOU report contains money requests in a different currency
+ * Returns whether or not a transaction of IOU report contains money requests in a different currency
  * that are either created or cancelled offline, and thus haven't been converted to the report's currency yet
  */
-function isIOUReportPendingCurrencyConversion(iouReport: Report): boolean {
+function isTransactionPendingCurrencyConversion(iouReport: Report, transactionID: string): boolean {
     const reportTransactions: Transaction[] = TransactionUtils.getAllReportTransactions(iouReport.reportID);
-    const pendingRequestsInDifferentCurrency = reportTransactions.filter((transaction) => transaction.pendingAction && TransactionUtils.getCurrency(transaction) !== iouReport.currency);
+    const pendingRequestsInDifferentCurrency = reportTransactions.filter(
+        (transaction) => transaction.pendingAction && transaction.transactionID === transactionID && TransactionUtils.getCurrency(transaction) !== iouReport.currency,
+    );
     return pendingRequestsInDifferentCurrency.length > 0;
 }
 
@@ -127,4 +129,4 @@ function isValidMoneyRequestType(iouType: string): boolean {
     return moneyRequestType.includes(iouType);
 }
 
-export {calculateAmount, updateIOUOwnerAndTotal, isIOUReportPendingCurrencyConversion, isValidMoneyRequestType, navigateToStartMoneyRequestStep, navigateToStartStepIfScanFileCannotBeRead};
+export {calculateAmount, updateIOUOwnerAndTotal, isTransactionPendingCurrencyConversion, isValidMoneyRequestType, navigateToStartMoneyRequestStep, navigateToStartStepIfScanFileCannotBeRead};
diff --git a/tests/unit/IOUUtilsTest.js b/tests/unit/IOUUtilsTest.js
index ac04b74a0ca5..7f239d9bb576 100644
--- a/tests/unit/IOUUtilsTest.js
+++ b/tests/unit/IOUUtilsTest.js
@@ -17,7 +17,7 @@ function initCurrencyList() {
 }
 
 describe('IOUUtils', () => {
-    describe('isIOUReportPendingCurrencyConversion', () => {
+    describe('isTransactionPendingCurrencyConversion', () => {
         beforeAll(() => {
             Onyx.init({
                 keys: ONYXKEYS,
@@ -34,7 +34,7 @@ describe('IOUUtils', () => {
                 [`${ONYXKEYS.COLLECTION.TRANSACTION}${aedPendingTransaction.transactionID}`]: aedPendingTransaction,
             }).then(() => {
                 // We requested money offline in a different currency, we don't know the total of the iouReport until we're back online
-                expect(IOUUtils.isIOUReportPendingCurrencyConversion(iouReport)).toBe(true);
+                expect(IOUUtils.isTransactionPendingCurrencyConversion(iouReport, aedPendingTransaction.transactionID)).toBe(true);
             });
         });
 
@@ -54,7 +54,7 @@ describe('IOUUtils', () => {
                 },
             }).then(() => {
                 // We requested money online in a different currency, we know the iouReport total and there's no need to show the pending conversion message
-                expect(IOUUtils.isIOUReportPendingCurrencyConversion(iouReport)).toBe(false);
+                expect(IOUUtils.isTransactionPendingCurrencyConversion(iouReport, aedPendingTransaction.transactionID)).toBe(false);
             });
         });
     });