From e904316f37cadcafb7b825a90126d981fa152bc6 Mon Sep 17 00:00:00 2001 From: ue Date: Wed, 18 Dec 2019 22:01:07 +0300 Subject: [PATCH] revert back req nav --- .../application/container/applicationContainer.js | 14 +++++--------- src/screens/application/index.js | 2 -- .../application/screen/applicationScreen.js | 7 ------- 3 files changed, 5 insertions(+), 18 deletions(-) diff --git a/src/screens/application/container/applicationContainer.js b/src/screens/application/container/applicationContainer.js index 9db919997..5f65c7d3c 100644 --- a/src/screens/application/container/applicationContainer.js +++ b/src/screens/application/container/applicationContainer.js @@ -92,7 +92,6 @@ class ApplicationContainer extends Component { isIos: Platform.OS !== 'android', isThemeReady: false, appState: AppState.currentState, - incomingNavigationRequest: null, }; } @@ -331,12 +330,10 @@ class ApplicationContainer extends Component { dispatch(updateUnreadActivityCount(result.unread)); }); if (!some(params, isEmpty)) { - this.setState({ - incomingNavigationRequest: { - routeName, - params, - key, - }, + navigate({ + routeName, + params, + key, }); } } @@ -623,7 +620,7 @@ class ApplicationContainer extends Component { children, isPinCodeRequire, } = this.props; - const { isRenderRequire, isReady, isThemeReady, incomingNavigationRequest } = this.state; + const { isRenderRequire, isReady, isThemeReady } = this.state; return ( children && @@ -636,7 +633,6 @@ class ApplicationContainer extends Component { isPinCodeRequire, isDarkTheme: _isDarkTheme, locale: selectedLanguage, - incomingNavigationRequest, }) ); } diff --git a/src/screens/application/index.js b/src/screens/application/index.js index 0e6b26fff..23b0493da 100644 --- a/src/screens/application/index.js +++ b/src/screens/application/index.js @@ -29,7 +29,6 @@ const Application = () => { isRenderRequire, isThemeReady, isPinCodeRequire, - incomingNavigationRequest, }) => { if (showAnimation || !isReady || !isRenderRequire || !isThemeReady) { return ; @@ -46,7 +45,6 @@ const Application = () => { { const { dispatch } = this.props;