From 5364229aed4a7c126337376781b806c3bd58357a Mon Sep 17 00:00:00 2001
From: Vit Horacek <vit@expensify.com>
Date: Thu, 6 Jul 2023 12:39:23 -0500
Subject: [PATCH 1/3] Do not use the replace in case of RHP as its fixing edge
 case

---
 src/libs/Navigation/linkTo.js | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/libs/Navigation/linkTo.js b/src/libs/Navigation/linkTo.js
index c86c15c38146..4b8a0c90bd6f 100644
--- a/src/libs/Navigation/linkTo.js
+++ b/src/libs/Navigation/linkTo.js
@@ -79,12 +79,8 @@ export default function linkTo(navigation, path, type) {
     }
 
     if (action.payload.name === NAVIGATORS.RIGHT_MODAL_NAVIGATOR) {
-        const {minimalAction, targetName} = getMinimalAction(action, navigation.getRootState());
+        const {minimalAction} = getMinimalAction(action, navigation.getRootState());
         if (minimalAction) {
-            // If the target name is RHP that means this action is responsible for changing flow within the RHP e.g. from settings to search. In that case we want to use REPLACE.
-            if (targetName === NAVIGATORS.RIGHT_MODAL_NAVIGATOR) {
-                minimalAction.type = 'REPLACE';
-            }
             root.dispatch(minimalAction);
             return;
         }

From e41243a1da0e424b7080c3bcf505b51feb68ccad Mon Sep 17 00:00:00 2001
From: Vit Horacek <vit@expensify.com>
Date: Thu, 6 Jul 2023 14:11:43 -0500
Subject: [PATCH 2/3] Refactor the getMinimalAction as we dont need targetName
 anymore

---
 .../AppNavigator/Navigators/RightModalNavigator.js     | 10 +++++++++-
 src/libs/Navigation/AppNavigator/RHPScreenOptions.js   |  2 +-
 src/libs/Navigation/linkTo.js                          |  9 +++------
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/libs/Navigation/AppNavigator/Navigators/RightModalNavigator.js b/src/libs/Navigation/AppNavigator/Navigators/RightModalNavigator.js
index 7b22475bc623..116e54e6001b 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/RightModalNavigator.js
+++ b/src/libs/Navigation/AppNavigator/Navigators/RightModalNavigator.js
@@ -17,13 +17,21 @@ function RigthModalNavigator() {
                 name="NewChat"
                 component={ModalStackNavigators.NewChatModalStackNavigator}
             />
-            <Stack.Screen
+             <Stack.Screen
                 name="NewGroup"
                 component={ModalStackNavigators.NewGroupModalStackNavigator}
+                options={{
+                    // Disable animation for this screen because it causes an animation glitch when using shortcuts
+                    animationEnabled: false,
+                }}
             />
             <Stack.Screen
                 name="Search"
                 component={ModalStackNavigators.SearchModalStackNavigator}
+                options={{
+                    // Disable animation for this screen because it causes an animation glitch when using shortcuts
+                    animationEnabled: false,
+                }}
             />
             <Stack.Screen
                 name="Details"
diff --git a/src/libs/Navigation/AppNavigator/RHPScreenOptions.js b/src/libs/Navigation/AppNavigator/RHPScreenOptions.js
index 9aa984023f4f..d7448dcf2314 100644
--- a/src/libs/Navigation/AppNavigator/RHPScreenOptions.js
+++ b/src/libs/Navigation/AppNavigator/RHPScreenOptions.js
@@ -3,7 +3,7 @@ import styles from '../../../styles/styles';
 
 const RHPScreenOptions = {
     headerShown: false,
-    animationEnabled: false,
+    animationEnabled: true,
     gestureDirection: 'horizontal',
     cardStyle: styles.navigationScreenCardStyle,
     cardStyleInterpolator: CardStyleInterpolators.forHorizontalIOS,
diff --git a/src/libs/Navigation/linkTo.js b/src/libs/Navigation/linkTo.js
index 4b8a0c90bd6f..c610ae710992 100644
--- a/src/libs/Navigation/linkTo.js
+++ b/src/libs/Navigation/linkTo.js
@@ -10,21 +10,18 @@ import getStateFromPath from './getStateFromPath';
  *
  * @param {Object} action action generated by getActionFromState
  * @param {Object} state The root state
- * @returns {{minimalAction: Object, targetName: String}} minimal action is the action that we should dispatch and targetName is the name of the target navigator.
- * targetName name is necessary to determine if we are going to use REPLACE for navigating between RHP flows.
+ * @returns {Object} minimalAction minimal action is the action that we should dispatch
  */
 function getMinimalAction(action, state) {
     let currentAction = action;
     let currentState = state;
     let currentTargetKey = null;
-    let targetName = null;
 
     while (currentState.routes[currentState.index].name === currentAction.payload.name) {
         if (!currentState.routes[currentState.index].state) {
             break;
         }
 
-        targetName = currentState.routes[currentState.index].name;
         currentState = currentState.routes[currentState.index].state;
 
         currentTargetKey = currentState.key;
@@ -40,7 +37,7 @@ function getMinimalAction(action, state) {
             target: currentTargetKey,
         };
     }
-    return {minimalAction: currentAction, targetName};
+    return currentAction;
 }
 
 export default function linkTo(navigation, path, type) {
@@ -79,7 +76,7 @@ export default function linkTo(navigation, path, type) {
     }
 
     if (action.payload.name === NAVIGATORS.RIGHT_MODAL_NAVIGATOR) {
-        const {minimalAction} = getMinimalAction(action, navigation.getRootState());
+        const minimalAction = getMinimalAction(action, navigation.getRootState());
         if (minimalAction) {
             root.dispatch(minimalAction);
             return;

From 97f2539c649c9432cc8ddf8a6091789662c445c6 Mon Sep 17 00:00:00 2001
From: Vit Horacek <vit@expensify.com>
Date: Thu, 6 Jul 2023 14:26:46 -0500
Subject: [PATCH 3/3] Fix linter

---
 .../Navigation/AppNavigator/Navigators/RightModalNavigator.js   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libs/Navigation/AppNavigator/Navigators/RightModalNavigator.js b/src/libs/Navigation/AppNavigator/Navigators/RightModalNavigator.js
index 116e54e6001b..a04e9bfc10ec 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/RightModalNavigator.js
+++ b/src/libs/Navigation/AppNavigator/Navigators/RightModalNavigator.js
@@ -17,7 +17,7 @@ function RigthModalNavigator() {
                 name="NewChat"
                 component={ModalStackNavigators.NewChatModalStackNavigator}
             />
-             <Stack.Screen
+            <Stack.Screen
                 name="NewGroup"
                 component={ModalStackNavigators.NewGroupModalStackNavigator}
                 options={{