Merge pull request #44662 from Krishna2323/krishna2323/issue/43958

fix: Search - RHP closes or returns to transaction thread depending on which field is edited.
Expensify · Jul 12, 2024 · 0d60861 · 0d60861
2 parents cdbb01b + 31c4a3d
commit 0d60861
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 20 deletions.
diff --git a/src/components/ReportActionItem/MoneyRequestView.tsx b/src/components/ReportActionItem/MoneyRequestView.tsx
@@ -216,15 +216,14 @@ function MoneyRequestView({
         merchantTitle = translate('iou.receiptStatusTitle');
         amountTitle = translate('iou.receiptStatusTitle');
     }
+
     const saveBillable = useCallback(
         (newBillable: boolean) => {
             // If the value hasn't changed, don't request to save changes on the server and just close the modal
             if (newBillable === TransactionUtils.getBillable(transaction)) {
-                Navigation.dismissModal();
                 return;
             }
             IOU.updateMoneyRequestBillable(transaction?.transactionID ?? '-1', report?.reportID, newBillable, policy, policyTagList, policyCategories);
-            Navigation.dismissModal();
         },
         [transaction, report, policy, policyTagList, policyCategories],
     );

diff --git a/src/pages/iou/request/step/IOURequestStepAmount.tsx b/src/pages/iou/request/step/IOURequestStepAmount.tsx
@@ -280,12 +280,7 @@ function IOURequestStepAmount({
         // If the value hasn't changed, don't request to save changes on the server and just close the modal
         const transactionCurrency = TransactionUtils.getCurrency(currentTransaction);
         if (newAmount === TransactionUtils.getAmount(currentTransaction) && currency === transactionCurrency) {
-            if (isSplitBill) {
-                Navigation.goBack(backTo);
-            } else {
-                Navigation.dismissModal();
-            }
-
+            navigateBack();
             return;
         }
 
@@ -298,12 +293,12 @@ function IOURequestStepAmount({
 
         if (isSplitBill) {
             IOU.setDraftSplitTransaction(transactionID, {amount: newAmount, currency, taxCode, taxAmount});
-            Navigation.goBack(backTo);
+            navigateBack();
             return;
         }
 
         IOU.updateMoneyRequestAmountAndCurrency({transactionID, transactionThreadReportID: reportID, currency, amount: newAmount, taxAmount, policy, taxCode});
-        Navigation.dismissModal();
+        navigateBack();
     };
 
     return (

diff --git a/src/pages/iou/request/step/IOURequestStepDistance.tsx b/src/pages/iou/request/step/IOURequestStepDistance.tsx
@@ -188,9 +188,9 @@ function IOURequestStepDistance({
         // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
     }, []);
 
-    const navigateBack = () => {
+    const navigateBack = useCallback(() => {
         Navigation.goBack(backTo);
-    };
+    }, [backTo]);
 
     /**
      * Takes the user to the page for editing a specific waypoint
@@ -394,7 +394,7 @@ function IOURequestStepDistance({
             const addresses = Object.fromEntries(Object.entries(waypoints).map(([key, waypoint]) => [key, 'address' in waypoint ? waypoint.address : {}]));
             const hasRouteChanged = !isEqual(transactionBackup?.routes, transaction?.routes);
             if (isEqual(oldAddresses, addresses)) {
-                Navigation.dismissModal();
+                navigateBack();
                 return;
             }
             IOU.updateMoneyRequestDistance({
@@ -404,12 +404,13 @@ function IOURequestStepDistance({
                 ...(hasRouteChanged ? {routes: transaction?.routes} : {}),
                 policy,
             });
-            Navigation.dismissModal();
+            navigateBack();
             return;
         }
 
         navigateToNextStep();
     }, [
+        navigateBack,
         duplicateWaypointsError,
         atLeastTwoDifferentWaypointsError,
         hasRouteError,

diff --git a/src/pages/iou/request/step/IOURequestStepScan/index.native.tsx b/src/pages/iou/request/step/IOURequestStepScan/index.native.tsx
@@ -371,7 +371,7 @@ function IOURequestStepScan({
 
     const updateScanAndNavigate = useCallback(
         (file: FileObject, source: string) => {
-            Navigation.dismissModal();
+            navigateBack();
             IOU.replaceReceipt(transactionID, file as File, source);
         },
         [transactionID],

diff --git a/src/pages/iou/request/step/IOURequestStepScan/index.tsx b/src/pages/iou/request/step/IOURequestStepScan/index.tsx
@@ -230,9 +230,9 @@ function IOURequestStepScan({
             });
     }
 
-    const navigateBack = () => {
+    const navigateBack = useCallback(() => {
         Navigation.goBack(backTo);
-    };
+    }, [backTo]);
 
     const navigateToParticipantPage = useCallback(() => {
         switch (iouType) {
@@ -417,9 +417,9 @@ function IOURequestStepScan({
     const updateScanAndNavigate = useCallback(
         (file: FileObject, source: string) => {
             IOU.replaceReceipt(transactionID, file as File, source);
-            Navigation.dismissModal();
+            navigateBack();
         },
-        [transactionID],
+        [transactionID, navigateBack],
     );
 
     /**

diff --git a/src/pages/iou/request/step/IOURequestStepTag.tsx b/src/pages/iou/request/step/IOURequestStepTag.tsx
@@ -98,7 +98,7 @@ function IOURequestStepTag({
         }
         if (isEditing) {
             IOU.updateMoneyRequestTag(transactionID, report?.reportID ?? '-1', updatedTag, policy, policyTags, policyCategories);
-            Navigation.dismissModal();
+            navigateBack();
             return;
         }
         IOU.setMoneyRequestTag(transactionID, updatedTag);