Commit 037fa2f6 authored by Brian Hatchet's avatar Brian Hatchet 💬
Browse files

Merge branch 'fix/focusedurn-comment-notification' into 'release/3.12.0' 

Fix is not focusing comments/conversations

See merge request !428
parents b45d304d f7c17139

src/navigation/NavigationService.js

+9 −1
Original line number Diff line number Diff line
@@ -2,6 +2,14 @@ import { NavigationActions, StackActions, SwitchActions } from 'react-navigation 


let _navigator;



function getStateFrom(nav) {

  let state = nav.routes[nav.index];

  if (state.routes) {

    state = getStateFrom(state);

  }

  return state;

}



function setTopLevelNavigator(navigatorRef) {

  _navigator = navigatorRef;

}
@@ -11,7 +19,7 @@ function getState() { 
}



function getCurrentState() {

  return _navigator.state.nav.routes[_navigator.state.nav.index];

  return getStateFrom(_navigator.state.nav);

}



function navigate(routeName, params) {