1 files changed, 25 insertions, 2 deletions
diff --git a/ui/app/reducers/app.js b/ui/app/reducers/app.js
index 582583185..d3d5ad638 100644
--- a/ui/app/reducers/app.js
+++ b/ui/app/reducers/app.js
@@ -1,14 +1,18 @@
 const extend = require('xtend')
 const actions = require('../actions')
+const valuesFor = require('../util').valuesFor
 
 module.exports = reduceApp
 
 function reduceApp(state, action) {
 
   // clone and defaults
+  var accounts = valuesFor(state.metamask.accounts)
+  var account = accounts.length ? valuesFor(state.metamask.accounts)[0].address : null
   var defaultView = {
-    name: 'accounts',
+    name: 'accountDetail',
     detailView: null,
+    context: account,
   }
 
   // confirm seed words
@@ -56,6 +60,7 @@ function reduceApp(state, action) {
     return extend(appState, {
       currentView: {
         name: 'config',
+        context: appState.currentView.context,
       },
       transForward: true,
     })
@@ -64,6 +69,7 @@ function reduceApp(state, action) {
     return extend(appState, {
       currentView: {
         name: 'info',
+        context: appState.currentView.context,
       },
       transForward: true,
     })
@@ -120,11 +126,28 @@ function reduceApp(state, action) {
       activeAddress: action.value,
     })
 
+  case actions.GO_HOME:
+    return extend(appState, {
+      currentView: {
+        name: 'accountDetail',
+        context: appState.currentView.context,
+      },
+      accountDetail: {
+        accountExport: 'none',
+        privateKey: '',
+      },
+      transForward: false,
+    })
+
+
   case actions.SHOW_ACCOUNT_DETAIL:
+    var account = action.value || valuesFor(state.metamask.accounts)[0].address
+
     return extend(appState, {
+      isLoading: account ? false : true,
       currentView: {
         name: 'accountDetail',
-        context: action.value,
+        context: account,
       },
       accountDetail: {
         accountExport: 'none',