Merge pull request #53381 from software-mansion-labs/adamgrzybowski/f…

…ix-transparency-for-modal-navigators
Expensify · Dec 2, 2024 · 95d4e35 · 95d4e35
2 parents 8498e71 + d82b96e
commit 95d4e35
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/src/libs/Navigation/AppNavigator/AuthScreens.tsx b/src/libs/Navigation/AppNavigator/AuthScreens.tsx
@@ -519,24 +519,24 @@ function AuthScreens({session, lastOpenedPublicRoomID, initialLastUpdateIDApplie
                     />
                     <RootStack.Screen
                         name={NAVIGATORS.EXPLANATION_MODAL_NAVIGATOR}
-                        options={rootNavigatorOptions.onboardingModalNavigator}
+                        options={rootNavigatorOptions.basicModalNavigator}
                         component={ExplanationModalNavigator}
                     />
                     <RootStack.Screen
                         name={NAVIGATORS.FEATURE_TRANING_MODAL_NAVIGATOR}
-                        options={rootNavigatorOptions.onboardingModalNavigator}
+                        options={rootNavigatorOptions.basicModalNavigator}
                         component={FeatureTrainingModalNavigator}
                         listeners={modalScreenListeners}
                     />
                     <RootStack.Screen
                         name={NAVIGATORS.WELCOME_VIDEO_MODAL_NAVIGATOR}
-                        options={rootNavigatorOptions.onboardingModalNavigator}
+                        options={rootNavigatorOptions.basicModalNavigator}
                         component={WelcomeVideoModalNavigator}
                     />
                     {isOnboardingCompleted === false && (
                         <RootStack.Screen
                             name={NAVIGATORS.ONBOARDING_MODAL_NAVIGATOR}
-                            options={{...rootNavigatorOptions.onboardingModalNavigator, gestureEnabled: false}}
+                            options={{...rootNavigatorOptions.basicModalNavigator, gestureEnabled: false}}
                             component={OnboardingModalNavigator}
                             listeners={{
                                 focus: () => {

diff --git a/src/libs/Navigation/AppNavigator/useRootNavigatorOptions.ts b/src/libs/Navigation/AppNavigator/useRootNavigatorOptions.ts
@@ -12,7 +12,7 @@ import useModalCardStyleInterpolator from './useModalCardStyleInterpolator';
 
 type RootNavigatorOptions = {
     rightModalNavigator: PlatformStackNavigationOptions;
-    onboardingModalNavigator: PlatformStackNavigationOptions;
+    basicModalNavigator: PlatformStackNavigationOptions;
     leftModalNavigator: PlatformStackNavigationOptions;
     homeScreen: PlatformStackNavigationOptions;
     fullScreen: PlatformStackNavigationOptions;
@@ -51,9 +51,9 @@ const useRootNavigatorOptions = () => {
                 cardStyleInterpolator: (props: StackCardInterpolationProps) => modalCardStyleInterpolator({props}),
             },
         },
-        onboardingModalNavigator: {
+        basicModalNavigator: {
+            presentation: Presentation.TRANSPARENT_MODAL,
             web: {
-                presentation: Presentation.TRANSPARENT_MODAL,
                 cardOverlayEnabled: false,
                 cardStyle: {
                     ...StyleUtils.getNavigationModalCardStyle(),