From 907d57af3449d137ed13725c8d9841a7321eedc5 Mon Sep 17 00:00:00 2001
From: daledah <daleda261@outlook.com>
Date: Thu, 15 Aug 2024 11:06:50 +0700
Subject: [PATCH 1/7] fix: remove settled transactions from duplicates

---
 .../MoneyRequestPreview/MoneyRequestPreviewContent.tsx | 10 ++++++----
 src/libs/ReportUtils.ts                                |  5 +++++
 src/libs/TransactionUtils/index.ts                     |  5 +++--
 src/pages/TransactionDuplicate/Review.tsx              |  4 ++++
 4 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/src/components/ReportActionItem/MoneyRequestPreview/MoneyRequestPreviewContent.tsx b/src/components/ReportActionItem/MoneyRequestPreview/MoneyRequestPreviewContent.tsx
index 8597654576fc..df463acc12c9 100644
--- a/src/components/ReportActionItem/MoneyRequestPreview/MoneyRequestPreviewContent.tsx
+++ b/src/components/ReportActionItem/MoneyRequestPreview/MoneyRequestPreviewContent.tsx
@@ -125,9 +125,11 @@ function MoneyRequestPreviewContent({
     // Get transaction violations for given transaction id from onyx, find duplicated transactions violations and get duplicates
     const duplicates = useMemo(
         () =>
-            transactionViolations?.[`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${transaction?.transactionID}`]?.find(
-                (violation) => violation.name === CONST.VIOLATIONS.DUPLICATED_TRANSACTION,
-            )?.data?.duplicates ?? [],
+            ReportUtils.removeSettledTransactions(
+                transactionViolations?.[`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${transaction?.transactionID}`]?.find(
+                    (violation) => violation.name === CONST.VIOLATIONS.DUPLICATED_TRANSACTION,
+                )?.data?.duplicates ?? [],
+            ),
         [transaction?.transactionID, transactionViolations],
     );
 
@@ -438,7 +440,7 @@ function MoneyRequestPreviewContent({
             ]}
         >
             {childContainer}
-            {isReviewDuplicateTransactionPage && (
+            {isReviewDuplicateTransactionPage && !isSettled && (
                 <Button
                     text={translate('violations.keepThisOne')}
                     success
diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts
index 9c5a42de9e1e..c5a240368926 100644
--- a/src/libs/ReportUtils.ts
+++ b/src/libs/ReportUtils.ts
@@ -7615,6 +7615,10 @@ function getApprovalChain(policy: OnyxEntry<Policy>, employeeAccountID: number,
     return approvalChain;
 }
 
+function removeSettledTransactions(transactionIDs: string[]) {
+    return transactionIDs.filter((transactionID) => !isSettled(allTransactions?.[`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`]?.reportID));
+}
+
 export {
     addDomainToShortMention,
     completeShortMention,
@@ -7914,6 +7918,7 @@ export {
     getArchiveReason,
     getApprovalChain,
     isIndividualInvoiceRoom,
+    removeSettledTransactions,
 };
 
 export type {
diff --git a/src/libs/TransactionUtils/index.ts b/src/libs/TransactionUtils/index.ts
index a865b78a9bbf..2e6fa6a17618 100644
--- a/src/libs/TransactionUtils/index.ts
+++ b/src/libs/TransactionUtils/index.ts
@@ -17,6 +17,7 @@ import * as PolicyUtils from '@libs/PolicyUtils';
 // eslint-disable-next-line import/no-cycle
 import * as ReportActionsUtils from '@libs/ReportActionsUtils';
 import * as ReportConnection from '@libs/ReportConnection';
+import * as ReportUtils from '@libs/ReportUtils';
 import type {IOURequestType} from '@userActions/IOU';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
@@ -915,7 +916,7 @@ type FieldsToChange = {
 function compareDuplicateTransactionFields(transactionID: string): {keep: Partial<ReviewDuplicates>; change: FieldsToChange} {
     const transactionViolations = allTransactionViolations?.[`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${transactionID}`];
     const duplicates = transactionViolations?.find((violation) => violation.name === CONST.VIOLATIONS.DUPLICATED_TRANSACTION)?.data?.duplicates ?? [];
-    const transactions = [transactionID, ...duplicates].map((item) => getTransaction(item));
+    const transactions = ReportUtils.removeSettledTransactions([transactionID, ...duplicates]).map((item) => getTransaction(item));
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const keep: Record<string, any> = {};
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -1035,7 +1036,7 @@ function buildTransactionsMergeParams(reviewDuplicates: OnyxEntry<ReviewDuplicat
         currency: getCurrency(originalTransaction as OnyxEntry<Transaction>),
         created: getFormattedCreated(originalTransaction as OnyxEntry<Transaction>),
         transactionID: reviewDuplicates?.transactionID ?? '',
-        transactionIDList: reviewDuplicates?.duplicates ?? [],
+        transactionIDList: ReportUtils.removeSettledTransactions(reviewDuplicates?.duplicates ?? []),
         billable: reviewDuplicates?.billable ?? false,
         reimbursable: reviewDuplicates?.reimbursable ?? false,
         category: reviewDuplicates?.category ?? '',
diff --git a/src/pages/TransactionDuplicate/Review.tsx b/src/pages/TransactionDuplicate/Review.tsx
index fc6af1f273e5..a4c85e9f4bab 100644
--- a/src/pages/TransactionDuplicate/Review.tsx
+++ b/src/pages/TransactionDuplicate/Review.tsx
@@ -13,6 +13,7 @@ import useThemeStyles from '@hooks/useThemeStyles';
 import Navigation from '@libs/Navigation/Navigation';
 import type {TransactionDuplicateNavigatorParamList} from '@libs/Navigation/types';
 import * as ReportActionsUtils from '@libs/ReportActionsUtils';
+import * as ReportUtils from '@libs/ReportUtils';
 import * as TransactionUtils from '@libs/TransactionUtils';
 import * as Transaction from '@userActions/Transaction';
 import CONST from '@src/CONST';
@@ -42,10 +43,13 @@ function TransactionDuplicateReview() {
         Navigation.goBack();
     };
 
+    const settledTransaction = transactions.find((transaction) => ReportUtils.isSettled(transaction?.reportID));
+
     return (
         <ScreenWrapper testID={TransactionDuplicateReview.displayName}>
             <FullPageNotFoundView shouldShow={transactionID === '-1'}>
                 <HeaderWithBackButton title={translate('iou.reviewDuplicates')} />
+                {!!settledTransaction && <View style={[styles.textNormal, styles.colorMuted]}>Some of these duplicates have been approved or paid already</View>}
                 <View style={[styles.justifyContentCenter, styles.ph5, styles.pb3, styles.borderBottom]}>
                     <Button
                         text={translate('iou.keepAll')}

From 94575d4effd8de32874458491366d7224e1fcf1e Mon Sep 17 00:00:00 2001
From: daledah <daleda261@outlook.com>
Date: Thu, 15 Aug 2024 17:32:50 +0700
Subject: [PATCH 2/7] refactor: move removeSettledTransactions to
 TransactionUtils

---
 .../MoneyRequestPreviewContent.tsx               | 16 +++++++---------
 src/languages/en.ts                              |  1 +
 src/languages/es.ts                              |  1 +
 src/libs/ReportUtils.ts                          |  5 -----
 src/libs/TransactionUtils/index.ts               |  9 +++++++--
 src/pages/TransactionDuplicate/Review.tsx        |  5 +++--
 6 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/src/components/ReportActionItem/MoneyRequestPreview/MoneyRequestPreviewContent.tsx b/src/components/ReportActionItem/MoneyRequestPreview/MoneyRequestPreviewContent.tsx
index df463acc12c9..1d432a2d06b4 100644
--- a/src/components/ReportActionItem/MoneyRequestPreview/MoneyRequestPreviewContent.tsx
+++ b/src/components/ReportActionItem/MoneyRequestPreview/MoneyRequestPreviewContent.tsx
@@ -123,15 +123,13 @@ function MoneyRequestPreviewContent({
     const isFullyApproved = ReportUtils.isReportApproved(iouReport) && !isSettlementOrApprovalPartial;
 
     // Get transaction violations for given transaction id from onyx, find duplicated transactions violations and get duplicates
-    const duplicates = useMemo(
-        () =>
-            ReportUtils.removeSettledTransactions(
-                transactionViolations?.[`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${transaction?.transactionID}`]?.find(
-                    (violation) => violation.name === CONST.VIOLATIONS.DUPLICATED_TRANSACTION,
-                )?.data?.duplicates ?? [],
-            ),
-        [transaction?.transactionID, transactionViolations],
-    );
+    const duplicates = useMemo(() => {
+        const transactions =
+            transactionViolations?.[`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${transaction?.transactionID}`]?.find(
+                (violation) => violation.name === CONST.VIOLATIONS.DUPLICATED_TRANSACTION,
+            )?.data?.duplicates ?? [];
+        return TransactionUtils.removeSettledTransactions(transactions);
+    }, [transaction?.transactionID, transactionViolations]);
 
     const hasDuplicates = duplicates.length > 0;
 
diff --git a/src/languages/en.ts b/src/languages/en.ts
index 27c666caaaf8..ed3c9489f14e 100755
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -826,6 +826,7 @@ export default {
         expenseOnHold: 'This expense was put on hold. Please review the comments for next steps.',
         expensesOnHold: 'All expenses were put on hold. Please review the comments for next steps.',
         expenseDuplicate: 'This expense has the same details as another one. Please review the duplicates to remove the hold.',
+        someDuplicatesArePaid: 'Some of these duplicates have been approved or paid already',
         reviewDuplicates: 'Review duplicates',
         keepAll: 'Keep all',
         confirmApprove: 'Confirm approval amount',
diff --git a/src/languages/es.ts b/src/languages/es.ts
index e57271de4923..8d9ddf8ed5b6 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -822,6 +822,7 @@ export default {
         expenseOnHold: 'Este gasto está bloqueado. Revisa los comentarios para saber como proceder.',
         expensesOnHold: 'Todos los gastos quedaron bloqueados. Revisa los comentarios para saber como proceder.',
         expenseDuplicate: 'Esta solicitud tiene los mismos detalles que otra. Revisa los duplicados para eliminar el bloqueo.',
+        someDuplicatesArePaid: 'Algunos de estos duplicados ya han sido aprobados o pagados.',
         reviewDuplicates: 'Revisar duplicados',
         keepAll: 'Mantener todos',
         confirmApprove: 'Confirmar importe a aprobar',
diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts
index c5a240368926..9c5a42de9e1e 100644
--- a/src/libs/ReportUtils.ts
+++ b/src/libs/ReportUtils.ts
@@ -7615,10 +7615,6 @@ function getApprovalChain(policy: OnyxEntry<Policy>, employeeAccountID: number,
     return approvalChain;
 }
 
-function removeSettledTransactions(transactionIDs: string[]) {
-    return transactionIDs.filter((transactionID) => !isSettled(allTransactions?.[`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`]?.reportID));
-}
-
 export {
     addDomainToShortMention,
     completeShortMention,
@@ -7918,7 +7914,6 @@ export {
     getArchiveReason,
     getApprovalChain,
     isIndividualInvoiceRoom,
-    removeSettledTransactions,
 };
 
 export type {
diff --git a/src/libs/TransactionUtils/index.ts b/src/libs/TransactionUtils/index.ts
index 2e6fa6a17618..00b7698bae0d 100644
--- a/src/libs/TransactionUtils/index.ts
+++ b/src/libs/TransactionUtils/index.ts
@@ -895,6 +895,10 @@ type FieldsToChange = {
     reimbursable?: Array<boolean | undefined>;
 };
 
+function removeSettledTransactions(transactionIDs: string[]) {
+    return transactionIDs.filter((transactionID) => !ReportUtils.isSettled(allTransactions?.[`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`]?.reportID));
+}
+
 /**
  * This function compares fields of duplicate transactions and determines which fields should be kept and which should be changed.
  *
@@ -916,7 +920,7 @@ type FieldsToChange = {
 function compareDuplicateTransactionFields(transactionID: string): {keep: Partial<ReviewDuplicates>; change: FieldsToChange} {
     const transactionViolations = allTransactionViolations?.[`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${transactionID}`];
     const duplicates = transactionViolations?.find((violation) => violation.name === CONST.VIOLATIONS.DUPLICATED_TRANSACTION)?.data?.duplicates ?? [];
-    const transactions = ReportUtils.removeSettledTransactions([transactionID, ...duplicates]).map((item) => getTransaction(item));
+    const transactions = removeSettledTransactions([transactionID, ...duplicates]).map((item) => getTransaction(item));
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const keep: Record<string, any> = {};
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -1036,7 +1040,7 @@ function buildTransactionsMergeParams(reviewDuplicates: OnyxEntry<ReviewDuplicat
         currency: getCurrency(originalTransaction as OnyxEntry<Transaction>),
         created: getFormattedCreated(originalTransaction as OnyxEntry<Transaction>),
         transactionID: reviewDuplicates?.transactionID ?? '',
-        transactionIDList: ReportUtils.removeSettledTransactions(reviewDuplicates?.duplicates ?? []),
+        transactionIDList: removeSettledTransactions(reviewDuplicates?.duplicates ?? []),
         billable: reviewDuplicates?.billable ?? false,
         reimbursable: reviewDuplicates?.reimbursable ?? false,
         category: reviewDuplicates?.category ?? '',
@@ -1121,6 +1125,7 @@ export {
     buildTransactionsMergeParams,
     getReimbursable,
     isPayAtEndExpense,
+    removeSettledTransactions,
 };
 
 export type {TransactionChanges};
diff --git a/src/pages/TransactionDuplicate/Review.tsx b/src/pages/TransactionDuplicate/Review.tsx
index a4c85e9f4bab..f0df36a498a9 100644
--- a/src/pages/TransactionDuplicate/Review.tsx
+++ b/src/pages/TransactionDuplicate/Review.tsx
@@ -7,6 +7,7 @@ import FullPageNotFoundView from '@components/BlockingViews/FullPageNotFoundView
 import Button from '@components/Button';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
 import ScreenWrapper from '@components/ScreenWrapper';
+import Text from '@components/Text';
 import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
 import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
@@ -43,18 +44,18 @@ function TransactionDuplicateReview() {
         Navigation.goBack();
     };
 
-    const settledTransaction = transactions.find((transaction) => ReportUtils.isSettled(transaction?.reportID));
+    const hasSettledTransaction = transactions.find((transaction) => ReportUtils.isSettled(transaction?.reportID));
 
     return (
         <ScreenWrapper testID={TransactionDuplicateReview.displayName}>
             <FullPageNotFoundView shouldShow={transactionID === '-1'}>
                 <HeaderWithBackButton title={translate('iou.reviewDuplicates')} />
-                {!!settledTransaction && <View style={[styles.textNormal, styles.colorMuted]}>Some of these duplicates have been approved or paid already</View>}
                 <View style={[styles.justifyContentCenter, styles.ph5, styles.pb3, styles.borderBottom]}>
                     <Button
                         text={translate('iou.keepAll')}
                         onPress={keepAll}
                     />
+                    {!!hasSettledTransaction && <Text style={[styles.textNormal, styles.colorMuted, styles.mt3]}>{translate('iou.someDuplicatesArePaid')}</Text>}
                 </View>
                 <DuplicateTransactionsList transactions={transactions} />
             </FullPageNotFoundView>

From 9e7a0c4bc9ba087e550b4239f286e96b26f5c575 Mon Sep 17 00:00:00 2001
From: daledah <daleda261@outlook.com>
Date: Thu, 15 Aug 2024 18:20:55 +0700
Subject: [PATCH 3/7] Update src/languages/en.ts

Co-authored-by: Rajat <parasharrajat@users.noreply.github.com>
---
 src/languages/en.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/languages/en.ts b/src/languages/en.ts
index ed3c9489f14e..bdf34c1e18f8 100755
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -826,7 +826,7 @@ export default {
         expenseOnHold: 'This expense was put on hold. Please review the comments for next steps.',
         expensesOnHold: 'All expenses were put on hold. Please review the comments for next steps.',
         expenseDuplicate: 'This expense has the same details as another one. Please review the duplicates to remove the hold.',
-        someDuplicatesArePaid: 'Some of these duplicates have been approved or paid already',
+        someDuplicatesArePaid: 'Some of these duplicates have been approved or paid already.',
         reviewDuplicates: 'Review duplicates',
         keepAll: 'Keep all',
         confirmApprove: 'Confirm approval amount',

From 5c0b6dc34fd9e5be24e33b0d61ea00e72bfd2ddb Mon Sep 17 00:00:00 2001
From: daledah <daleda261@outlook.com>
Date: Mon, 19 Aug 2024 11:29:21 +0700
Subject: [PATCH 4/7] feat: use Array.some instead of find

---
 src/pages/TransactionDuplicate/Review.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/TransactionDuplicate/Review.tsx b/src/pages/TransactionDuplicate/Review.tsx
index f0df36a498a9..9b7b6614756d 100644
--- a/src/pages/TransactionDuplicate/Review.tsx
+++ b/src/pages/TransactionDuplicate/Review.tsx
@@ -44,7 +44,7 @@ function TransactionDuplicateReview() {
         Navigation.goBack();
     };
 
-    const hasSettledTransaction = transactions.find((transaction) => ReportUtils.isSettled(transaction?.reportID));
+    const hasSettledTransaction = transactions.some((transaction) => ReportUtils.isSettled(transaction?.reportID));
 
     return (
         <ScreenWrapper testID={TransactionDuplicateReview.displayName}>

From b0fc4654fd6a28b767c7a556bdb2f78415d1ac40 Mon Sep 17 00:00:00 2001
From: daledah <daleda261@outlook.com>
Date: Thu, 22 Aug 2024 17:34:28 +0700
Subject: [PATCH 5/7] fix: hide "keep this one" button when there's settled
 transaction

---
 .../MoneyRequestPreviewContent.tsx             | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/components/ReportActionItem/MoneyRequestPreview/MoneyRequestPreviewContent.tsx b/src/components/ReportActionItem/MoneyRequestPreview/MoneyRequestPreviewContent.tsx
index 1d432a2d06b4..5040ba4735a0 100644
--- a/src/components/ReportActionItem/MoneyRequestPreview/MoneyRequestPreviewContent.tsx
+++ b/src/components/ReportActionItem/MoneyRequestPreview/MoneyRequestPreviewContent.tsx
@@ -123,13 +123,19 @@ function MoneyRequestPreviewContent({
     const isFullyApproved = ReportUtils.isReportApproved(iouReport) && !isSettlementOrApprovalPartial;
 
     // Get transaction violations for given transaction id from onyx, find duplicated transactions violations and get duplicates
-    const duplicates = useMemo(() => {
-        const transactions =
+    const allDuplicates = useMemo(
+        () =>
             transactionViolations?.[`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${transaction?.transactionID}`]?.find(
                 (violation) => violation.name === CONST.VIOLATIONS.DUPLICATED_TRANSACTION,
-            )?.data?.duplicates ?? [];
-        return TransactionUtils.removeSettledTransactions(transactions);
-    }, [transaction?.transactionID, transactionViolations]);
+            )?.data?.duplicates ?? [],
+        [transaction?.transactionID, transactionViolations],
+    );
+
+    // Remove settled transactions from duplicates
+    const duplicates = TransactionUtils.removeSettledTransactions(allDuplicates);
+
+    // When there are no settled transactions in duplicates, show the "Keep this one" button
+    const shouldShowKeepButton = allDuplicates.length === duplicates.length;
 
     const hasDuplicates = duplicates.length > 0;
 
@@ -438,7 +444,7 @@ function MoneyRequestPreviewContent({
             ]}
         >
             {childContainer}
-            {isReviewDuplicateTransactionPage && !isSettled && (
+            {isReviewDuplicateTransactionPage && !isSettled && shouldShowKeepButton && (
                 <Button
                     text={translate('violations.keepThisOne')}
                     success

From d508df730406c031fa3c72046a9b46f48cf30660 Mon Sep 17 00:00:00 2001
From: daledah <daleda261@outlook.com>
Date: Fri, 23 Aug 2024 14:21:01 +0700
Subject: [PATCH 6/7] fix: hide keep button for approved expense

---
 .../MoneyRequestPreview/MoneyRequestPreviewContent.tsx     | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/components/ReportActionItem/MoneyRequestPreview/MoneyRequestPreviewContent.tsx b/src/components/ReportActionItem/MoneyRequestPreview/MoneyRequestPreviewContent.tsx
index 5040ba4735a0..8b80f828e55d 100644
--- a/src/components/ReportActionItem/MoneyRequestPreview/MoneyRequestPreviewContent.tsx
+++ b/src/components/ReportActionItem/MoneyRequestPreview/MoneyRequestPreviewContent.tsx
@@ -116,11 +116,12 @@ function MoneyRequestPreviewContent({
     const isFetchingWaypointsFromServer = TransactionUtils.isFetchingWaypointsFromServer(transaction);
     const isCardTransaction = TransactionUtils.isCardTransaction(transaction);
     const isSettled = ReportUtils.isSettled(iouReport?.reportID);
+    const isApproved = ReportUtils.isReportApproved(iouReport);
     const isDeleted = action?.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE;
     const isReviewDuplicateTransactionPage = route.name === SCREENS.TRANSACTION_DUPLICATE.REVIEW;
 
     const isFullySettled = isSettled && !isSettlementOrApprovalPartial;
-    const isFullyApproved = ReportUtils.isReportApproved(iouReport) && !isSettlementOrApprovalPartial;
+    const isFullyApproved = isApproved && !isSettlementOrApprovalPartial;
 
     // Get transaction violations for given transaction id from onyx, find duplicated transactions violations and get duplicates
     const allDuplicates = useMemo(
@@ -132,7 +133,7 @@ function MoneyRequestPreviewContent({
     );
 
     // Remove settled transactions from duplicates
-    const duplicates = TransactionUtils.removeSettledTransactions(allDuplicates);
+    const duplicates = useMemo(() => TransactionUtils.removeSettledTransactions(allDuplicates), [allDuplicates]);
 
     // When there are no settled transactions in duplicates, show the "Keep this one" button
     const shouldShowKeepButton = allDuplicates.length === duplicates.length;
@@ -444,7 +445,7 @@ function MoneyRequestPreviewContent({
             ]}
         >
             {childContainer}
-            {isReviewDuplicateTransactionPage && !isSettled && shouldShowKeepButton && (
+            {isReviewDuplicateTransactionPage && !isSettled && !isApproved && shouldShowKeepButton && (
                 <Button
                     text={translate('violations.keepThisOne')}
                     success

From 128cd29aa1d979e61e1ca56c9273e02cc7f5933c Mon Sep 17 00:00:00 2001
From: daledah <daleda261@outlook.com>
Date: Wed, 28 Aug 2024 15:32:13 +0700
Subject: [PATCH 7/7] fix: remove button for approved dupes

---
 .../MoneyRequestPreviewContent.tsx                 |  2 +-
 src/libs/TransactionUtils/index.ts                 | 14 +++++++++-----
 src/pages/TransactionDuplicate/Review.tsx          |  4 ++--
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/components/ReportActionItem/MoneyRequestPreview/MoneyRequestPreviewContent.tsx b/src/components/ReportActionItem/MoneyRequestPreview/MoneyRequestPreviewContent.tsx
index ff0658963fd3..6ab1c0937278 100644
--- a/src/components/ReportActionItem/MoneyRequestPreview/MoneyRequestPreviewContent.tsx
+++ b/src/components/ReportActionItem/MoneyRequestPreview/MoneyRequestPreviewContent.tsx
@@ -133,7 +133,7 @@ function MoneyRequestPreviewContent({
     );
 
     // Remove settled transactions from duplicates
-    const duplicates = useMemo(() => TransactionUtils.removeSettledTransactions(allDuplicates), [allDuplicates]);
+    const duplicates = useMemo(() => TransactionUtils.removeSettledAndApprovedTransactions(allDuplicates), [allDuplicates]);
 
     // When there are no settled transactions in duplicates, show the "Keep this one" button
     const shouldShowKeepButton = allDuplicates.length === duplicates.length;
diff --git a/src/libs/TransactionUtils/index.ts b/src/libs/TransactionUtils/index.ts
index e6def80902c3..339f57c8e04a 100644
--- a/src/libs/TransactionUtils/index.ts
+++ b/src/libs/TransactionUtils/index.ts
@@ -905,8 +905,12 @@ type FieldsToChange = {
     reimbursable?: Array<boolean | undefined>;
 };
 
-function removeSettledTransactions(transactionIDs: string[]) {
-    return transactionIDs.filter((transactionID) => !ReportUtils.isSettled(allTransactions?.[`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`]?.reportID));
+function removeSettledAndApprovedTransactions(transactionIDs: string[]) {
+    return transactionIDs.filter(
+        (transactionID) =>
+            !ReportUtils.isSettled(allTransactions?.[`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`]?.reportID) &&
+            !ReportUtils.isReportApproved(allTransactions?.[`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`]?.reportID),
+    );
 }
 
 /**
@@ -930,7 +934,7 @@ function removeSettledTransactions(transactionIDs: string[]) {
 function compareDuplicateTransactionFields(transactionID: string): {keep: Partial<ReviewDuplicates>; change: FieldsToChange} {
     const transactionViolations = allTransactionViolations?.[`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${transactionID}`];
     const duplicates = transactionViolations?.find((violation) => violation.name === CONST.VIOLATIONS.DUPLICATED_TRANSACTION)?.data?.duplicates ?? [];
-    const transactions = removeSettledTransactions([transactionID, ...duplicates]).map((item) => getTransaction(item));
+    const transactions = removeSettledAndApprovedTransactions([transactionID, ...duplicates]).map((item) => getTransaction(item));
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const keep: Record<string, any> = {};
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -1044,7 +1048,7 @@ function buildTransactionsMergeParams(reviewDuplicates: OnyxEntry<ReviewDuplicat
         currency: getCurrency(originalTransaction as OnyxEntry<Transaction>),
         created: getFormattedCreated(originalTransaction as OnyxEntry<Transaction>),
         transactionID: reviewDuplicates?.transactionID ?? '',
-        transactionIDList: removeSettledTransactions(reviewDuplicates?.duplicates ?? []),
+        transactionIDList: removeSettledAndApprovedTransactions(reviewDuplicates?.duplicates ?? []),
         billable: reviewDuplicates?.billable ?? false,
         reimbursable: reviewDuplicates?.reimbursable ?? false,
         category: reviewDuplicates?.category ?? '',
@@ -1130,7 +1134,7 @@ export {
     buildTransactionsMergeParams,
     getReimbursable,
     isPayAtEndExpense,
-    removeSettledTransactions,
+    removeSettledAndApprovedTransactions,
     getCardName,
 };
 
diff --git a/src/pages/TransactionDuplicate/Review.tsx b/src/pages/TransactionDuplicate/Review.tsx
index 9b7b6614756d..46f82589e309 100644
--- a/src/pages/TransactionDuplicate/Review.tsx
+++ b/src/pages/TransactionDuplicate/Review.tsx
@@ -44,7 +44,7 @@ function TransactionDuplicateReview() {
         Navigation.goBack();
     };
 
-    const hasSettledTransaction = transactions.some((transaction) => ReportUtils.isSettled(transaction?.reportID));
+    const hasSettledOrApprovedTransaction = transactions.some((transaction) => ReportUtils.isSettled(transaction?.reportID) || ReportUtils.isReportApproved(transaction?.reportID));
 
     return (
         <ScreenWrapper testID={TransactionDuplicateReview.displayName}>
@@ -55,7 +55,7 @@ function TransactionDuplicateReview() {
                         text={translate('iou.keepAll')}
                         onPress={keepAll}
                     />
-                    {!!hasSettledTransaction && <Text style={[styles.textNormal, styles.colorMuted, styles.mt3]}>{translate('iou.someDuplicatesArePaid')}</Text>}
+                    {!!hasSettledOrApprovedTransaction && <Text style={[styles.textNormal, styles.colorMuted, styles.mt3]}>{translate('iou.someDuplicatesArePaid')}</Text>}
                 </View>
                 <DuplicateTransactionsList transactions={transactions} />
             </FullPageNotFoundView>