diff --git a/src/hooks/useResponsiveLayout.ts b/src/hooks/useResponsiveLayout.ts index dd782a9dbba5..3ca2482ec387 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: {isInRHP?: boolean}; + params: {layout?: string}; }; type ResponsiveLayoutResult = { shouldUseNarrowLayout: boolean; @@ -16,10 +16,11 @@ export default function useResponsiveLayout(): ResponsiveLayoutResult { try { // eslint-disable-next-line react-hooks/rules-of-hooks const {params} = useRoute>(); - return {shouldUseNarrowLayout: isSmallScreenWidth || (params?.isInRHP ?? false)}; + const isNarrowLayout = params?.layout === 'narrow' ?? false; + const shouldUseNarrowLayout = isSmallScreenWidth || isNarrowLayout; + + return {shouldUseNarrowLayout}; } 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 4be1c988561b..ac48c2a379ed 100644 --- a/src/libs/Navigation/AppNavigator/ModalStackNavigators.tsx +++ b/src/libs/Navigation/AppNavigator/ModalStackNavigators.tsx @@ -62,6 +62,7 @@ function createModalStackNavigator(screens: key={name} name={name} getComponent={(screens as Required)[name as Screen]} + initialParams={{layout: 'narrow'} as TStackParams[string]} /> ))}