From 4a7d4f972ffd934227ef7186cbe14317ddbf3af9 Mon Sep 17 00:00:00 2001
From: Vit Horacek <36083550+mountiny@users.noreply.github.com>
Date: Tue, 16 Jan 2024 11:37:37 +0000
Subject: [PATCH] Merge pull request #34552 from
 Expensify/revert-33426-add-the-isInRHP-prop-to-the-ModalStackNavigator

[CP Staging] Revert "Add layout=narrow initial param to the ModalStackNavigator"

(cherry picked from commit 925dc3d292a038f607feb422c0634e7ece1ba75e)
---
 src/hooks/useResponsiveLayout.ts                      | 11 +++++------
 .../Navigation/AppNavigator/ModalStackNavigators.tsx  |  1 -
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/hooks/useResponsiveLayout.ts b/src/hooks/useResponsiveLayout.ts
index 3ca2482ec387..dd782a9dbba5 100644
--- a/src/hooks/useResponsiveLayout.ts
+++ b/src/hooks/useResponsiveLayout.ts
@@ -3,7 +3,7 @@ import {useRoute} from '@react-navigation/native';
 import useWindowDimensions from './useWindowDimensions';
 
 type RouteParams = ParamListBase & {
-    params: {layout?: string};
+    params: {isInRHP?: boolean};
 };
 type ResponsiveLayoutResult = {
     shouldUseNarrowLayout: boolean;
@@ -16,11 +16,10 @@ export default function useResponsiveLayout(): ResponsiveLayoutResult {
     try {
         // eslint-disable-next-line react-hooks/rules-of-hooks
         const {params} = useRoute<RouteProp<RouteParams, 'params'>>();
-        const isNarrowLayout = params?.layout === 'narrow' ?? false;
-        const shouldUseNarrowLayout = isSmallScreenWidth || isNarrowLayout;
-
-        return {shouldUseNarrowLayout};
+        return {shouldUseNarrowLayout: isSmallScreenWidth || (params?.isInRHP ?? false)};
     } catch (error) {
-        return {shouldUseNarrowLayout: isSmallScreenWidth};
+        return {
+            shouldUseNarrowLayout: isSmallScreenWidth,
+        };
     }
 }
diff --git a/src/libs/Navigation/AppNavigator/ModalStackNavigators.tsx b/src/libs/Navigation/AppNavigator/ModalStackNavigators.tsx
index 9d4be56ba08f..b0f33af0ce2e 100644
--- a/src/libs/Navigation/AppNavigator/ModalStackNavigators.tsx
+++ b/src/libs/Navigation/AppNavigator/ModalStackNavigators.tsx
@@ -62,7 +62,6 @@ function createModalStackNavigator<TStackParams extends ParamListBase>(screens:
                         key={name}
                         name={name}
                         getComponent={(screens as Required<Screens>)[name as Screen]}
-                        initialParams={{layout: 'narrow'} as TStackParams[string]}
                     />
                 ))}
             </ModalStackNavigator.Navigator>