Use this.state.routeStack if present

Author: jrichardlai

App/Root.js

@@ -33,7 +33,9 @@ function getEnvironmentState() {
 };
 
 function getDebugState() {
-  return { savedPath: DebugStore.get().currentRoutePath };
+  return {
+    debug: DebugStore.get()
+  };
 }
 
 var Root = React.createClass({
@@ -48,7 +50,10 @@ var Root = React.createClass({
   },
 
   onUserChange: function() {
-    this.setState(getUserState());
+    var state = getUserState();
+    // reset the route stack on user change.
+    state.routeStack = null;
+    this.setState(state);
   },
 
   onEnvChange: function() {
@@ -76,17 +81,27 @@ var Root = React.createClass({
     CurrentUserStore.removeChangeListener(this.onUserChange);
   },
 
-  getSavedPath: function() {
-    if (!this.state.environment)                { return null; }
-    if (!this.state.environment.data.simulator) { return null; }
+  getSavedCurrentRoutePath: function() {
+    if (!this.state.environment.data.simulator)      { return null; }
+    if (this.state.environment.data.name === 'test') { return null; }
+
+    return this.state.debug.currentRoutePath;
+  },
 
-    return this.state.savedPath;
+  getDefaultRouteStack: function() {
+    return Routes.parse(null, this.state.user.isLoggedIn(), true);
   },
 
   renderContent: function() {
     if (this.state.routeUnderTest) return null;
 
-    var routeStack = Routes.parse(this.getSavedPath(), this.state.user.isLoggedIn(), true);
+    var routeStack = this.state.routeStack;
+    if (!routeStack && this.getSavedCurrentRoutePath()) {
+      routeStack = Routes.parse(this.getSavedCurrentRoutePath(), this.state.user.isLoggedIn(), true);
+    }
+    if (!routeStack) {
+      routeStack = this.getDefaultRouteStack();
+    }
 
     if(this.state.user.isLoggedIn()) {
       return (
@@ -103,7 +118,7 @@ var Root = React.createClass({
 
   render: function() {
     // need to fetch current user and environment before launching
-    if (!this.state.user || !this.state.environment) {
+    if (!this.state.user || !this.state.environment || !this.state.debug) {
       return(<Launch ref="current" />);
     }
     else if (this.state.environment.data.name === 'test') {

App/Stores/DebugStore.js

@@ -10,9 +10,10 @@ const EnvironmentManager = React.NativeModules.EnvironmentManager;
 const CHANGE_EVENT                 = 'change';
 const DEBUG_CURRENT_ROUTE_PATH_KEY = AppConstants.DEBUG_CURRENT_ROUTE_PATH_KEY;
 
-var _values = {};
+var _values = null;
 
 function setCurrentRoutePath(routePath) {
+  _values = _values || {};
   _values.currentRoutePath = routePath;
 }
 
@@ -50,7 +51,6 @@ Dispatcher.register(function(action) {
       if (action.routePath) {
         LocalKeyStore.setKey(DEBUG_CURRENT_ROUTE_PATH_KEY, action.routePath);
         setCurrentRoutePath(action.routePath);
-        SingletonStore.emitChange();
       }
       break;
     case AppConstants.LOGOUT_REQUESTED: