diff --git a/src/screens/application/container/applicationContainer.js b/src/screens/application/container/applicationContainer.js index 42b7ce70e..2ed32ad23 100644 --- a/src/screens/application/container/applicationContainer.js +++ b/src/screens/application/container/applicationContainer.js @@ -11,7 +11,7 @@ import { injectIntl } from 'react-intl'; import { NavigationActions } from 'react-navigation'; import { bindActionCreators } from 'redux'; import EStyleSheet from 'react-native-extended-stylesheet'; -import forEach from 'lodash/forEach'; +import { forEach, isEmpty, some } from 'lodash'; // Constants import AUTH_TYPE from '../../../constants/authType'; @@ -384,13 +384,15 @@ class ApplicationContainer extends Component { break; } - const navigateAction = NavigationActions.navigate({ - routeName, - params, - key, - action: NavigationActions.navigate({ routeName }), - }); - dispatch(navigateAction); + if (!some(params, isEmpty)) { + const navigateAction = NavigationActions.navigate({ + routeName, + params, + key, + action: NavigationActions.navigate({ routeName }), + }); + dispatch(navigateAction); + } } }, }); diff --git a/src/screens/notification/container/notificationContainer.js b/src/screens/notification/container/notificationContainer.js index 67720a7c3..5c7f69a88 100644 --- a/src/screens/notification/container/notificationContainer.js +++ b/src/screens/notification/container/notificationContainer.js @@ -1,7 +1,7 @@ import React, { Component } from 'react'; import { Alert } from 'react-native'; import { connect } from 'react-redux'; -import get from 'lodash/get'; +import { get, some, isEmpty } from 'lodash'; import { injectIntl } from 'react-intl'; // Actions and Services @@ -87,7 +87,7 @@ class NotificationContainer extends Component { dispatch(updateUnreadActivityCount(result.unread)); }); - if (permlink) { + if (permlink && author) { routeName = ROUTES.SCREENS.POST; key = permlink; params = {