Merge pull request #212 from lbryio/splash-screen-back

prevent an error upon pressing the back button on the splash screen
This commit is contained in:
Akinwale Ariwodola 2018-07-31 15:39:30 +01:00 committed by GitHub
commit 078e010c54
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -128,12 +128,14 @@ class AppWithNavigationState extends React.Component {
const { dispatch, nav } = this.props;
// There should be a better way to check this
if (nav.routes.length > 0) {
const subRoutes = nav.routes[0].routes[0].routes;
const lastRoute = subRoutes[subRoutes.length - 1];
if (nav.routes[0].routes[0].index > 0 &&
['About', 'Settings'].indexOf(lastRoute.key) > -1) {
dispatch(NavigationActions.back());
return true;
if (nav.routes[0].routes && nav.routes[0].routes.length > 0) {
const subRoutes = nav.routes[0].routes[0].routes;
const lastRoute = subRoutes[subRoutes.length - 1];
if (nav.routes[0].routes[0].index > 0 &&
['About', 'Settings'].indexOf(lastRoute.key) > -1) {
dispatch(NavigationActions.back());
return true;
}
}
if (nav.routes[0].routeName === 'Main') {
if (nav.routes[0].routes[0].routes[0].index > 0) {