Merge pull request #3634 from dklymenk/3559-fix-initial-route-after-r…

…elogin

#3559 fix initial route after relogin

src/libs/Navigation/AppNavigator/MainDrawerNavigator.js

@@ -1,6 +1,5 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import _ from 'underscore';
 import lodashGet from 'lodash/get';
 import {createDrawerNavigator} from '@react-navigation/drawer';
 import {withOnyx} from 'react-native-onyx';
@@ -41,8 +40,10 @@ const getInitialReportScreenParams = (reports) => {
 };
 
 const MainDrawerNavigator = (props) => {
-    // When there are no reports there's no point to render the empty navigator
-    if (_.size(props.reports) === 0) {
+    const initialParams = getInitialReportScreenParams(props.reports);
+
+    // Wait until reports are fetched and there is a reportID in initialParams
+    if (!initialParams.reportID) {
         return <FullScreenLoadingIndicator visible />;
     }
 
@@ -69,7 +70,7 @@ const MainDrawerNavigator = (props) => {
             <Drawer.Screen
                 name={SCREENS.REPORT}
                 component={ReportScreen}
-                initialParams={getInitialReportScreenParams(props.reports)}
+                initialParams={initialParams}
             />
         </Drawer.Navigator>
     );