From 58cb3fce00d18faf61ae0bfd8b20f183a72b3daf Mon Sep 17 00:00:00 2001
From: Monil Bhavsar <monilbhavsar25@gmail.com>
Date: Wed, 19 Mar 2025 11:57:26 -0700
Subject: [PATCH] Revert "Fix browser history review duplicates and delete
 workspace flows"

---
 ...getting-history-entry-when-navigating-back.patch | 13 -------------
 ....patch => @react-navigation+native+6.1.12.patch} |  0
 src/libs/PolicyUtils.ts                             |  2 +-
 src/pages/TransactionDuplicate/Confirmation.tsx     |  2 +-
 4 files changed, 2 insertions(+), 15 deletions(-)
 delete mode 100644 patches/@react-navigation+native+6.1.12+002+fix-getting-history-entry-when-navigating-back.patch
 rename patches/{@react-navigation+native+6.1.12+001+initial.patch => @react-navigation+native+6.1.12.patch} (100%)

diff --git a/patches/@react-navigation+native+6.1.12+002+fix-getting-history-entry-when-navigating-back.patch b/patches/@react-navigation+native+6.1.12+002+fix-getting-history-entry-when-navigating-back.patch
deleted file mode 100644
index b5d3e7ccadda..000000000000
--- a/patches/@react-navigation+native+6.1.12+002+fix-getting-history-entry-when-navigating-back.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/node_modules/@react-navigation/native/lib/module/useLinking.js b/node_modules/@react-navigation/native/lib/module/useLinking.js
-index 95a0e32..adb25a0 100644
---- a/node_modules/@react-navigation/native/lib/module/useLinking.js
-+++ b/node_modules/@react-navigation/native/lib/module/useLinking.js
-@@ -294,7 +294,7 @@ export default function useLinking(ref, _ref) {
-           try {
-             if (nextIndex !== -1 && nextIndex < currentIndex &&
-             // We should only go back if the entry exists and it's less than current index
--            history.get(nextIndex - currentIndex)) {
-+            history.get(nextIndex)) {
-               // An existing entry for this path exists and it's less than current index, go back to that
-               await history.go(nextIndex - currentIndex);
-               history.replace({
diff --git a/patches/@react-navigation+native+6.1.12+001+initial.patch b/patches/@react-navigation+native+6.1.12.patch
similarity index 100%
rename from patches/@react-navigation+native+6.1.12+001+initial.patch
rename to patches/@react-navigation+native+6.1.12.patch
diff --git a/src/libs/PolicyUtils.ts b/src/libs/PolicyUtils.ts
index ca953f98044c..54a43f360b77 100644
--- a/src/libs/PolicyUtils.ts
+++ b/src/libs/PolicyUtils.ts
@@ -520,7 +520,7 @@ function getPolicyEmployeeListByIdWithoutCurrentUser(policies: OnyxCollection<Pi
 }
 
 function goBackFromInvalidPolicy() {
-    Navigation.goBack(ROUTES.SETTINGS_WORKSPACES.route);
+    Navigation.navigate(ROUTES.SETTINGS_WORKSPACES.route);
 }
 
 /** Get a tax with given ID from policy */
diff --git a/src/pages/TransactionDuplicate/Confirmation.tsx b/src/pages/TransactionDuplicate/Confirmation.tsx
index 4fc7fd77b972..805fda5c298a 100644
--- a/src/pages/TransactionDuplicate/Confirmation.tsx
+++ b/src/pages/TransactionDuplicate/Confirmation.tsx
@@ -61,7 +61,7 @@ function Confirmation() {
         if (!reportAction?.childReportID) {
             return;
         }
-        Navigation.goBack(ROUTES.REPORT_WITH_ID.getRoute(reportAction?.childReportID));
+        Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(reportAction?.childReportID));
     }, [reportAction?.childReportID, transactionsMergeParams]);
 
     const resolveDuplicates = useCallback(() => {