Merge branch 'NewUI-flat' into MM-57-use-gas-estimator

1 files changed, 8 insertions, 2 deletions

diff --git a/ui/app/send.js b/ui/app/send.js
index 033692910..8791e9124 100644
--- a/ui/app/send.js
+++ b/ui/app/send.js
@@ -130,7 +130,10 @@ SendTransactionScreen.prototype.renderFromInput = function (from, identities) {
         })
       },
       onBlur: () => this.setErrorsFor('from'),
-      onFocus: () => this.clearErrorsFor('from'),
+      onFocus: event => {
+        this.clearErrorsFor('from')
+        this.state.newTx.from && event.target.select()
+      },
     }),
 
     h('datalist#accounts', [
@@ -170,7 +173,10 @@ SendTransactionScreen.prototype.renderToInput = function (to, identities, addres
         this.setErrorsFor('to')
         this.estimateGasAndPrice()
       },
-      onFocus: () => this.clearErrorsFor('to'),
+      onFocus: event => {
+        this.clearErrorsFor('to')
+        this.state.newTx.to && event.target.select()
+      },
     }),
 
     h('datalist#addresses', [