AppNavigator [nfc]: Stop getting some values from the parent component.

Instead, have AppNavigator grab them itself, with react-redux.

Author: chrisbobbe

src/nav/AppNavigator.js

@@ -8,9 +8,11 @@ import {
   TransitionPresets,
 } from '@react-navigation/stack';
 
+import { useSelector } from '../react-redux';
+import { hasAuth as getHasAuth, getAccounts, getHaveServerData } from '../selectors';
 import getInitialRouteInfo from './getInitialRouteInfo';
 import type { GlobalParamList } from './globalTypes';
-import type { Account, Narrow, Message, SharedData } from '../types';
+import type { Narrow, Message, SharedData } from '../types';
 import type { ApiResponseServerSettings } from '../api/settings/getServerSettings';
 import AccountPickScreen from '../account/AccountPickScreen';
 import RealmScreen from '../start/RealmScreen';
@@ -88,14 +90,13 @@ export type AppNavigationRouteProp<
 
 const Stack = createStackNavigator<GlobalParamList, AppNavigatorParamList, AppNavigationProp<>>();
 
-type Props = $ReadOnly<{|
-  hasAuth: boolean,
-  accounts: Account[],
-  haveServerData: boolean,
-|}>;
+type Props = $ReadOnly<{||}>;
 
 export default function AppNavigator(props: Props) {
-  const { hasAuth, accounts, haveServerData } = props;
+  const hasAuth = useSelector(getHasAuth);
+  const accounts = useSelector(getAccounts);
+  const haveServerData = useSelector(getHaveServerData);
+
   const { initialRouteName, initialRouteParams } = getInitialRouteInfo({
     hasAuth,
     accounts,

src/nav/ZulipNavigationContainer.js

@@ -6,15 +6,12 @@ import { connect } from '../react-redux';
 import type { ThemeData } from '../styles';
 import { ThemeContext } from '../styles';
 import * as NavigationService from './NavigationService';
-import type { Dispatch, Account, ThemeName } from '../types';
-import { hasAuth as getHasAuth, getAccounts, getHaveServerData, getSettings } from '../selectors';
+import type { Dispatch, ThemeName } from '../types';
+import { getSettings } from '../selectors';
 import AppNavigator from './AppNavigator';
 
 type SelectorProps = $ReadOnly<{|
   theme: ThemeName,
-  hasAuth: boolean,
-  accounts: Account[],
-  haveServerData: boolean,
 |}>;
 
 type Props = $ReadOnly<{|
@@ -41,7 +38,7 @@ class ZulipAppContainer extends PureComponent<Props> {
   }
 
   render() {
-    const { theme: themeName, hasAuth, accounts, haveServerData } = this.props;
+    const { theme: themeName } = this.props;
 
     const BaseTheme = themeName === 'night' ? DarkTheme : DefaultTheme;
 
@@ -65,15 +62,12 @@ class ZulipAppContainer extends PureComponent<Props> {
         }}
         theme={theme}
       >
-        <AppNavigator {...{ hasAuth, accounts, haveServerData }} />
+        <AppNavigator />
       </NavigationContainer>
     );
   }
 }
 
 export default connect(state => ({
   theme: getSettings(state).theme,
-  hasAuth: getHasAuth(state),
-  accounts: getAccounts(state),
-  haveServerData: getHaveServerData(state),
 }))(ZulipAppContainer);