fix(navigation): Fixes Redux navigation middleware being called twice (…

…#273 by @superp)
infinitered · May 21, 2019 · 2df24ef · 2df24ef
1 parent dd068c4
commit 2df24ef
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/boilerplate/App/Navigation/ReduxNavigation.js b/boilerplate/App/Navigation/ReduxNavigation.js
@@ -7,7 +7,7 @@ import {
 import { connect } from 'react-redux'
 import AppNavigation from './AppNavigation'
 
-createReactNavigationReduxMiddleware(
+export const appNavigatorMiddleware = createReactNavigationReduxMiddleware(
   'root',
   (state) => state.nav
 )

diff --git a/boilerplate/App/Redux/CreateStore.js b/boilerplate/App/Redux/CreateStore.js
@@ -2,7 +2,7 @@ import { createStore, applyMiddleware, compose } from 'redux'
 import Config from '../Config/DebugConfig'
 import createSagaMiddleware from 'redux-saga'
 import ScreenTracking from './ScreenTrackingMiddleware'
-import { createReactNavigationReduxMiddleware } from 'react-navigation-redux-helpers'
+import { appNavigatorMiddleware } from '../Navigation/ReduxNavigation'
 
 // creates the store
 export default (rootReducer, rootSaga) => {
@@ -12,11 +12,7 @@ export default (rootReducer, rootSaga) => {
   const enhancers = []
 
   /* ------------- Navigation Middleware ------------ */
-  const navigationMiddleware = createReactNavigationReduxMiddleware(
-    'root',
-    state => state.nav
-  )
-  middleware.push(navigationMiddleware)
+  middleware.push(appNavigatorMiddleware)
 
   /* ------------- Analytics Middleware ------------- */
   middleware.push(ScreenTracking)