Use eth-method-registry to get method data

app/_locales/en/messages.json

@@ -286,6 +286,9 @@
   "enterPasswordContinue": {
     "message": "Enter password to continue"
   },
+  "parameters": {
+    "message": "Parameters"
+  },
   "passwordNotLongEnough": {
     "message": "Password not long enough"
   },

app/scripts/controllers/transactions/index.js

@@ -157,6 +157,7 @@ class TransactionController extends EventEmitter {
     // construct txMeta
     let txMeta = this.txStateManager.generateTxMeta({ txParams: normalizedTxParams })
     this.addTx(txMeta)
+    this.emit('newUnapprovedTx', txMeta)
 
     try {
       // check whether recipient account is blacklisted
@@ -171,7 +172,6 @@ class TransactionController extends EventEmitter {
     txMeta.loadingDefaults = false
     // save txMeta
     this.txStateManager.updateTx(txMeta)
-    this.emit('newUnapprovedTx', txMeta)
 
     return txMeta
   }

package.json

@@ -97,6 +97,7 @@
     "eth-hd-keyring": "^1.2.1",
     "eth-json-rpc-filters": "^1.2.6",
     "eth-json-rpc-infura": "^3.0.0",
+    "eth-method-registry": "^1.0.0",
     "eth-phishing-detect": "^1.1.4",
     "eth-query": "^2.1.2",
     "eth-sig-util": "^1.4.2",

ui/app/components/input-number.js

@@ -2,8 +2,10 @@ const Component = require('react').Component
 const h = require('react-hyperscript')
 const inherits = require('util').inherits
 const {
+  addCurrencies,
   conversionGTE,
   conversionLTE,
+  subtractCurrencies,
 } = require('../conversion-util')
 
 module.exports = InputNumber
@@ -49,11 +51,7 @@ InputNumber.prototype.setValue = function (newValue) {
 }
 
 InputNumber.prototype.render = function () {
-<<<<<<< HEAD
   const { unitLabel, step = 1, placeholder, value } = this.props
-=======
-  const { unitLabel, step = 1, placeholder, value = 0, min = -1, max = Infinity } = this.props
->>>>>>> Refactor and redesign confirm transaction views
 
   return h('div.customize-gas-input-wrapper', {}, [
     h('input', {
@@ -69,19 +67,11 @@ InputNumber.prototype.render = function () {
     h('span.gas-tooltip-input-detail', {}, [unitLabel]),
     h('div.gas-tooltip-input-arrows', {}, [
       h('i.fa.fa-angle-up', {
-<<<<<<< HEAD
         onClick: () => this.setValue(addCurrencies(value, step, { toNumericBase: 'dec' })),
       }),
       h('i.fa.fa-angle-down', {
         style: { cursor: 'pointer' },
         onClick: () => this.setValue(subtractCurrencies(value, step, { toNumericBase: 'dec' })),
-=======
-        onClick: () => this.setValue(Math.min(+value + step, max)),
-      }),
-      h('i.fa.fa-angle-down', {
-        style: { cursor: 'pointer' },
-        onClick: () => this.setValue(Math.max(+value - step, min)),
->>>>>>> Refactor and redesign confirm transaction views
       }),
     ]),
   ])