From 41daeef176c1ca2d5aec3f318c9cac6dffe15c1d Mon Sep 17 00:00:00 2001
From: Jasper Huang <jasper@expensify.com>
Date: Fri, 5 Apr 2024 12:00:01 -0700
Subject: [PATCH] Merge pull request #39753 from
 bernhardoj/fix/39710-options-data-cache-is-persisted-after-log-out

Fix report and personal detail options are persisted after switching account

(cherry picked from commit 4e11f41cb72766b3e9585f0d023d072d45ecf244)
---
 src/App.tsx                                   |   2 -
 .../Navigation/AppNavigator/AuthScreens.tsx   | 134 ++++++++++++++++++
 2 files changed, 134 insertions(+), 2 deletions(-)

diff --git a/src/App.tsx b/src/App.tsx
index 61874dc72fb0..a3a9f7a3f3b6 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -16,7 +16,6 @@ import HTMLEngineProvider from './components/HTMLEngineProvider';
 import InitialURLContextProvider from './components/InitialURLContextProvider';
 import {LocaleContextProvider} from './components/LocaleContextProvider';
 import OnyxProvider from './components/OnyxProvider';
-import OptionsListContextProvider from './components/OptionListContextProvider';
 import PopoverContextProvider from './components/PopoverProvider';
 import SafeArea from './components/SafeArea';
 import ScrollOffsetContextProvider from './components/ScrollOffsetContextProvider';
@@ -83,7 +82,6 @@ function App({url}: AppProps) {
                         FullScreenContextProvider,
                         VolumeContextProvider,
                         VideoPopoverMenuContextProvider,
-                        OptionsListContextProvider,
                     ]}
                 >
                     <CustomStatusBarAndBackground />
diff --git a/src/libs/Navigation/AppNavigator/AuthScreens.tsx b/src/libs/Navigation/AppNavigator/AuthScreens.tsx
index 463dcfcd9e99..6fd851ba61f0 100644
--- a/src/libs/Navigation/AppNavigator/AuthScreens.tsx
+++ b/src/libs/Navigation/AppNavigator/AuthScreens.tsx
@@ -2,6 +2,11 @@ import React, {memo, useEffect, useRef} from 'react';
 import {View} from 'react-native';
 import type {OnyxEntry} from 'react-native-onyx';
 import Onyx, {withOnyx} from 'react-native-onyx';
