ecency/ecency-mobile
1
1
Fork 0
mirror of https://github.com/ecency/ecency-mobile.git synced 2024-12-15 08:32:45 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #512 from esteemapp/bugfix/#451

Browse Source 
Fixed #451
This commit is contained in:
uğur erdal 2019-01-25 17:29:51 +03:00 committed by GitHub
commit 144f7cda61
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/screens/application/container/applicationContainer.js
View File

@ -90,9 +90,13 @@ class ApplicationContainer extends Component {
} }
_onBackPress = () => { _onBackPress = () => {
const { dispatch } = this.props; const { dispatch, nav } = this.props;
if (nav && nav[0].index !== 0) {
dispatch(NavigationActions.back()); dispatch(NavigationActions.back());
} else {
BackHandler.exitApp();
}
return true; return true;
}; };
@ -283,6 +287,7 @@ const mapStateToProps = state => ({
notificationSettings: state.application.isNotificationOpen, notificationSettings: state.application.isNotificationOpen,
isLogingOut: state.application.isLogingOut, isLogingOut: state.application.isLogingOut,
isLoggedIn: state.application.isLoggedIn, isLoggedIn: state.application.isLoggedIn,
nav: state.nav.routes,
// Account // Account
unreadActivityCount: state.account.currentAccount.unread_activity_count, unreadActivityCount: state.account.currentAccount.unread_activity_count,