Skip to content

Commit 2285174

Browse files
committed
Fix: Onboarding modal opens partially at the beginning
1 parent f660f73 commit 2285174

1 file changed

Lines changed: 20 additions & 10 deletions

File tree

src/libs/Navigation/AppNavigator/Navigators/OnboardingModalNavigator.tsx

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import useKeyboardShortcut from '@hooks/useKeyboardShortcut';
88
import useOnyx from '@hooks/useOnyx';
99
import useResponsiveLayout from '@hooks/useResponsiveLayout';
1010
import useThemeStyles from '@hooks/useThemeStyles';
11+
import {isMobileSafari} from '@libs/Browser';
1112
import GoogleTagManager from '@libs/GoogleTagManager';
1213
import createPlatformStackNavigator from '@libs/Navigation/PlatformStackNavigation/createPlatformStackNavigator';
1314
import type {PlatformStackNavigationOptions} from '@libs/Navigation/PlatformStackNavigation/types';
@@ -28,18 +29,9 @@ import OnboardingWorkspaces from '@pages/OnboardingWorkspaces';
2829
import CONST from '@src/CONST';
2930
import ONYXKEYS from '@src/ONYXKEYS';
3031
import SCREENS from '@src/SCREENS';
32+
import useCustomScreenOptions from '../useCustomScreenOptions';
3133
import Overlay from './Overlay';
3234

33-
const defaultScreenOptions: PlatformStackNavigationOptions = {
34-
headerShown: false,
35-
web: {
36-
cardStyleInterpolator: CardStyleInterpolators.forHorizontalIOS,
37-
cardStyle: {
38-
height: '100%',
39-
},
40-
},
41-
};
42-
4335
const Stack = createPlatformStackNavigator<OnboardingModalNavigatorParamList>();
4436

4537
function OnboardingModalNavigator() {
@@ -50,6 +42,7 @@ function OnboardingModalNavigator() {
5042
const [onboardingPurposeSelected] = useOnyx(ONYXKEYS.ONBOARDING_PURPOSE_SELECTED, {canBeMissing: true});
5143
const [onboardingPolicyID] = useOnyx(ONYXKEYS.ONBOARDING_POLICY_ID, {canBeMissing: true});
5244
const isOnPrivateDomainAndHasAccessiblePolicies = !account?.isFromPublicDomain && account?.hasAccessibleDomainPolicies;
45+
const customScreenOptions = useCustomScreenOptions();
5346

5447
let initialRouteName: ValueOf<typeof SCREENS.ONBOARDING> = SCREENS.ONBOARDING.PURPOSE;
5548

@@ -91,6 +84,23 @@ function OnboardingModalNavigator() {
9184
return null;
9285
}
9386

87+
const defaultScreenOptions: PlatformStackNavigationOptions = {
88+
headerShown: false,
89+
web: isMobileSafari()
90+
? {
91+
...customScreenOptions.web,
92+
cardStyle: {
93+
height: '100%',
94+
},
95+
}
96+
: {
97+
cardStyleInterpolator: CardStyleInterpolators.forHorizontalIOS,
98+
cardStyle: {
99+
height: '100%',
100+
},
101+
},
102+
};
103+
94104
return (
95105
<NoDropZone>
96106
<Overlay />

0 commit comments

Comments
 (0)