From 0bfa10e501f47197996002447a216f278d7e6eb5 Mon Sep 17 00:00:00 2001
From: Daijiro Wachi <daijiro.wachi@gmail.com>
Date: Mon, 30 Oct 2017 20:04:44 +0100
Subject: Remove warning message when show import page

Fixes: https://github.com/MetaMask/metamask-extension/issues/1192
---
 ui/app/reducers/app.js | 1 +
 1 file changed, 1 insertion(+)

(limited to 'ui/app/reducers')

diff --git a/ui/app/reducers/app.js b/ui/app/reducers/app.js
index 6f08c6dc4..8558d6dca 100644
--- a/ui/app/reducers/app.js
+++ b/ui/app/reducers/app.js
@@ -122,6 +122,7 @@ function reduceApp (state, action) {
           name: 'import-menu',
         },
         transForward: true,
+        warning: null,
       })
 
     case actions.SHOW_INFO_PAGE:
-- 
cgit 


From 67bdfe87e31e695f8c4beab1659a3a4b764ccf24 Mon Sep 17 00:00:00 2001
From: Dan <danjm.com@gmail.com>
Date: Mon, 30 Oct 2017 15:18:50 -0230
Subject: Token balance in send state; validating sufficient tokens, validation
 updates on 'from' switching.

---
 ui/app/reducers/metamask.js | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'ui/app/reducers')

diff --git a/ui/app/reducers/metamask.js b/ui/app/reducers/metamask.js
index 50c9712ff..3b93a1625 100644
--- a/ui/app/reducers/metamask.js
+++ b/ui/app/reducers/metamask.js
@@ -27,6 +27,7 @@ function reduceMetamask (state, action) {
       gasLimit: null,
       gasPrice: null,
       gasTotal: null,
+      tokenBalance: null,
       from: '',
       to: '',
       amount: '0x0',
@@ -196,6 +197,14 @@ function reduceMetamask (state, action) {
         },
       })
 
+    case actions.UPDATE_SEND_TOKEN_BALANCE:
+      return extend(metamaskState, {
+        send: {
+          ...metamaskState.send,
+          tokenBalance: action.value,
+        },
+      })
+
     case actions.UPDATE_SEND_FROM:
       return extend(metamaskState, {
         send: {
-- 
cgit 


From 34ca7290c593d6fb27faa98a660c8c0bca7e1457 Mon Sep 17 00:00:00 2001
From: Dan <danjm.com@gmail.com>
Date: Wed, 8 Nov 2017 13:14:48 -0330
Subject: Allow editing of send ether.

---
 ui/app/reducers/metamask.js | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

(limited to 'ui/app/reducers')

diff --git a/ui/app/reducers/metamask.js b/ui/app/reducers/metamask.js
index 3b93a1625..bc0d0a4b3 100644
--- a/ui/app/reducers/metamask.js
+++ b/ui/app/reducers/metamask.js
@@ -33,6 +33,7 @@ function reduceMetamask (state, action) {
       amount: '0x0',
       memo: '',
       errors: {},
+      editingTransactionId: null,
     },
     coinOptions: {},
   }, state.metamask)
@@ -108,6 +109,14 @@ function reduceMetamask (state, action) {
       }
       return newState
 
+    case actions.EDIT_TX:
+      return extend(metamaskState, {
+        send: {
+          ...metamaskState.send,
+          editingTransactionId: action.value,
+        },
+      })
+
     case actions.SHOW_NEW_VAULT_SEED:
       return extend(metamaskState, {
         isUnlocked: true,
@@ -262,6 +271,20 @@ function reduceMetamask (state, action) {
         },
       })
 
+    case actions.UPDATE_TRANSACTION_PARAMS:
+      const { id, value } = action
+      let { selectedAddressTxList } = metamaskState
+      selectedAddressTxList = selectedAddressTxList.map(tx => {
+        if (tx.id === id) {
+          tx.txParams = value
+        }
+        return tx
+      })
+
+      return extend(metamaskState, {
+        selectedAddressTxList,
+      })
+
     case actions.PAIR_UPDATE:
       const { value: { marketinfo: pairMarketInfo } } = action
       return extend(metamaskState, {
-- 
cgit 


From 0a91671ff69957596abbcffb7d20c89f144d7a69 Mon Sep 17 00:00:00 2001
From: Dan <danjm.com@gmail.com>
Date: Wed, 8 Nov 2017 15:48:27 -0330
Subject: Fix lint errors.

---
 ui/app/reducers/metamask.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'ui/app/reducers')

diff --git a/ui/app/reducers/metamask.js b/ui/app/reducers/metamask.js
index bc0d0a4b3..56bf1fba6 100644
--- a/ui/app/reducers/metamask.js
+++ b/ui/app/reducers/metamask.js
@@ -150,9 +150,9 @@ function reduceMetamask (state, action) {
     case actions.SAVE_ACCOUNT_LABEL:
       const account = action.value.account
       const name = action.value.label
-      var id = {}
+      const id = {}
       id[account] = extend(metamaskState.identities[account], { name })
-      var identities = extend(metamaskState.identities, id)
+      const identities = extend(metamaskState.identities, id)
       return extend(metamaskState, { identities })
 
     case actions.SET_CURRENT_FIAT:
@@ -272,10 +272,10 @@ function reduceMetamask (state, action) {
       })
 
     case actions.UPDATE_TRANSACTION_PARAMS:
-      const { id, value } = action
+      const { id: txId, value } = action
       let { selectedAddressTxList } = metamaskState
       selectedAddressTxList = selectedAddressTxList.map(tx => {
-        if (tx.id === id) {
+        if (tx.id === txId) {
           tx.txParams = value
         }
         return tx
-- 
cgit 


From 9e3f921ba928a948c04b4156daa0a3f752ee2dde Mon Sep 17 00:00:00 2001
From: Dan <danjm.com@gmail.com>
Date: Fri, 10 Nov 2017 00:19:16 -0330
Subject: Create single action for updating all of send in redux state.

---
 ui/app/reducers/metamask.js | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'ui/app/reducers')

diff --git a/ui/app/reducers/metamask.js b/ui/app/reducers/metamask.js
index 56bf1fba6..83161320e 100644
--- a/ui/app/reducers/metamask.js
+++ b/ui/app/reducers/metamask.js
@@ -257,17 +257,27 @@ function reduceMetamask (state, action) {
         },
       })
 
+    case actions.UPDATE_SEND:
+      return extend(metamaskState, {
+        send: {
+          ...metamaskState.send,
+          ...action.value,
+        },
+      })
+
     case actions.CLEAR_SEND:
       return extend(metamaskState, {
         send: {
           gasLimit: null,
           gasPrice: null,
           gasTotal: null,
+          tokenBalance: null,
           from: '',
           to: '',
           amount: '0x0',
           memo: '',
           errors: {},
+          editingTransactionId: null,
         },
       })
 
-- 
cgit