Merge pull request #57831 from software-mansion-labs/fix/scroll-reports-screen

[CP Staging] Fix: Scroll Issue on Reports Page, side pane appearing after language change

(cherry picked from commit a99a5fe)

(CP triggered by francoisl)

Author: francoisl

src/hooks/useSidePane.ts

@@ -27,7 +27,8 @@ function useSidePane() {
     const {windowWidth} = useWindowDimensions();
 
     const [sidePane] = useOnyx(ONYXKEYS.NVP_SIDE_PANE);
-    const isPaneHidden = isSidePaneHidden(sidePane, isExtraLargeScreenWidth);
+    const [language] = useOnyx(ONYXKEYS.NVP_PREFERRED_LOCALE);
+    const isPaneHidden = isSidePaneHidden(sidePane, isExtraLargeScreenWidth) || language !== CONST.LOCALES.EN;
 
     const sidePaneWidth = shouldUseNarrowLayout ? windowWidth : variables.sideBarWidth;
     const shouldApplySidePaneOffset = isExtraLargeScreenWidth && !isPaneHidden;

src/libs/Navigation/AppNavigator/useRootNavigatorScreenOptions.ts

@@ -81,16 +81,17 @@ const useRootNavigatorScreenOptions = () => {
             animation: Animations.NONE,
             web: {
                 cardStyleInterpolator: (props: StackCardInterpolationProps) => modalCardStyleInterpolator({props, isFullScreenModal: true}),
-                cardStyle: {
-                    ...StyleUtils.getNavigationModalCardStyle(),
-                },
+                cardStyle: StyleUtils.getNavigationModalCardStyle(),
             },
         },
         fullScreen: {
             ...commonScreenOptions,
             // We need to turn off animation for the full screen to avoid delay when closing screens.
             animation: Animations.NONE,
             web: {
+                cardStyle: {
+                    height: '100%',
+                },
                 cardStyleInterpolator: (props: StackCardInterpolationProps) => modalCardStyleInterpolator({props, isFullScreenModal: true, shouldAnimateSidePane: true}),
             },
         },

src/libs/actions/App.ts

@@ -31,7 +31,6 @@ import {getAll, rollbackOngoingRequest, save} from './PersistedRequests';
 import {createDraftInitialWorkspace, createWorkspace, generatePolicyID} from './Policy/Policy';
 import {resolveDuplicationConflictAction} from './RequestConflictUtils';
 import {isAnonymousUser} from './Session';
-import {triggerSidePane} from './SidePane';
 import Timing from './Timing';
 
 type PolicyParamsForOpenOrReconnect = {
@@ -197,7 +196,6 @@ function setLocale(locale: Locale) {
 
 function setLocaleAndNavigate(locale: Locale) {
     setLocale(locale);
-    triggerSidePane(false, {shouldUpdateNarrowLayout: true});
     Navigation.goBack();
 }