Able to change selections in to and from fields of send and send token.

2 files changed, 19 insertions, 2 deletions

diff --git a/ui/app/components/send-token/index.js b/ui/app/components/send-token/index.js
index dd8ca6b9d..cc77c2699 100644
--- a/ui/app/components/send-token/index.js
+++ b/ui/app/components/send-token/index.js
@@ -181,6 +181,7 @@ SendTokenScreen.prototype.renderToAddressInput = function () {
         to: e.target.value,
         errors: {},
       }),
+      onFocus: () => to && this.setState({ to: '' }),
     }),
     h('datalist#addresses', [
       // Corresponds to the addresses owned.
diff --git a/ui/app/send.js b/ui/app/send.js
index 16fe470be..8fab8a384 100644
--- a/ui/app/send.js
+++ b/ui/app/send.js
@@ -123,7 +123,15 @@ SendTransactionScreen.prototype.renderFromInput = function (from, identities) {
         })
       },
       onBlur: () => this.setErrorsFor('from'),
-      onFocus: () => this.clearErrorsFor('from'),
+      onFocus: () => {
+        this.clearErrorsFor('from'),
+        this.state.newTx.from && this.setState({
+          newTx: {
+            ...this.state.newTx,
+            from: '',
+          },
+        })
+      },
     }),
 
     h('datalist#accounts', [
@@ -160,7 +168,15 @@ SendTransactionScreen.prototype.renderToInput = function (to, identities, addres
         })
       },
       onBlur: () => this.setErrorsFor('to'),
-      onFocus: () => this.clearErrorsFor('to'),
+      onFocus: () => {
+        this.clearErrorsFor('to')
+        this.state.newTx.to && this.setState({
+          newTx: {
+            ...this.state.newTx,
+            to: '',
+          },
+        })
+      },
     }),
 
     h('datalist#addresses', [