From d322277518873c122a07b935c7886e2e5017041a Mon Sep 17 00:00:00 2001 From: Dmytro Klymenko Date: Thu, 17 Jun 2021 14:59:49 +0300 Subject: [PATCH 1/2] #3559 fix initial route after relogin --- src/libs/Navigation/AppNavigator/MainDrawerNavigator.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/libs/Navigation/AppNavigator/MainDrawerNavigator.js b/src/libs/Navigation/AppNavigator/MainDrawerNavigator.js index ff4c6dbca5ef..fde78505efc0 100644 --- a/src/libs/Navigation/AppNavigator/MainDrawerNavigator.js +++ b/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 ; } @@ -69,7 +70,7 @@ const MainDrawerNavigator = (props) => { ); From 292ef52e2c9c0b08646ab11daa1cb2a0da1617ca Mon Sep 17 00:00:00 2001 From: OSBotify Date: Thu, 17 Jun 2021 19:26:00 +0000 Subject: [PATCH 2/2] Update version to 1.0.70-6 --- android/app/build.gradle | 4 ++-- ios/ExpensifyCash/Info.plist | 2 +- ios/ExpensifyCashTests/Info.plist | 2 +- package-lock.json | 2 +- package.json | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index c54d241d770b..0b25d4bfdf89 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -148,8 +148,8 @@ android { minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion multiDexEnabled rootProject.ext.multiDexEnabled - versionCode 1001007005 - versionName "1.0.70-5" + versionCode 1001007006 + versionName "1.0.70-6" } splits { abi { diff --git a/ios/ExpensifyCash/Info.plist b/ios/ExpensifyCash/Info.plist index b8537ba959ee..eb88392ed51f 100644 --- a/ios/ExpensifyCash/Info.plist +++ b/ios/ExpensifyCash/Info.plist @@ -30,7 +30,7 @@ CFBundleVersion - 1.0.70.5 + 1.0.70.6 ITSAppUsesNonExemptEncryption LSApplicationQueriesSchemes diff --git a/ios/ExpensifyCashTests/Info.plist b/ios/ExpensifyCashTests/Info.plist index fa46f9d544bf..72d5cd2666b4 100644 --- a/ios/ExpensifyCashTests/Info.plist +++ b/ios/ExpensifyCashTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 1.0.70.5 + 1.0.70.6 diff --git a/package-lock.json b/package-lock.json index 362e06ba60b8..5d6cf3f669f0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "expensify.cash", - "version": "1.0.70-5", + "version": "1.0.70-6", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 26f1d66b0ffe..96cd3622c6b7 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "expensify.cash", - "version": "1.0.70-5", + "version": "1.0.70-6", "author": "Expensify, Inc.", "homepage": "https://expensify.cash", "description": "Expensify.cash is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",