1 files changed, 15 insertions, 10 deletions

diff --git a/ui/app/send.js b/ui/app/send.js
index 1442db8cc..52e56132c 100644
--- a/ui/app/send.js
+++ b/ui/app/send.js
@@ -21,6 +21,8 @@ function mapStateToProps(state) {
     warning: state.appState.warning,
   }
 
+  result.error = result.warning && result.warning.split('.')[0]
+
   result.account = result.accounts[result.address]
   result.identity = result.identities[result.address]
   result.balance = result.account ? numericBalance(result.account.balance) : null
@@ -130,9 +132,13 @@ SendTransactionScreen.prototype.render = function() {
         'Send Transaction',
       ]),
 
+      // error message
+      state.error && h('span.error.flex-center', state.error),
+
       // 'to' field
       h('section.flex-row.flex-center', [
-        h('input.address.large-input', {
+        h('input.large-input', {
+          name: 'address',
           placeholder: 'Recipient Address',
         })
       ]),
@@ -140,7 +146,8 @@ SendTransactionScreen.prototype.render = function() {
       // 'amount' and send button
       h('section.flex-row.flex-center', [
 
-        h('input.ether.large-input', {
+        h('input.large-input', {
+          name: 'amount',
           placeholder: 'Amount',
           type: 'number',
           style: {
@@ -174,7 +181,8 @@ SendTransactionScreen.prototype.render = function() {
 
       // 'data' field
       h('section.flex-row.flex-center', [
-        h('input.txData.large-input', {
+        h('input.large-input', {
+          name: 'txData',
           placeholder: '0x01234',
           style: {
             width: '100%',
@@ -183,8 +191,6 @@ SendTransactionScreen.prototype.render = function() {
         }),
       ]),
 
-      // state.warning ? h('span.error', state.warning.split('.')[0]) : null,
-
     ])
 
   )
@@ -201,11 +207,10 @@ SendTransactionScreen.prototype.back = function() {
 }
 
 SendTransactionScreen.prototype.onSubmit = function(event) {
-  var recipient = document.querySelector('input.address').value
+  var recipient = document.querySelector('input[name="address"]').value
 
-  var inputAmount = parseFloat(document.querySelector('input.ether').value)
-  var currency = document.querySelector('select.currency').value
-  var value = util.normalizeNumberToWei(inputAmount, currency)
+  var inputAmount = parseFloat(document.querySelector('input[name="amount"]').value)
+  var value = util.normalizeNumberToWei(inputAmount, 'ether')
 
   var balance = this.props.balance
 
@@ -227,7 +232,7 @@ SendTransactionScreen.prototype.onSubmit = function(event) {
     value: '0x' + value.toString(16),
   }
 
-  var txData = document.querySelector('textarea.txData').value
+  var txData = document.querySelector('input[name="txData"]').value
   if (txData) txParams.data = txData
 
   this.props.dispatch(actions.signTx(txParams))