From 294b16a275d35983eb9f0e720a84ef95e0fad186 Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Wed, 25 May 2016 16:28:07 -0700
Subject: Fix back button on pending tx screen

Fixes #208
---
 ui/app/app.js          | 14 +-------------
 ui/app/reducers/app.js | 23 ++++++++++++++++++++---
 2 files changed, 21 insertions(+), 16 deletions(-)

(limited to 'ui')

diff --git a/ui/app/app.js b/ui/app/app.js
index 73791ec13..7e7ca24ad 100644
--- a/ui/app/app.js
+++ b/ui/app/app.js
@@ -239,11 +239,7 @@ App.prototype.renderPrimary = function(){
       return h(CreateVaultScreen, {key: 'createVault'})
 
     default:
-      if (this.hasPendingTxs()) {
-        return h(ConfirmTxScreen, {key: 'confirm-tx'})
-      } else {
-        return h(AccountDetailScreen, {key: 'account-detail'})
-      }
+      return h(AccountDetailScreen, {key: 'account-detail'})
    }
 }
 
@@ -259,14 +255,6 @@ App.prototype.toggleMetamaskActive = function(){
   }
 }
 
-App.prototype.hasPendingTxs = function() {
-  var state = this.props
-  var unconfTxs = state.unconfTxs
-  var unconfMsgs = state.unconfMsgs
-  var unconfTxList = txHelper(unconfTxs, unconfMsgs)
-  return unconfTxList.length > 0
-}
-
 function onOffToggle(state){
   var buttonSize = '50px';
   var lockWidth = '20px';
diff --git a/ui/app/reducers/app.js b/ui/app/reducers/app.js
index a29a8f79c..92b44612d 100644
--- a/ui/app/reducers/app.js
+++ b/ui/app/reducers/app.js
@@ -9,8 +9,17 @@ function reduceApp(state, action) {
 
   // clone and defaults
   const selectedAccount = state.metamask.selectedAccount
+  const pendingTxs = hasPendingTxs(state)
+  let name = 'accounts'
+  if (selectedAccount) {
+    defaultView = 'accountDetail'
+  }
+  if (pendingTxs) {
+    defaultView = 'confTx'
+  }
+
   var defaultView = {
-    name: selectedAccount ? 'accountDetail' : 'accounts',
+    name,
     detailView: null,
     context: selectedAccount,
   }
@@ -122,7 +131,6 @@ function reduceApp(state, action) {
 
   case actions.UNLOCK_METAMASK:
     return extend(appState, {
-      currentView: {},
       detailView: {},
       transForward: true,
       isLoading: false,
@@ -145,7 +153,9 @@ function reduceApp(state, action) {
 
   case actions.GO_HOME:
     return extend(appState, {
-      currentView: {},
+    currentView: extend(appState.currentView, {
+        name: 'accountDetail',
+      }),
       accountDetail: {
         subview: 'transactions',
         accountExport: 'none',
@@ -349,3 +359,10 @@ function reduceApp(state, action) {
 
   }
 }
+
+function hasPendingTxs (state) {
+  var unconfTxs = state.metamask.unconfTxs
+  var unconfMsgs = state.metamask.unconfMsgs
+  var unconfTxList = txHelper(unconfTxs, unconfMsgs)
+  return unconfTxList.length > 0
+}
-- 
cgit v1.2.3