From e6c4d63ccdaf93d8b74965d39661e80d774504d8 Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Tue, 3 May 2016 14:32:22 -0700
Subject: Add UI for Signing Messages

Calls to `eth.sign` are now transiently persisted in memory, and displayed in a chronological stack with pending transactions (which are still persisted to disk).

This allows the user a method to sign/cancel transactions even if they miss the Chrome notification.

Improved a lot of the view routing, to avoid cases where routes would show an empty account view, or transition to the accounts list when it shouldn't.

Broke the transaction approval view into a couple components so messages and transactions could have their own templates.
---
 ui/app/reducers/app.js | 27 ++++++++++++++++++++-------
 1 file changed, 20 insertions(+), 7 deletions(-)

(limited to 'ui/app/reducers/app.js')

diff --git a/ui/app/reducers/app.js b/ui/app/reducers/app.js
index 57cdccbac..fb03ffeee 100644
--- a/ui/app/reducers/app.js
+++ b/ui/app/reducers/app.js
@@ -1,6 +1,7 @@
 const extend = require('xtend')
 const actions = require('../actions')
 const valuesFor = require('../util').valuesFor
+const txHelper = require('../../lib/tx-helper')
 
 module.exports = reduceApp
 
@@ -127,10 +128,7 @@ function reduceApp(state, action) {
 
   case actions.GO_HOME:
     return extend(appState, {
-      currentView: {
-        name: 'accountDetail',
-        context: appState.currentView.context,
-      },
+      currentView: {},
       accountDetail: {
         accountExport: 'none',
         privateKey: '',
@@ -185,9 +183,24 @@ function reduceApp(state, action) {
       warning: null,
     })
 
+  case actions.SHOW_CONF_MSG_PAGE:
+    return extend(appState, {
+      currentView: {
+        name: 'confTx',
+        context: 0,
+      },
+      transForward: true,
+      warning: null,
+    })
+
   case actions.COMPLETED_TX:
-    var unconfTxs = Object.keys(state.metamask.unconfTxs).filter(tx => tx !== tx.id)
-    if (unconfTxs && unconfTxs.length > 0) {
+    var unconfTxs = state.metamask.unconfTxs
+    var unconfMsgs = state.metamask.unconfMsgs
+
+    var unconfTxList = txHelper(unconfTxs, unconfMsgs)
+    .filter(tx => tx !== tx.id)
+
+    if (unconfTxList && unconfTxList.length > 0) {
       return extend(appState, {
         transForward: false,
         currentView: {
@@ -202,7 +215,7 @@ function reduceApp(state, action) {
         warning: null,
         currentView: {
           name: 'accountDetail',
-          context: appState.currentView.context,
+          context: state.metamask.selectedAddress,
         },
       })
     }
-- 
cgit