h-be · Connoropolous · Aug 3, 2020 · Aug 3, 2020
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/reducer.js b/src/reducer.js
@@ -9,7 +9,7 @@ of how ACTIONS affect STATE
 import { combineReducers } from 'redux'
 
 import agents from './agents/reducer'
-import whoami from './who-am-i/reducer'
+import whoami, { hasFetchedForWhoami } from './who-am-i/reducer'
 import agentAddress from './agent-address/reducer'
 import projects from './projects/reducer'
 import goalForm from './goal-form/reducer'
@@ -34,6 +34,7 @@ export default combineReducers({
   whoami,
   agentAddress,
   ui: combineReducers({
+    hasFetchedForWhoami,
     edgeConnector,
     localPreferences,
     goalForm,

diff --git a/src/routes/App.js b/src/routes/App.js
@@ -30,6 +30,7 @@ function App(props) {
     projectName,
     agentAddress,
     whoami, // .entry and .address
+    hasFetchedForWhoami,
     updateWhoami,
     navigationPreference,
     setNavigationPreference,
@@ -86,7 +87,7 @@ function App(props) {
           setShowPreferences={setShowPreferences}
         />
         {!agentAddress && <LoadingScreen />}
-        {agentAddress && !whoami && <Redirect to='/intro' />}
+        {agentAddress && hasFetchedForWhoami && !whoami && <Redirect to='/intro' />}
         {agentAddress && whoami && <Footer />}
      </Router>
     </ErrorBoundaryScreen>
@@ -123,6 +124,7 @@ function mapDispatchToProps(dispatch) {
 function mapStateToProps(state) {
   const {
     ui: {
+      hasFetchedForWhoami,
       activeProject,
       activeEntryPoints,
       localPreferences: { navigation },
@@ -148,6 +150,7 @@ function mapStateToProps(state) {
     activeEntryPoints: activeEntryPointsObjects,
     projectName,
     whoami: state.whoami,
+    hasFetchedForWhoami,
     agentAddress: state.agentAddress,
     navigationPreference: navigation,
   }

diff --git a/src/who-am-i/reducer.js b/src/who-am-i/reducer.js
@@ -22,3 +22,13 @@ export default function(state = defaultState, action) {
       return state
   }
 }
+
+export function hasFetchedForWhoami(state = false, action) {
+  const { type } = action
+  switch (type) {
+    case whoami.success().type:
+      return true
+    default:
+      return state
+  }
+}