1 files changed, 100 insertions, 33 deletions

diff --git a/ui/app/reducers/app.js b/ui/app/reducers/app.js
index 8558d6dca..3a4fb536d 100644
--- a/ui/app/reducers/app.js
+++ b/ui/app/reducers/app.js
@@ -14,6 +14,7 @@ function reduceApp (state, action) {
   if (selectedAddress) {
     name = 'accountDetail'
   }
+
   if (hasUnconfActions) {
     log.debug('pending txs detected, defaulting to conf-tx view.')
     name = 'confTx'
@@ -36,6 +37,17 @@ function reduceApp (state, action) {
   var appState = extend({
     shouldClose: false,
     menuOpen: false,
+    modal: {
+      open: false,
+      modalState: {
+        name: null,
+      },
+      previousModalState: {
+        name: null,
+      },
+    },
+    sidebarOpen: false,
+    networkDropdownOpen: false,
     currentView: seedWords ? seedConfView : defaultView,
     accountDetail: {
       subview: 'transactions',
@@ -49,9 +61,50 @@ function reduceApp (state, action) {
   }, state.appState)
 
   switch (action.type) {
+    // dropdown methods
+    case actions.NETWORK_DROPDOWN_OPEN:
+      return extend(appState, {
+        networkDropdownOpen: true,
+      })
 
-    // transition methods
+    case actions.NETWORK_DROPDOWN_CLOSE:
+      return extend(appState, {
+        networkDropdownOpen: false,
+      })
+
+    // sidebar methods
+    case actions.SIDEBAR_OPEN:
+      return extend(appState, {
+        sidebarOpen: true,
+      })
 
+    case actions.SIDEBAR_CLOSE:
+      return extend(appState, {
+        sidebarOpen: false,
+      })
+
+    // modal methods:
+    case actions.MODAL_OPEN:
+      return extend(appState, {
+        modal: Object.assign(
+          state.appState.modal,
+          { open: true },
+          { modalState: action.payload },
+          { previousModalState: appState.modal.modalState},
+        ),
+      })
+
+    case actions.MODAL_CLOSE:
+      return extend(appState, {
+        modal: Object.assign(
+          state.appState.modal,
+          { open: false },
+          { modalState: { name: null } },
+          { previousModalState: appState.modal.modalState},
+        ),
+      })
+
+    // transition methods
     case actions.TRANSITION_FORWARD:
       return extend(appState, {
         transForward: true,
@@ -134,7 +187,7 @@ function reduceApp (state, action) {
         transForward: true,
       })
 
-    case actions.CREATE_NEW_VAULT_IN_PROGRESS:
+  case actions.CREATE_NEW_VAULT_IN_PROGRESS:
       return extend(appState, {
         currentView: {
           name: 'createVault',
@@ -173,6 +226,16 @@ function reduceApp (state, action) {
         warning: null,
       })
 
+    case actions.SHOW_SEND_TOKEN_PAGE:
+      return extend(appState, {
+        currentView: {
+          name: 'sendToken',
+          context: appState.currentView.context,
+        },
+        transForward: true,
+        warning: null,
+      })
+
     case actions.SHOW_NEW_KEYCHAIN:
       return extend(appState, {
         currentView: {
@@ -308,7 +371,7 @@ function reduceApp (state, action) {
       return extend(appState, {
         currentView: {
           name: 'confTx',
-          context: 0,
+          context: action.id ? indexForPending(state, action.id) : indexForLastPending(state),
         },
         transForward: action.transForward,
         warning: null,
@@ -328,36 +391,36 @@ function reduceApp (state, action) {
 
     case actions.COMPLETED_TX:
       log.debug('reducing COMPLETED_TX for tx ' + action.value)
-      const otherUnconfActions = getUnconfActionList(state)
-      .filter(tx => tx.id !== action.value)
-      const hasOtherUnconfActions = otherUnconfActions.length > 0
-
-      if (hasOtherUnconfActions) {
-        log.debug('reducer detected txs - rendering confTx view')
-        return extend(appState, {
-          transForward: false,
-          currentView: {
-            name: 'confTx',
-            context: 0,
-          },
-          warning: null,
-        })
-      } else {
-        log.debug('attempting to close popup')
-        return extend(appState, {
-          // indicate notification should close
-          shouldClose: true,
-          transForward: false,
-          warning: null,
-          currentView: {
-            name: 'accountDetail',
-            context: state.metamask.selectedAddress,
-          },
-          accountDetail: {
-            subview: 'transactions',
-          },
-        })
-      }
+      // const otherUnconfActions = getUnconfActionList(state)
+      // .filter(tx => tx.id !== action.value)
+      // const hasOtherUnconfActions = otherUnconfActions.length > 0
+
+      // if (hasOtherUnconfActions) {
+      //   log.debug('reducer detected txs - rendering confTx view')
+      //   return extend(appState, {
+      //     transForward: false,
+      //     currentView: {
+      //       name: 'confTx',
+      //       context: 0,
+      //     },
+      //     warning: null,
+      //   })
+      // } else {
+      log.debug('attempting to close popup')
+      return extend(appState, {
+        // indicate notification should close
+        shouldClose: true,
+        transForward: false,
+        warning: null,
+        currentView: {
+          name: 'accountDetail',
+          context: state.metamask.selectedAddress,
+        },
+        accountDetail: {
+          subview: 'transactions',
+        },
+      })
+      // }
 
     case actions.NEXT_TX:
       return extend(appState, {
@@ -597,3 +660,7 @@ function indexForPending (state, txId) {
   const index = unconfTxList.indexOf(match)
   return index
 }
+
+function indexForLastPending (state) {
+  return getUnconfActionList(state).length
+}