From dcfd9e7367698c25ea752fa8003e505aac95b204 Mon Sep 17 00:00:00 2001
From: gijoe0295 <gijoe0295@gmail.com>
Date: Tue, 23 Jul 2024 03:52:35 +0700
Subject: [PATCH 01/11] show not found page for invalid report or transaction
 in review duplicate confirmation page

---
 .../TransactionDuplicate/Confirmation.tsx     | 59 ++++++++++---------
 1 file changed, 32 insertions(+), 27 deletions(-)

diff --git a/src/pages/TransactionDuplicate/Confirmation.tsx b/src/pages/TransactionDuplicate/Confirmation.tsx
index 8d2ece49c417..2184c4a2cb31 100644
--- a/src/pages/TransactionDuplicate/Confirmation.tsx
+++ b/src/pages/TransactionDuplicate/Confirmation.tsx
@@ -4,6 +4,7 @@ import React, {useCallback, useMemo} from 'react';
 import {View} from 'react-native';
 import type {OnyxEntry} from 'react-native-onyx';
 import {useOnyx} from 'react-native-onyx';
+import FullPageNotFoundView from '@components/BlockingViews/FullPageNotFoundView';
 import Button from '@components/Button';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
 import MoneyRequestView from '@components/ReportActionItem/MoneyRequestView';
