From 228517471ff06c4c4437fa6e13f5035242b9147a Mon Sep 17 00:00:00 2001
From: I Nyoman Jyotisa <jyotisa1616@gmail.com>
Date: Mon, 7 Jul 2025 15:41:14 +0800
Subject: [PATCH 1/2] Fix: Onboarding modal opens partially at the beginning

---
 .../Navigators/OnboardingModalNavigator.tsx   | 30 ++++++++++++-------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/src/libs/Navigation/AppNavigator/Navigators/OnboardingModalNavigator.tsx b/src/libs/Navigation/AppNavigator/Navigators/OnboardingModalNavigator.tsx
index 43921519f909..f7c5f5e03d18 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/OnboardingModalNavigator.tsx
+++ b/src/libs/Navigation/AppNavigator/Navigators/OnboardingModalNavigator.tsx
@@ -8,6 +8,7 @@ import useKeyboardShortcut from '@hooks/useKeyboardShortcut';
 import useOnyx from '@hooks/useOnyx';
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useThemeStyles from '@hooks/useThemeStyles';
+import {isMobileSafari} from '@libs/Browser';
 import GoogleTagManager from '@libs/GoogleTagManager';
 import createPlatformStackNavigator from '@libs/Navigation/PlatformStackNavigation/createPlatformStackNavigator';
 import type {PlatformStackNavigationOptions} from '@libs/Navigation/PlatformStackNavigation/types';
@@ -28,18 +29,9 @@ import OnboardingWorkspaces from '@pages/OnboardingWorkspaces';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import SCREENS from '@src/SCREENS';
+import useCustomScreenOptions from '../useCustomScreenOptions';
 import Overlay from './Overlay';
 
-const defaultScreenOptions: PlatformStackNavigationOptions = {
-    headerShown: false,
-    web: {
-        cardStyleInterpolator: CardStyleInterpolators.forHorizontalIOS,
-        cardStyle: {
-            height: '100%',
-        },
-    },
-};
-
 const Stack = createPlatformStackNavigator<OnboardingModalNavigatorParamList>();
 
 function OnboardingModalNavigator() {
@@ -50,6 +42,7 @@ function OnboardingModalNavigator() {
     const [onboardingPurposeSelected] = useOnyx(ONYXKEYS.ONBOARDING_PURPOSE_SELECTED, {canBeMissing: true});
     const [onboardingPolicyID] = useOnyx(ONYXKEYS.ONBOARDING_POLICY_ID, {canBeMissing: true});
     const isOnPrivateDomainAndHasAccessiblePolicies = !account?.isFromPublicDomain && account?.hasAccessibleDomainPolicies;
+    const customScreenOptions = useCustomScreenOptions();
 
     let initialRouteName: ValueOf<typeof SCREENS.ONBOARDING> = SCREENS.ONBOARDING.PURPOSE;
 
@@ -91,6 +84,23 @@ function OnboardingModalNavigator() {
         return null;
     }
 
+    const defaultScreenOptions: PlatformStackNavigationOptions = {
+        headerShown: false,
+        web: isMobileSafari()
+            ? {
+                  ...customScreenOptions.web,
+                  cardStyle: {
+                      height: '100%',
+                  },
+              }
+            : {
+                  cardStyleInterpolator: CardStyleInterpolators.forHorizontalIOS,
+                  cardStyle: {
+                      height: '100%',
+                  },
+              },
+    };
+
     return (
         <NoDropZone>
             <Overlay />

From 7a8851fe3daa88d6a1199dd06258e1e027603ccb Mon Sep 17 00:00:00 2001
From: I Nyoman Jyotisa <jyotisa1616@gmail.com>
Date: Thu, 10 Jul 2025 10:43:38 +0800
Subject: [PATCH 2/2] minor fix

---
 .../Navigators/OnboardingModalNavigator.tsx   | 21 +++++++------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/src/libs/Navigation/AppNavigator/Navigators/OnboardingModalNavigator.tsx b/src/libs/Navigation/AppNavigator/Navigators/OnboardingModalNavigator.tsx
index f7c5f5e03d18..ab665e23b5c7 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/OnboardingModalNavigator.tsx
+++ b/src/libs/Navigation/AppNavigator/Navigators/OnboardingModalNavigator.tsx
@@ -10,6 +10,7 @@ import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useThemeStyles from '@hooks/useThemeStyles';
 import {isMobileSafari} from '@libs/Browser';
 import GoogleTagManager from '@libs/GoogleTagManager';
+import useCustomScreenOptions from '@libs/Navigation/AppNavigator/useCustomScreenOptions';
 import createPlatformStackNavigator from '@libs/Navigation/PlatformStackNavigation/createPlatformStackNavigator';
 import type {PlatformStackNavigationOptions} from '@libs/Navigation/PlatformStackNavigation/types';
 import type {OnboardingModalNavigatorParamList} from '@libs/Navigation/types';
@@ -29,7 +30,6 @@ import OnboardingWorkspaces from '@pages/OnboardingWorkspaces';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import SCREENS from '@src/SCREENS';
-import useCustomScreenOptions from '../useCustomScreenOptions';
 import Overlay from './Overlay';
 
 const Stack = createPlatformStackNavigator<OnboardingModalNavigatorParamList>();
@@ -86,19 +86,12 @@ function OnboardingModalNavigator() {
 
     const defaultScreenOptions: PlatformStackNavigationOptions = {
         headerShown: false,
-        web: isMobileSafari()
-            ? {
-                  ...customScreenOptions.web,
-                  cardStyle: {
-                      height: '100%',
-                  },
-              }
-            : {
-                  cardStyleInterpolator: CardStyleInterpolators.forHorizontalIOS,
-                  cardStyle: {
-                      height: '100%',
-                  },
-              },
+        web: {
+            ...(isMobileSafari() ? customScreenOptions.web : {cardStyleInterpolator: CardStyleInterpolators.forHorizontalIOS}),
+            cardStyle: {
+                height: '100%',
+            },
+        },
     };
 
     return (