+<<<<<<< HEAD
+=======
+import OptionsListContextProvider from '@components/OptionListContextProvider';
+import useOnboardingLayout from '@hooks/useOnboardingLayout';
+>>>>>>> 4e11f41 (Merge pull request #39753 from bernhardoj/fix/39710-options-data-cache-is-persisted-after-log-out)
 import useStyleUtils from '@hooks/useStyleUtils';
 import useThemeStyles from '@hooks/useThemeStyles';
 import useWindowDimensions from '@hooks/useWindowDimensions';
@@ -261,6 +266,7 @@ function AuthScreens({session, lastOpenedPublicRoomID, initialLastUpdateIDApplie
     }, []);
 
     return (
+<<<<<<< HEAD
         <View style={styles.rootNavigatorContainerStyles(isSmallScreenWidth)}>
             <RootStack.Navigator isSmallScreenWidth={isSmallScreenWidth}>
                 <RootStack.Screen
@@ -375,6 +381,134 @@ function AuthScreens({session, lastOpenedPublicRoomID, initialLastUpdateIDApplie
                 />
             </RootStack.Navigator>
         </View>
+=======
+        <OptionsListContextProvider>
+            <View style={styles.rootNavigatorContainerStyles(isSmallScreenWidth)}>
+                <RootStack.Navigator isSmallScreenWidth={isSmallScreenWidth}>
+                    <RootStack.Screen
+                        name={NAVIGATORS.BOTTOM_TAB_NAVIGATOR}
+                        options={screenOptions.bottomTab}
+                        component={BottomTabNavigator}
+                    />
+                    <RootStack.Screen
+                        name={NAVIGATORS.CENTRAL_PANE_NAVIGATOR}
+                        options={screenOptions.centralPaneNavigator}
+                        component={CentralPaneNavigator}
+                    />
+                    <RootStack.Screen
+                        name={SCREENS.VALIDATE_LOGIN}
+                        options={{
+                            ...screenOptions.fullScreen,
+                            headerShown: false,
+                            title: 'New Expensify',
+                        }}
+                        getComponent={loadValidateLoginPage}
+                    />
+                    <RootStack.Screen
+                        name={SCREENS.TRANSITION_BETWEEN_APPS}
+                        options={defaultScreenOptions}
+                        getComponent={loadLogOutPreviousUserPage}
+                    />
+                    <RootStack.Screen
+                        name={SCREENS.CONCIERGE}
+                        options={defaultScreenOptions}
+                        getComponent={loadConciergePage}
+                    />
+                    <RootStack.Screen
+                        name={SCREENS.REPORT_ATTACHMENTS}
+                        options={{
+                            headerShown: false,
+                            presentation: 'transparentModal',
+                        }}
+                        getComponent={loadReportAttachments}
+                        listeners={modalScreenListeners}
+                    />
+                    <RootStack.Screen
+                        name={SCREENS.PROFILE_AVATAR}
+                        options={{
+                            headerShown: false,
+                            presentation: 'transparentModal',
+                        }}
+                        getComponent={loadProfileAvatar}
+                        listeners={modalScreenListeners}
+                    />
+                    <RootStack.Screen
+                        name={SCREENS.WORKSPACE_AVATAR}
+                        options={{
+                            headerShown: false,
+                            presentation: 'transparentModal',
+                        }}
+                        getComponent={loadWorkspaceAvatar}
+                        listeners={modalScreenListeners}
+                    />
+                    <RootStack.Screen
+                        name={SCREENS.REPORT_AVATAR}
+                        options={{
+                            headerShown: false,
+                            presentation: 'transparentModal',
+                        }}
+                        getComponent={loadReportAvatar}
+                        listeners={modalScreenListeners}
+                    />
+                    <RootStack.Screen
+                        name={SCREENS.NOT_FOUND}
+                        options={screenOptions.fullScreen}
+                        component={NotFoundPage}
+                    />
+                    <RootStack.Screen
+                        name={NAVIGATORS.RIGHT_MODAL_NAVIGATOR}
+                        options={screenOptions.rightModalNavigator}
+                        component={RightModalNavigator}
+                        listeners={modalScreenListeners}
+                    />
+                    <RootStack.Screen
+                        name={NAVIGATORS.FULL_SCREEN_NAVIGATOR}
+                        options={screenOptions.fullScreen}
+                        component={FullScreenNavigator}
+                    />
+                    <RootStack.Screen
+                        name={NAVIGATORS.LEFT_MODAL_NAVIGATOR}
+                        options={screenOptions.leftModalNavigator}
+                        component={LeftModalNavigator}
+                        listeners={modalScreenListeners}
+                    />
+                    <RootStack.Screen
+                        name={SCREENS.DESKTOP_SIGN_IN_REDIRECT}
+                        options={screenOptions.fullScreen}
+                        component={DesktopSignInRedirectPage}
+                    />
+                    <RootStack.Screen
+                        name={NAVIGATORS.WELCOME_VIDEO_MODAL_NAVIGATOR}
+                        options={onboardingScreenOptions}
+                        component={WelcomeVideoModalNavigator}
+                    />
+                    <RootStack.Screen
+                        name={NAVIGATORS.ONBOARDING_MODAL_NAVIGATOR}
+                        options={onboardingScreenOptions}
+                        component={OnboardingModalNavigator}
+                    />
+                    <RootStack.Screen
+                        name={SCREENS.WORKSPACE_JOIN_USER}
+                        options={{
+                            headerShown: false,
+                            presentation: 'transparentModal',
+                        }}
+                        listeners={modalScreenListeners}
+                        getComponent={loadWorkspaceJoinUser}
+                    />
+                    <RootStack.Screen
+                        name={SCREENS.TRANSACTION_RECEIPT}
+                        options={{
+                            headerShown: false,
+                            presentation: 'transparentModal',
+                        }}
+                        getComponent={loadReceiptView}
+                        listeners={modalScreenListeners}
+                    />
+                </RootStack.Navigator>
+            </View>
+        </OptionsListContextProvider>
+>>>>>>> 4e11f41 (Merge pull request #39753 from bernhardoj/fix/39710-options-data-cache-is-persisted-after-log-out)
     );
 }