@@ -35,6 +36,8 @@ function Confirmation() {
     const reportAction = Object.values(reportActions ?? {}).find(
         (action) => ReportActionsUtils.isMoneyRequestAction(action) && ReportActionsUtils.getOriginalMessage(action)?.IOUTransactionID === reviewDuplicates?.transactionID,
     );
+    const [isLoadingReportData] = useOnyx(ONYXKEYS.IS_LOADING_REPORT_DATA, {initialValue: true});
+    const transactionID = ReportActionsUtils.getLinkedTransactionID(reportAction, report?.reportID ?? '-1') ?? '-1';
 
     const transactionsMergeParams = useMemo(() => TransactionUtils.buildTransactionsMergeParams(reviewDuplicates, transaction), [reviewDuplicates, transaction]);
     const mergeDuplicates = useCallback(() => {
@@ -59,34 +62,36 @@ function Confirmation() {
             testID={Confirmation.displayName}
             shouldShowOfflineIndicator
         >
-            <HeaderWithBackButton title={translate('iou.reviewDuplicates')} />
-            <ScrollView style={styles.mb3}>
-                <View style={[styles.ph5, styles.pb8]}>
-                    <Text
-                        family="EXP_NEW_KANSAS_MEDIUM"
-                        fontSize={variables.fontSizeLarge}
-                        style={styles.pb5}
-                    >
-                        {translate('violations.confirmDetails')}
-                    </Text>
-                    <Text>{translate('violations.confirmDuplicatesInfo')}</Text>
-                </View>
-                {/* We need that provider here becuase MoneyRequestView component require that */}
-                <ShowContextMenuContext.Provider value={contextValue}>
-                    <MoneyRequestView
-                        report={report}
-                        shouldShowAnimatedBackground={false}
-                        readonly
-                        updatedTransaction={transaction as OnyxEntry<Transaction>}
+            <FullPageNotFoundView shouldShow={!isLoadingReportData && transactionID === '-1'}>
+                <HeaderWithBackButton title={translate('iou.reviewDuplicates')} />
+                <ScrollView style={styles.mb3}>
+                    <View style={[styles.ph5, styles.pb8]}>
+                        <Text
+                            family="EXP_NEW_KANSAS_MEDIUM"
+                            fontSize={variables.fontSizeLarge}
+                            style={styles.pb5}
+                        >
+                            {translate('violations.confirmDetails')}
+                        </Text>
+                        <Text>{translate('violations.confirmDuplicatesInfo')}</Text>
+                    </View>
+                    {/* We need that provider here becuase MoneyRequestView component require that */}
+                    <ShowContextMenuContext.Provider value={contextValue}>
+                        <MoneyRequestView
+                            report={report}
+                            shouldShowAnimatedBackground={false}
+                            readonly
+                            updatedTransaction={transaction as OnyxEntry<Transaction>}
+                        />
+                    </ShowContextMenuContext.Provider>
+                    <Button
+                        text={translate('common.confirm')}
+                        success
+                        style={[styles.ph5, styles.mt2]}
+                        onPress={mergeDuplicates}
                     />
-                </ShowContextMenuContext.Provider>
-                <Button
-                    text={translate('common.confirm')}
-                    success
-                    style={[styles.ph5, styles.mt2]}
-                    onPress={mergeDuplicates}
-                />
-            </ScrollView>
+                </ScrollView>
+            </FullPageNotFoundView>
         </ScreenWrapper>
     );
 }

From 57113d5192b821d5e675cd468fce8dcf4ac212a7 Mon Sep 17 00:00:00 2001
From: gijoe0295 <gijoe0295@gmail.com>
Date: Wed, 24 Jul 2024 18:55:21 +0700
Subject: [PATCH 02/11] fix: not found briefly when data is loading

---
 src/libs/ReportUtils.ts                         |  6 ++++++
 src/pages/TransactionDuplicate/Confirmation.tsx | 10 ++++++----
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts
index 1f5d743a9621..95960688056b 100644
--- a/src/libs/ReportUtils.ts
+++ b/src/libs/ReportUtils.ts
@@ -5341,6 +5341,11 @@ function canAccessReport(report: OnyxEntry<Report>, policies: OnyxCollection<Pol
     return true;
 }
 
+// eslint-disable-next-line rulesdir/no-negated-variables
+function isReportNotFound(report: OnyxEntry<Report>): boolean {
+    return !!report?.errorFields?.notFound;
+}
+
 /**
  * Check if the report is the parent report of the currently viewed report or at least one child report has report action
  */
@@ -7189,6 +7194,7 @@ export {
     buildParticipantsFromAccountIDs,
     buildTransactionThread,
     canAccessReport,
+    isReportNotFound,
     canAddOrDeleteTransactions,
     canBeAutoReimbursed,
     canCreateRequest,
diff --git a/src/pages/TransactionDuplicate/Confirmation.tsx b/src/pages/TransactionDuplicate/Confirmation.tsx
index 2184c4a2cb31..2bcb3b3a13f8 100644
--- a/src/pages/TransactionDuplicate/Confirmation.tsx
+++ b/src/pages/TransactionDuplicate/Confirmation.tsx
@@ -19,6 +19,7 @@ import type {TransactionDuplicateNavigatorParamList} from '@libs/Navigation/type
 import variables from '@styles/variables';
 import * as IOU from '@src/libs/actions/IOU';
 import * as ReportActionsUtils from '@src/libs/ReportActionsUtils';
+import * as ReportUtils from '@src/libs/ReportUtils';
 import * as TransactionUtils from '@src/libs/TransactionUtils';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
@@ -29,15 +30,13 @@ function Confirmation() {
     const styles = useThemeStyles();
     const {translate} = useLocalize();
     const route = useRoute<RouteProp<TransactionDuplicateNavigatorParamList, typeof SCREENS.TRANSACTION_DUPLICATE.REVIEW>>();
-    const [reviewDuplicates] = useOnyx(ONYXKEYS.REVIEW_DUPLICATES);
+    const [reviewDuplicates, {status}] = useOnyx(ONYXKEYS.REVIEW_DUPLICATES);
     const transaction = useMemo(() => TransactionUtils.buildNewTransactionAfterReviewingDuplicates(reviewDuplicates), [reviewDuplicates]);
     const [report] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${route.params.threadReportID}`);
     const [reportActions] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${transaction?.reportID}`);
     const reportAction = Object.values(reportActions ?? {}).find(
         (action) => ReportActionsUtils.isMoneyRequestAction(action) && ReportActionsUtils.getOriginalMessage(action)?.IOUTransactionID === reviewDuplicates?.transactionID,
     );
-    const [isLoadingReportData] = useOnyx(ONYXKEYS.IS_LOADING_REPORT_DATA, {initialValue: true});
-    const transactionID = ReportActionsUtils.getLinkedTransactionID(reportAction, report?.reportID ?? '-1') ?? '-1';
 
     const transactionsMergeParams = useMemo(() => TransactionUtils.buildTransactionsMergeParams(reviewDuplicates, transaction), [reviewDuplicates, transaction]);
     const mergeDuplicates = useCallback(() => {
@@ -57,12 +56,15 @@ function Confirmation() {
         [report, reportAction],
     );
 
+    // eslint-disable-next-line rulesdir/no-negated-variables
+    const shouldShowNotFoundPage = ReportUtils.isReportNotFound(report) || (status === 'loaded' && !transaction?.transactionID);
+
     return (
         <ScreenWrapper
             testID={Confirmation.displayName}
             shouldShowOfflineIndicator
         >
-            <FullPageNotFoundView shouldShow={!isLoadingReportData && transactionID === '-1'}>
+            <FullPageNotFoundView shouldShow={shouldShowNotFoundPage}>
                 <HeaderWithBackButton title={translate('iou.reviewDuplicates')} />
                 <ScrollView style={styles.mb3}>
                     <View style={[styles.ph5, styles.pb8]}>

From d0dec6171527264534be5747f3d8871f925d2d38 Mon Sep 17 00:00:00 2001
From: gijoe0295 <gijoe0295@gmail.com>
Date: Thu, 25 Jul 2024 06:43:47 +0700
Subject: [PATCH 03/11] fix: not found briefly when closing rhp

---
 src/pages/TransactionDuplicate/Confirmation.tsx | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/pages/TransactionDuplicate/Confirmation.tsx b/src/pages/TransactionDuplicate/Confirmation.tsx
index 2bcb3b3a13f8..b404ea351e82 100644
--- a/src/pages/TransactionDuplicate/Confirmation.tsx
+++ b/src/pages/TransactionDuplicate/Confirmation.tsx
@@ -1,6 +1,6 @@
 import type {RouteProp} from '@react-navigation/native';
-import {useRoute} from '@react-navigation/native';
-import React, {useCallback, useMemo} from 'react';
+import {useNavigation, useRoute} from '@react-navigation/native';
+import React, {useCallback, useEffect, useMemo, useState} from 'react';
 import {View} from 'react-native';
 import type {OnyxEntry} from 'react-native-onyx';
 import {useOnyx} from 'react-native-onyx';
@@ -29,7 +29,9 @@ import type {Transaction} from '@src/types/onyx';
 function Confirmation() {
     const styles = useThemeStyles();
     const {translate} = useLocalize();
+    const navigation = useNavigation();
     const route = useRoute<RouteProp<TransactionDuplicateNavigatorParamList, typeof SCREENS.TRANSACTION_DUPLICATE.REVIEW>>();
+    const [isExiting, setIsExiting] = useState(false);
     const [reviewDuplicates, {status}] = useOnyx(ONYXKEYS.REVIEW_DUPLICATES);
     const transaction = useMemo(() => TransactionUtils.buildNewTransactionAfterReviewingDuplicates(reviewDuplicates), [reviewDuplicates]);
     const [report] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${route.params.threadReportID}`);
@@ -56,8 +58,16 @@ function Confirmation() {
         [report, reportAction],
     );
 
+    useEffect(() => {
+        const unsubscribeBeforeRemove = navigation.addListener('beforeRemove', () => {
+            setIsExiting(true);
+        });
+
+        return unsubscribeBeforeRemove;
+    }, [navigation]);
+
     // eslint-disable-next-line rulesdir/no-negated-variables
-    const shouldShowNotFoundPage = ReportUtils.isReportNotFound(report) || (status === 'loaded' && !transaction?.transactionID);
+    const shouldShowNotFoundPage = ReportUtils.isReportNotFound(report) || (!isExiting && status === 'loaded' && !transaction?.transactionID);
 
     return (
         <ScreenWrapper

From 25dd71a1ccae8a594ff198161c9b4b559cf827ba Mon Sep 17 00:00:00 2001
From: gijoe0295 <gijoe0295@gmail.com>
Date: Thu, 25 Jul 2024 06:54:53 +0700
Subject: [PATCH 04/11] fix: empty data briefly when refresh page

---
 src/pages/TransactionDuplicate/Confirmation.tsx | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/pages/TransactionDuplicate/Confirmation.tsx b/src/pages/TransactionDuplicate/Confirmation.tsx
index b404ea351e82..76c98009b6a9 100644
--- a/src/pages/TransactionDuplicate/Confirmation.tsx
+++ b/src/pages/TransactionDuplicate/Confirmation.tsx
@@ -6,6 +6,7 @@ import type {OnyxEntry} from 'react-native-onyx';
 import {useOnyx} from 'react-native-onyx';
 import FullPageNotFoundView from '@components/BlockingViews/FullPageNotFoundView';
 import Button from '@components/Button';
+import FullScreenLoadingIndicator from '@components/FullscreenLoadingIndicator';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
 import MoneyRequestView from '@components/ReportActionItem/MoneyRequestView';
 import ScreenWrapper from '@components/ScreenWrapper';
@@ -66,6 +67,10 @@ function Confirmation() {
         return unsubscribeBeforeRemove;
     }, [navigation]);
 
+    if (status === 'loading') {
+        return <FullScreenLoadingIndicator />;
+    }
+
     // eslint-disable-next-line rulesdir/no-negated-variables
     const shouldShowNotFoundPage = ReportUtils.isReportNotFound(report) || (!isExiting && status === 'loaded' && !transaction?.transactionID);
 

From b001f62a720dfe98893ccfca5392010d0b3cd65e Mon Sep 17 00:00:00 2001
From: gijoe0295 <gijoe0295@gmail.com>
Date: Thu, 25 Jul 2024 07:33:59 +0700
Subject: [PATCH 05/11] show not found when report is undefined

---
 src/pages/TransactionDuplicate/Confirmation.tsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/pages/TransactionDuplicate/Confirmation.tsx b/src/pages/TransactionDuplicate/Confirmation.tsx
index bdc76a861c2c..0b1c8237400f 100644
--- a/src/pages/TransactionDuplicate/Confirmation.tsx
+++ b/src/pages/TransactionDuplicate/Confirmation.tsx
@@ -27,6 +27,7 @@ import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 import type SCREENS from '@src/SCREENS';
 import type {Transaction} from '@src/types/onyx';
+import {isEmptyObject} from '@src/types/utils/EmptyObject';
 
 function Confirmation() {
     const styles = useThemeStyles();
@@ -73,7 +74,7 @@ function Confirmation() {
     }
 
     // eslint-disable-next-line rulesdir/no-negated-variables
-    const shouldShowNotFoundPage = ReportUtils.isReportNotFound(report) || (!isExiting && status === 'loaded' && !transaction?.transactionID);
+    const shouldShowNotFoundPage = isEmptyObject(report) || ReportUtils.isReportNotFound(report) || (!isExiting && status === 'loaded' && !transaction?.transactionID);
 
     return (
         <ScreenWrapper

From e08a9bd9648251e06bd01e3e380425c603a8914e Mon Sep 17 00:00:00 2001
From: gijoe0295 <gijoe0295@gmail.com>
Date: Thu, 1 Aug 2024 22:10:35 +0700
Subject: [PATCH 06/11] resolve feedbacks

---
 src/pages/TransactionDuplicate/Confirmation.tsx | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/pages/TransactionDuplicate/Confirmation.tsx b/src/pages/TransactionDuplicate/Confirmation.tsx
index 0b1c8237400f..969a3f4df84d 100644
--- a/src/pages/TransactionDuplicate/Confirmation.tsx
+++ b/src/pages/TransactionDuplicate/Confirmation.tsx
@@ -34,8 +34,8 @@ function Confirmation() {
     const {translate} = useLocalize();
     const navigation = useNavigation();
     const route = useRoute<RouteProp<TransactionDuplicateNavigatorParamList, typeof SCREENS.TRANSACTION_DUPLICATE.REVIEW>>();
-    const [isExiting, setIsExiting] = useState(false);
-    const [reviewDuplicates, {status}] = useOnyx(ONYXKEYS.REVIEW_DUPLICATES);
+    const [isExitingPage, setIsExitingPage] = useState(false);
+    const [reviewDuplicates, {status: reviewDuplicatesOnyxStatus}] = useOnyx(ONYXKEYS.REVIEW_DUPLICATES);
     const transaction = useMemo(() => TransactionUtils.buildNewTransactionAfterReviewingDuplicates(reviewDuplicates), [reviewDuplicates]);
     const [report] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${route.params.threadReportID}`);
     const [reportActions] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${transaction?.reportID}`);
@@ -63,19 +63,20 @@ function Confirmation() {
 
     useEffect(() => {
         const unsubscribeBeforeRemove = navigation.addListener('beforeRemove', () => {
-            setIsExiting(true);
+            setIsExitingPage(true);
         });
 
         return unsubscribeBeforeRemove;
     }, [navigation]);
 
-    if (status === 'loading') {
+    // eslint-disable-next-line rulesdir/no-negated-variables
+    const shouldShowNotFoundPage =
+        isEmptyObject(report) || ReportUtils.isReportNotFound(report) || (!isExitingPage && reviewDuplicatesOnyxStatus === 'loaded' && !transaction?.transactionID);
+
+    if (reviewDuplicatesOnyxStatus === 'loading') {
         return <FullScreenLoadingIndicator />;
     }
 
-    // eslint-disable-next-line rulesdir/no-negated-variables
-    const shouldShowNotFoundPage = isEmptyObject(report) || ReportUtils.isReportNotFound(report) || (!isExiting && status === 'loaded' && !transaction?.transactionID);
-
     return (
         <ScreenWrapper
             testID={Confirmation.displayName}

From 9f2294e3bec4d9f6bbf7dcc330cb09e890f01849 Mon Sep 17 00:00:00 2001
From: gijoe0295 <gijoe0295@gmail.com>
Date: Fri, 2 Aug 2024 05:00:47 +0700
Subject: [PATCH 07/11] fix: not found when report is loading

---
 src/pages/TransactionDuplicate/Confirmation.tsx | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/pages/TransactionDuplicate/Confirmation.tsx b/src/pages/TransactionDuplicate/Confirmation.tsx
index 969a3f4df84d..dba0c93d969c 100644
--- a/src/pages/TransactionDuplicate/Confirmation.tsx
+++ b/src/pages/TransactionDuplicate/Confirmation.tsx
@@ -28,6 +28,7 @@ import ROUTES from '@src/ROUTES';
 import type SCREENS from '@src/SCREENS';
 import type {Transaction} from '@src/types/onyx';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
+import isLoadingOnyxValue from '@src/types/utils/isLoadingOnyxValue';
 
 function Confirmation() {
     const styles = useThemeStyles();
@@ -35,9 +36,9 @@ function Confirmation() {
     const navigation = useNavigation();
     const route = useRoute<RouteProp<TransactionDuplicateNavigatorParamList, typeof SCREENS.TRANSACTION_DUPLICATE.REVIEW>>();
     const [isExitingPage, setIsExitingPage] = useState(false);
-    const [reviewDuplicates, {status: reviewDuplicatesOnyxStatus}] = useOnyx(ONYXKEYS.REVIEW_DUPLICATES);
+    const [reviewDuplicates, reviewDuplicatesResult] = useOnyx(ONYXKEYS.REVIEW_DUPLICATES);
     const transaction = useMemo(() => TransactionUtils.buildNewTransactionAfterReviewingDuplicates(reviewDuplicates), [reviewDuplicates]);
-    const [report] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${route.params.threadReportID}`);
+    const [report, reportResult] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${route.params.threadReportID}`);
     const [reportActions] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${transaction?.reportID}`);
     const reportAction = Object.values(reportActions ?? {}).find(
         (action) => ReportActionsUtils.isMoneyRequestAction(action) && ReportActionsUtils.getOriginalMessage(action)?.IOUTransactionID === reviewDuplicates?.transactionID,
@@ -71,9 +72,12 @@ function Confirmation() {
 
     // eslint-disable-next-line rulesdir/no-negated-variables
     const shouldShowNotFoundPage =
-        isEmptyObject(report) || ReportUtils.isReportNotFound(report) || (!isExitingPage && reviewDuplicatesOnyxStatus === 'loaded' && !transaction?.transactionID);
+        isEmptyObject(report) ||
+        !ReportUtils.isValidReport(report) ||
+        ReportUtils.isReportNotFound(report) ||
+        (!isExitingPage && reviewDuplicatesResult.status === 'loaded' && !transaction?.transactionID);
 
-    if (reviewDuplicatesOnyxStatus === 'loading') {
+    if (isLoadingOnyxValue(reviewDuplicatesResult, reportResult)) {
         return <FullScreenLoadingIndicator />;
     }
 

From 37d8dd0a872851672f52084981f8eb740247f744 Mon Sep 17 00:00:00 2001
From: gijoe0295 <gijoe0295@gmail.com>
Date: Fri, 2 Aug 2024 05:08:52 +0700
Subject: [PATCH 08/11] show not found in case transaction and report does not
 match

---
 src/pages/TransactionDuplicate/Confirmation.tsx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/pages/TransactionDuplicate/Confirmation.tsx b/src/pages/TransactionDuplicate/Confirmation.tsx
index dba0c93d969c..b4e15ed6a436 100644
--- a/src/pages/TransactionDuplicate/Confirmation.tsx
+++ b/src/pages/TransactionDuplicate/Confirmation.tsx
@@ -70,12 +70,14 @@ function Confirmation() {
         return unsubscribeBeforeRemove;
     }, [navigation]);
 
+    const doesTransactionBelongToReport = TransactionUtils.getTransactionID(report?.reportID ?? '') === transaction.transactionID;
+
     // eslint-disable-next-line rulesdir/no-negated-variables
     const shouldShowNotFoundPage =
         isEmptyObject(report) ||
         !ReportUtils.isValidReport(report) ||
         ReportUtils.isReportNotFound(report) ||
-        (!isExitingPage && reviewDuplicatesResult.status === 'loaded' && !transaction?.transactionID);
+        (!isExitingPage && reviewDuplicatesResult.status === 'loaded' && (!transaction?.transactionID || !doesTransactionBelongToReport));
 
     if (isLoadingOnyxValue(reviewDuplicatesResult, reportResult)) {
         return <FullScreenLoadingIndicator />;

From 4d8ae30f1dcd67bb52f51638cb4b1d219c3d9608 Mon Sep 17 00:00:00 2001
From: gijoe0295 <gijoe0295@gmail.com>
Date: Mon, 12 Aug 2024 12:13:00 +0700
Subject: [PATCH 09/11] fix: not found when select the other duplicate that
 does not belong to reportID in route

---
 src/pages/TransactionDuplicate/Confirmation.tsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/pages/TransactionDuplicate/Confirmation.tsx b/src/pages/TransactionDuplicate/Confirmation.tsx
index b4e15ed6a436..ecd51e667e57 100644
--- a/src/pages/TransactionDuplicate/Confirmation.tsx
+++ b/src/pages/TransactionDuplicate/Confirmation.tsx
@@ -70,7 +70,8 @@ function Confirmation() {
         return unsubscribeBeforeRemove;
     }, [navigation]);
 
-    const doesTransactionBelongToReport = TransactionUtils.getTransactionID(report?.reportID ?? '') === transaction.transactionID;
+    const reportTransactionID = TransactionUtils.getTransactionID(report?.reportID ?? '');
+    const doesTransactionBelongToReport = reviewDuplicates?.transactionID === reportTransactionID || reviewDuplicates?.duplicates.includes(reportTransactionID);
 
     // eslint-disable-next-line rulesdir/no-negated-variables
     const shouldShowNotFoundPage =

From b2ee36c66f62293bddf1b071f04ef0fa3fcd1c56 Mon Sep 17 00:00:00 2001
From: gijoe0295 <gijoe0295@gmail.com>
Date: Thu, 15 Aug 2024 00:47:55 +0700
Subject: [PATCH 10/11] delay abandonReviewDuplicateTransactions function call
 and eliminate isExitingPage check

---
 .../Navigators/RightModalNavigator.tsx           |  6 ++++--
 src/pages/TransactionDuplicate/Confirmation.tsx  | 16 +++-------------
 2 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/src/libs/Navigation/AppNavigator/Navigators/RightModalNavigator.tsx b/src/libs/Navigation/AppNavigator/Navigators/RightModalNavigator.tsx
index 44355cbbe955..49c1512a5085 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/RightModalNavigator.tsx
+++ b/src/libs/Navigation/AppNavigator/Navigators/RightModalNavigator.tsx
@@ -1,7 +1,7 @@
 import type {StackCardInterpolationProps, StackScreenProps} from '@react-navigation/stack';
 import {createStackNavigator} from '@react-navigation/stack';
 import React, {useMemo, useRef} from 'react';
-import {View} from 'react-native';
+import {InteractionManager, View} from 'react-native';
 import NoDropZone from '@components/DragAndDrop/NoDropZone';
 import useStyleUtils from '@hooks/useStyleUtils';
 import useThemeStyles from '@hooks/useThemeStyles';
@@ -62,7 +62,9 @@ function RightModalNavigator({navigation, route}: RightModalNavigatorProps) {
                             ) {
                                 return;
                             }
-                            abandonReviewDuplicateTransactions();
+                            InteractionManager.runAfterInteractions(() => {
+                                abandonReviewDuplicateTransactions();
+                            });
                         },
                     }}
                     id={NAVIGATORS.RIGHT_MODAL_NAVIGATOR}
diff --git a/src/pages/TransactionDuplicate/Confirmation.tsx b/src/pages/TransactionDuplicate/Confirmation.tsx
index ecd51e667e57..96b32006675e 100644
--- a/src/pages/TransactionDuplicate/Confirmation.tsx
+++ b/src/pages/TransactionDuplicate/Confirmation.tsx
@@ -1,6 +1,6 @@
 import type {RouteProp} from '@react-navigation/native';
-import {useNavigation, useRoute} from '@react-navigation/native';
-import React, {useCallback, useEffect, useMemo, useState} from 'react';
+import {useRoute} from '@react-navigation/native';
+import React, {useCallback, useMemo} from 'react';
 import {View} from 'react-native';
 import type {OnyxEntry} from 'react-native-onyx';
 import {useOnyx} from 'react-native-onyx';
@@ -33,9 +33,7 @@ import isLoadingOnyxValue from '@src/types/utils/isLoadingOnyxValue';
 function Confirmation() {
     const styles = useThemeStyles();
     const {translate} = useLocalize();
-    const navigation = useNavigation();
     const route = useRoute<RouteProp<TransactionDuplicateNavigatorParamList, typeof SCREENS.TRANSACTION_DUPLICATE.REVIEW>>();
-    const [isExitingPage, setIsExitingPage] = useState(false);
     const [reviewDuplicates, reviewDuplicatesResult] = useOnyx(ONYXKEYS.REVIEW_DUPLICATES);
     const transaction = useMemo(() => TransactionUtils.buildNewTransactionAfterReviewingDuplicates(reviewDuplicates), [reviewDuplicates]);
     const [report, reportResult] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${route.params.threadReportID}`);
@@ -62,14 +60,6 @@ function Confirmation() {
         [report, reportAction],
     );
 
-    useEffect(() => {
-        const unsubscribeBeforeRemove = navigation.addListener('beforeRemove', () => {
-            setIsExitingPage(true);
-        });
-
-        return unsubscribeBeforeRemove;
-    }, [navigation]);
-
     const reportTransactionID = TransactionUtils.getTransactionID(report?.reportID ?? '');
     const doesTransactionBelongToReport = reviewDuplicates?.transactionID === reportTransactionID || reviewDuplicates?.duplicates.includes(reportTransactionID);
 
@@ -78,7 +68,7 @@ function Confirmation() {
         isEmptyObject(report) ||
         !ReportUtils.isValidReport(report) ||
         ReportUtils.isReportNotFound(report) ||
-        (!isExitingPage && reviewDuplicatesResult.status === 'loaded' && (!transaction?.transactionID || !doesTransactionBelongToReport));
+        (reviewDuplicatesResult.status === 'loaded' && (!transaction?.transactionID || !doesTransactionBelongToReport));
 
     if (isLoadingOnyxValue(reviewDuplicatesResult, reportResult)) {
         return <FullScreenLoadingIndicator />;

From 545d78e6417d2f93f124900b0d36dbbf508627e1 Mon Sep 17 00:00:00 2001
From: gijoe0295 <gijoe0295@gmail.com>
Date: Thu, 15 Aug 2024 22:55:04 +0700
Subject: [PATCH 11/11] add comment

---
 .../Navigation/AppNavigator/Navigators/RightModalNavigator.tsx  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/libs/Navigation/AppNavigator/Navigators/RightModalNavigator.tsx b/src/libs/Navigation/AppNavigator/Navigators/RightModalNavigator.tsx
index 49c1512a5085..646552c44055 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/RightModalNavigator.tsx
+++ b/src/libs/Navigation/AppNavigator/Navigators/RightModalNavigator.tsx
@@ -62,6 +62,8 @@ function RightModalNavigator({navigation, route}: RightModalNavigatorProps) {
                             ) {
                                 return;
                             }
+                            // Delay clearing review duplicate data till the RHP is completely closed
+                            // to avoid not found showing briefly in confirmation page when RHP is closing
                             InteractionManager.runAfterInteractions(() => {
                                 abandonReviewDuplicateTransactions();
                             });