From 7a3b3e0f8a7a28d20980a9f839490138a562ee29 Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Tue, 16 May 2017 10:27:41 -0700
Subject: [PATCH 01/17] Rename tx manager to tx controller

---
 .../transactions.js}                          |   0
 app/scripts/metamask-controller.js            |  32 +++---
 ...-manager-test.js => tx-controller-test.js} | 108 +++++++++---------
 3 files changed, 70 insertions(+), 70 deletions(-)
 rename app/scripts/{transaction-manager.js => controllers/transactions.js} (100%)
 rename test/unit/{tx-manager-test.js => tx-controller-test.js} (67%)

diff --git a/app/scripts/transaction-manager.js b/app/scripts/controllers/transactions.js
similarity index 100%
rename from app/scripts/transaction-manager.js
rename to app/scripts/controllers/transactions.js
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index 175602ec1..2406bda0d 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -17,7 +17,7 @@ const ShapeShiftController = require('./controllers/shapeshift')
 const AddressBookController = require('./controllers/address-book')
 const MessageManager = require('./lib/message-manager')
 const PersonalMessageManager = require('./lib/personal-message-manager')
-const TxManager = require('./transaction-manager')
+const TransactionController = require('./controllers/transactions')
 const ConfigManager = require('./lib/config-manager')
 const autoFaucet = require('./lib/auto-faucet')
 const nodeify = require('./lib/nodeify')
@@ -90,8 +90,8 @@ module.exports = class MetamaskController extends EventEmitter {
     }, this.keyringController)
 
     // tx mgmt
-    this.txManager = new TxManager({
-      initState: initState.TransactionManager,
+    this.txController = new TransactionController({
+      initState: initState.TransactionController,
       networkStore: this.networkStore,
       preferencesStore: this.preferencesController.store,
       txHistoryLimit: 40,
@@ -119,8 +119,8 @@ module.exports = class MetamaskController extends EventEmitter {
     this.publicConfigStore = this.initPublicConfigStore()
 
     // manual disk state subscriptions
-    this.txManager.store.subscribe((state) => {
-      this.store.updateState({ TransactionManager: state })
+    this.txController.store.subscribe((state) => {
+      this.store.updateState({ TransactionController: state })
     })
     this.keyringController.store.subscribe((state) => {
       this.store.updateState({ KeyringController: state })
@@ -144,7 +144,7 @@ module.exports = class MetamaskController extends EventEmitter {
     // manual mem state subscriptions
     this.networkStore.subscribe(this.sendUpdate.bind(this))
     this.ethStore.subscribe(this.sendUpdate.bind(this))
-    this.txManager.memStore.subscribe(this.sendUpdate.bind(this))
+    this.txController.memStore.subscribe(this.sendUpdate.bind(this))
     this.messageManager.memStore.subscribe(this.sendUpdate.bind(this))
     this.personalMessageManager.memStore.subscribe(this.sendUpdate.bind(this))
     this.keyringController.memStore.subscribe(this.sendUpdate.bind(this))
@@ -223,7 +223,7 @@ module.exports = class MetamaskController extends EventEmitter {
       },
       this.networkStore.getState(),
       this.ethStore.getState(),
-      this.txManager.memStore.getState(),
+      this.txController.memStore.getState(),
       this.messageManager.memStore.getState(),
       this.personalMessageManager.memStore.getState(),
       this.keyringController.memStore.getState(),
@@ -248,7 +248,7 @@ module.exports = class MetamaskController extends EventEmitter {
   getApi () {
     const keyringController = this.keyringController
     const preferencesController = this.preferencesController
-    const txManager = this.txManager
+    const txController = this.txController
     const noticeController = this.noticeController
     const addressBookController = this.addressBookController
 
@@ -289,9 +289,9 @@ module.exports = class MetamaskController extends EventEmitter {
       saveAccountLabel: nodeify(keyringController.saveAccountLabel).bind(keyringController),
       exportAccount: nodeify(keyringController.exportAccount).bind(keyringController),
 
-      // txManager
-      approveTransaction: txManager.approveTransaction.bind(txManager),
-      cancelTransaction: txManager.cancelTransaction.bind(txManager),
+      // txController
+      approveTransaction: txController.approveTransaction.bind(txController),
+      cancelTransaction: txController.cancelTransaction.bind(txController),
       updateAndApproveTransaction: this.updateAndApproveTx.bind(this),
 
       // messageManager
@@ -421,12 +421,12 @@ module.exports = class MetamaskController extends EventEmitter {
   newUnapprovedTransaction (txParams, cb) {
     log.debug(`MetaMaskController newUnapprovedTransaction ${JSON.stringify(txParams)}`)
     const self = this
-    self.txManager.addUnapprovedTransaction(txParams, (err, txMeta) => {
+    self.txController.addUnapprovedTransaction(txParams, (err, txMeta) => {
       if (err) return cb(err)
       self.sendUpdate()
       self.opts.showUnapprovedTx(txMeta)
       // listen for tx completion (success, fail)
-      self.txManager.once(`${txMeta.id}:finished`, (completedTx) => {
+      self.txController.once(`${txMeta.id}:finished`, (completedTx) => {
         switch (completedTx.status) {
           case 'submitted':
             return cb(null, completedTx.hash)
@@ -477,9 +477,9 @@ module.exports = class MetamaskController extends EventEmitter {
 
   updateAndApproveTx (txMeta, cb) {
     log.debug(`MetaMaskController - updateAndApproveTx: ${JSON.stringify(txMeta)}`)
-    const txManager = this.txManager
-    txManager.updateTx(txMeta)
-    txManager.approveTransaction(txMeta.id, cb)
+    const txController = this.txController
+    txController.updateTx(txMeta)
+    txController.approveTransaction(txMeta.id, cb)
   }
 
   signMessage (msgParams, cb) {
diff --git a/test/unit/tx-manager-test.js b/test/unit/tx-controller-test.js
similarity index 67%
rename from test/unit/tx-manager-test.js
rename to test/unit/tx-controller-test.js
index b5d148723..d0b32ff41 100644
--- a/test/unit/tx-manager-test.js
+++ b/test/unit/tx-controller-test.js
@@ -3,17 +3,17 @@ const EventEmitter = require('events')
 const ethUtil = require('ethereumjs-util')
 const EthTx = require('ethereumjs-tx')
 const ObservableStore = require('obs-store')
-const TransactionManager = require('../../app/scripts/transaction-manager')
+const TransactionController = require('../../app/scripts/controllers/transactions')
 const noop = () => true
 const currentNetworkId = 42
 const otherNetworkId = 36
 const privKey = new Buffer('8718b9618a37d1fc78c436511fc6df3c8258d3250635bba617f33003270ec03e', 'hex')
 
 describe('Transaction Manager', function () {
-  let txManager
+  let txController
 
   beforeEach(function () {
-    txManager = new TransactionManager({
+    txController = new TransactionController({
       networkStore: new ObservableStore({ network: currentNetworkId }),
       txHistoryLimit: 10,
       blockTracker: new EventEmitter(),
@@ -29,7 +29,7 @@ describe('Transaction Manager', function () {
       var sample = {
         value: '0x01',
       }
-      txManager.txProviderUtils.validateTxParams(sample, (err) => {
+      txController.txProviderUtils.validateTxParams(sample, (err) => {
         assert.equal(err, null, 'no error')
       })
     })
@@ -38,7 +38,7 @@ describe('Transaction Manager', function () {
       var sample = {
         value: '-0x01',
       }
-      txManager.txProviderUtils.validateTxParams(sample, (err) => {
+      txController.txProviderUtils.validateTxParams(sample, (err) => {
         assert.ok(err, 'error')
       })
     })
@@ -46,7 +46,7 @@ describe('Transaction Manager', function () {
 
   describe('#getTxList', function () {
     it('when new should return empty array', function () {
-      var result = txManager.getTxList()
+      var result = txController.getTxList()
       assert.ok(Array.isArray(result))
       assert.equal(result.length, 0)
     })
@@ -58,8 +58,8 @@ describe('Transaction Manager', function () {
   describe('#addTx', function () {
     it('adds a tx returned in getTxList', function () {
       var tx = { id: 1, status: 'confirmed', metamaskNetworkId: currentNetworkId, txParams: {} }
-      txManager.addTx(tx, noop)
-      var result = txManager.getTxList()
+      txController.addTx(tx, noop)
+      var result = txController.getTxList()
       assert.ok(Array.isArray(result))
       assert.equal(result.length, 1)
       assert.equal(result[0].id, 1)
@@ -68,45 +68,45 @@ describe('Transaction Manager', function () {
     it('does not override txs from other networks', function () {
       var tx = { id: 1, status: 'confirmed', metamaskNetworkId: currentNetworkId, txParams: {} }
       var tx2 = { id: 2, status: 'confirmed', metamaskNetworkId: otherNetworkId, txParams: {} }
-      txManager.addTx(tx, noop)
-      txManager.addTx(tx2, noop)
-      var result = txManager.getFullTxList()
-      var result2 = txManager.getTxList()
+      txController.addTx(tx, noop)
+      txController.addTx(tx2, noop)
+      var result = txController.getFullTxList()
+      var result2 = txController.getTxList()
       assert.equal(result.length, 2, 'txs were deleted')
       assert.equal(result2.length, 1, 'incorrect number of txs on network.')
     })
 
     it('cuts off early txs beyond a limit', function () {
-      const limit = txManager.txHistoryLimit
+      const limit = txController.txHistoryLimit
       for (let i = 0; i < limit + 1; i++) {
         const tx = { id: i, time: new Date(), status: 'confirmed', metamaskNetworkId: currentNetworkId, txParams: {} }
-        txManager.addTx(tx, noop)
+        txController.addTx(tx, noop)
       }
-      var result = txManager.getTxList()
+      var result = txController.getTxList()
       assert.equal(result.length, limit, `limit of ${limit} txs enforced`)
       assert.equal(result[0].id, 1, 'early txs truncted')
     })
 
     it('cuts off early txs beyond a limit whether or not it is confirmed or rejected', function () {
-      const limit = txManager.txHistoryLimit
+      const limit = txController.txHistoryLimit
       for (let i = 0; i < limit + 1; i++) {
         const tx = { id: i, time: new Date(), status: 'rejected', metamaskNetworkId: currentNetworkId, txParams: {} }
-        txManager.addTx(tx, noop)
+        txController.addTx(tx, noop)
       }
-      var result = txManager.getTxList()
+      var result = txController.getTxList()
       assert.equal(result.length, limit, `limit of ${limit} txs enforced`)
       assert.equal(result[0].id, 1, 'early txs truncted')
     })
 
     it('cuts off early txs beyond a limit but does not cut unapproved txs', function () {
       var unconfirmedTx = { id: 0, time: new Date(), status: 'unapproved', metamaskNetworkId: currentNetworkId, txParams: {} }
-      txManager.addTx(unconfirmedTx, noop)
-      const limit = txManager.txHistoryLimit
+      txController.addTx(unconfirmedTx, noop)
+      const limit = txController.txHistoryLimit
       for (let i = 1; i < limit + 1; i++) {
         const tx = { id: i, time: new Date(), status: 'confirmed', metamaskNetworkId: currentNetworkId, txParams: {} }
-        txManager.addTx(tx, noop)
+        txController.addTx(tx, noop)
       }
-      var result = txManager.getTxList()
+      var result = txController.getTxList()
       assert.equal(result.length, limit, `limit of ${limit} txs enforced`)
       assert.equal(result[0].id, 0, 'first tx should still be there')
       assert.equal(result[0].status, 'unapproved', 'first tx should be unapproved')
@@ -117,9 +117,9 @@ describe('Transaction Manager', function () {
   describe('#setTxStatusSigned', function () {
     it('sets the tx status to signed', function () {
       var tx = { id: 1, status: 'unapproved', metamaskNetworkId: currentNetworkId, txParams: {} }
-      txManager.addTx(tx, noop)
-      txManager.setTxStatusSigned(1)
-      var result = txManager.getTxList()
+      txController.addTx(tx, noop)
+      txController.setTxStatusSigned(1)
+      var result = txController.getTxList()
       assert.ok(Array.isArray(result))
       assert.equal(result.length, 1)
       assert.equal(result[0].status, 'signed')
@@ -132,18 +132,18 @@ describe('Transaction Manager', function () {
         assert(true, 'event listener has been triggered and noop executed')
         done()
       }
-      txManager.addTx(tx)
-      txManager.on('1:signed', noop)
-      txManager.setTxStatusSigned(1)
+      txController.addTx(tx)
+      txController.on('1:signed', noop)
+      txController.setTxStatusSigned(1)
     })
   })
 
   describe('#setTxStatusRejected', function () {
     it('sets the tx status to rejected', function () {
       var tx = { id: 1, status: 'unapproved', metamaskNetworkId: currentNetworkId, txParams: {} }
-      txManager.addTx(tx)
-      txManager.setTxStatusRejected(1)
-      var result = txManager.getTxList()
+      txController.addTx(tx)
+      txController.setTxStatusRejected(1)
+      var result = txController.getTxList()
       assert.ok(Array.isArray(result))
       assert.equal(result.length, 1)
       assert.equal(result[0].status, 'rejected')
@@ -152,31 +152,31 @@ describe('Transaction Manager', function () {
     it('should emit a rejected event to signal the exciton of callback', (done) => {
       this.timeout(10000)
       var tx = { id: 1, status: 'unapproved', metamaskNetworkId: currentNetworkId, txParams: {} }
-      txManager.addTx(tx)
+      txController.addTx(tx)
       const noop = function (err, txId) {
         assert(true, 'event listener has been triggered and noop executed')
         done()
       }
-      txManager.on('1:rejected', noop)
-      txManager.setTxStatusRejected(1)
+      txController.on('1:rejected', noop)
+      txController.setTxStatusRejected(1)
     })
   })
 
   describe('#updateTx', function () {
     it('replaces the tx with the same id', function () {
-      txManager.addTx({ id: '1', status: 'unapproved', metamaskNetworkId: currentNetworkId, txParams: {} }, noop)
-      txManager.addTx({ id: '2', status: 'confirmed', metamaskNetworkId: currentNetworkId, txParams: {} }, noop)
-      txManager.updateTx({ id: '1', status: 'blah', hash: 'foo', metamaskNetworkId: currentNetworkId, txParams: {} })
-      var result = txManager.getTx('1')
+      txController.addTx({ id: '1', status: 'unapproved', metamaskNetworkId: currentNetworkId, txParams: {} }, noop)
+      txController.addTx({ id: '2', status: 'confirmed', metamaskNetworkId: currentNetworkId, txParams: {} }, noop)
+      txController.updateTx({ id: '1', status: 'blah', hash: 'foo', metamaskNetworkId: currentNetworkId, txParams: {} })
+      var result = txController.getTx('1')
       assert.equal(result.hash, 'foo')
     })
   })
 
   describe('#getUnapprovedTxList', function () {
     it('returns unapproved txs in a hash', function () {
-      txManager.addTx({ id: '1', status: 'unapproved', metamaskNetworkId: currentNetworkId, txParams: {} }, noop)
-      txManager.addTx({ id: '2', status: 'confirmed', metamaskNetworkId: currentNetworkId, txParams: {} }, noop)
-      const result = txManager.getUnapprovedTxList()
+      txController.addTx({ id: '1', status: 'unapproved', metamaskNetworkId: currentNetworkId, txParams: {} }, noop)
+      txController.addTx({ id: '2', status: 'confirmed', metamaskNetworkId: currentNetworkId, txParams: {} }, noop)
+      const result = txController.getUnapprovedTxList()
       assert.equal(typeof result, 'object')
       assert.equal(result['1'].status, 'unapproved')
       assert.equal(result['2'], undefined)
@@ -185,10 +185,10 @@ describe('Transaction Manager', function () {
 
   describe('#getTx', function () {
     it('returns a tx with the requested id', function () {
-      txManager.addTx({ id: '1', status: 'unapproved', metamaskNetworkId: currentNetworkId, txParams: {} }, noop)
-      txManager.addTx({ id: '2', status: 'confirmed', metamaskNetworkId: currentNetworkId, txParams: {} }, noop)
-      assert.equal(txManager.getTx('1').status, 'unapproved')
-      assert.equal(txManager.getTx('2').status, 'confirmed')
+      txController.addTx({ id: '1', status: 'unapproved', metamaskNetworkId: currentNetworkId, txParams: {} }, noop)
+      txController.addTx({ id: '2', status: 'confirmed', metamaskNetworkId: currentNetworkId, txParams: {} }, noop)
+      assert.equal(txController.getTx('1').status, 'unapproved')
+      assert.equal(txController.getTx('2').status, 'confirmed')
     })
   })
 
@@ -206,28 +206,28 @@ describe('Transaction Manager', function () {
         { id: 8, status: 'confirmed', txParams: { from: '0xbb', to: '0xaa' }, metamaskNetworkId: currentNetworkId },
         { id: 9, status: 'confirmed', txParams: { from: '0xbb', to: '0xaa' }, metamaskNetworkId: currentNetworkId },
       ]
-      txMetas.forEach((txMeta) => txManager.addTx(txMeta, noop))
+      txMetas.forEach((txMeta) => txController.addTx(txMeta, noop))
       let filterParams
 
       filterParams = { status: 'unapproved', from: '0xaa' }
-      assert.equal(txManager.getFilteredTxList(filterParams).length, 3, `getFilteredTxList - ${JSON.stringify(filterParams)}`)
+      assert.equal(txController.getFilteredTxList(filterParams).length, 3, `getFilteredTxList - ${JSON.stringify(filterParams)}`)
       filterParams = { status: 'unapproved', to: '0xaa' }
-      assert.equal(txManager.getFilteredTxList(filterParams).length, 2, `getFilteredTxList - ${JSON.stringify(filterParams)}`)
+      assert.equal(txController.getFilteredTxList(filterParams).length, 2, `getFilteredTxList - ${JSON.stringify(filterParams)}`)
       filterParams = { status: 'confirmed', from: '0xbb' }
-      assert.equal(txManager.getFilteredTxList(filterParams).length, 3, `getFilteredTxList - ${JSON.stringify(filterParams)}`)
+      assert.equal(txController.getFilteredTxList(filterParams).length, 3, `getFilteredTxList - ${JSON.stringify(filterParams)}`)
       filterParams = { status: 'confirmed' }
-      assert.equal(txManager.getFilteredTxList(filterParams).length, 5, `getFilteredTxList - ${JSON.stringify(filterParams)}`)
+      assert.equal(txController.getFilteredTxList(filterParams).length, 5, `getFilteredTxList - ${JSON.stringify(filterParams)}`)
       filterParams = { from: '0xaa' }
-      assert.equal(txManager.getFilteredTxList(filterParams).length, 5, `getFilteredTxList - ${JSON.stringify(filterParams)}`)
+      assert.equal(txController.getFilteredTxList(filterParams).length, 5, `getFilteredTxList - ${JSON.stringify(filterParams)}`)
       filterParams = { to: '0xaa' }
-      assert.equal(txManager.getFilteredTxList(filterParams).length, 5, `getFilteredTxList - ${JSON.stringify(filterParams)}`)
+      assert.equal(txController.getFilteredTxList(filterParams).length, 5, `getFilteredTxList - ${JSON.stringify(filterParams)}`)
     })
   })
 
   describe('#sign replay-protected tx', function () {
     it('prepares a tx with the chainId set', function () {
-      txManager.addTx({ id: '1', status: 'unapproved', metamaskNetworkId: currentNetworkId, txParams: {} }, noop)
-      txManager.signTransaction('1', (err, rawTx) => {
+      txController.addTx({ id: '1', status: 'unapproved', metamaskNetworkId: currentNetworkId, txParams: {} }, noop)
+      txController.signTransaction('1', (err, rawTx) => {
         if (err) return assert.fail('it should not fail')
         const ethTx = new EthTx(ethUtil.toBuffer(rawTx))
         assert.equal(ethTx.getChainId(), currentNetworkId)

From 53b8d18a5f649c73a58a96e36a9458903d8af6aa Mon Sep 17 00:00:00 2001
From: Kevin Serrano <kevin.serrano@consensys.net>
Date: Tue, 16 May 2017 15:30:22 -0700
Subject: [PATCH 02/17] Complete transition into BN.

---
 ui/app/components/bn-as-decimal-input.js | 143 +++++++++++++++++++++++
 ui/app/components/pending-tx.js          |  27 ++---
 2 files changed, 157 insertions(+), 13 deletions(-)
 create mode 100644 ui/app/components/bn-as-decimal-input.js

diff --git a/ui/app/components/bn-as-decimal-input.js b/ui/app/components/bn-as-decimal-input.js
new file mode 100644
index 000000000..6c2132ca1
--- /dev/null
+++ b/ui/app/components/bn-as-decimal-input.js
@@ -0,0 +1,143 @@
+const Component = require('react').Component
+const h = require('react-hyperscript')
+const inherits = require('util').inherits
+const ethUtil = require('ethereumjs-util')
+const BN = ethUtil.BN
+const extend = require('xtend')
+
+module.exports = BnAsDecimalInput
+
+inherits(BnAsDecimalInput, Component)
+function BnAsDecimalInput () {
+  this.state = { invalid: null }
+  Component.call(this)
+}
+
+/* Bn as Decimal Input
+ *
+ * A component for allowing easy, decimal editing
+ * of a passed in hex string value.
+ *
+ * On change, calls back its `onChange` function parameter
+ * and passes it an updated hex string.
+ */
+
+BnAsDecimalInput.prototype.render = function () {
+  const props = this.props
+  const state = this.state
+
+  const { value, precision, onChange, min, max } = props
+
+  const suffix = props.suffix
+  const style = props.style
+  const newValue = value.toNumber(10) / scale
+  const scale = Math.pow(10, precision)
+
+  return (
+    h('.flex-column', [
+      h('.flex-row', {
+        style: {
+          alignItems: 'flex-end',
+          lineHeight: '13px',
+          fontFamily: 'Montserrat Light',
+          textRendering: 'geometricPrecision',
+        },
+      }, [
+        h('input.hex-input', {
+          type: 'number',
+          step: 'any',
+          required: true,
+          min: min,
+          max: max,
+          style: extend({
+            display: 'block',
+            textAlign: 'right',
+            backgroundColor: 'transparent',
+            border: '1px solid #bdbdbd',
+
+          }, style),
+          value: newValue,
+          onBlur: (event) => {
+            this.updateValidity(event)
+          },
+          onChange: (event) => {
+            this.updateValidity(event)
+            const value = (event.target.value === '') ? '' : event.target.value
+            const scaledNumber = Math.floor(scale * value)
+            const precisionBN = new BN(scaledNumber, 10)
+            onChange(precisionBN)
+          },
+          onInvalid: (event) => {
+            const msg = this.constructWarning()
+            if (msg === state.invalid) {
+              return
+            }
+            this.setState({ invalid: msg })
+            event.preventDefault()
+            return false
+          },
+        }),
+        h('div', {
+          style: {
+            color: ' #AEAEAE',
+            fontSize: '12px',
+            marginLeft: '5px',
+            marginRight: '6px',
+            width: '20px',
+          },
+        }, suffix),
+      ]),
+
+      state.invalid ? h('span.error', {
+        style: {
+          position: 'absolute',
+          right: '0px',
+          textAlign: 'right',
+          transform: 'translateY(26px)',
+          padding: '3px',
+          background: 'rgba(255,255,255,0.85)',
+          zIndex: '1',
+          textTransform: 'capitalize',
+          border: '2px solid #E20202',
+        },
+      }, state.invalid) : null,
+    ])
+  )
+}
+
+BnAsDecimalInput.prototype.setValid = function (message) {
+  this.setState({ invalid: null })
+}
+
+BnAsDecimalInput.prototype.updateValidity = function (event) {
+  const target = event.target
+  const value = this.props.value
+  const newValue = target.value
+
+  if (value === newValue) {
+    return
+  }
+
+  const valid = target.checkValidity()
+
+  if (valid) {
+    this.setState({ invalid: null })
+  }
+}
+
+BnAsDecimalInput.prototype.constructWarning = function () {
+  const { name, min, max } = this.props
+  let message = name ? name + ' ' : ''
+
+  if (min && max) {
+    message += `must be greater than or equal to  ${min} and less than or equal to ${max}.`
+  } else if (min) {
+    message += `must be greater than or equal to ${min}.`
+  } else if (max) {
+    message += `must be less than or equal to ${max}.`
+  } else {
+    message += 'Invalid input.'
+  }
+
+  return message
+}
diff --git a/ui/app/components/pending-tx.js b/ui/app/components/pending-tx.js
index 5ea885195..95d345a3d 100644
--- a/ui/app/components/pending-tx.js
+++ b/ui/app/components/pending-tx.js
@@ -13,7 +13,7 @@ const EthBalance = require('./eth-balance')
 const util = require('../util')
 const addressSummary = util.addressSummary
 const nameForAddress = require('../../lib/contract-namer')
-const HexInput = require('./hex-as-decimal-input')
+const BNInput = require('./bn-as-decimal-input')
 
 const MIN_GAS_PRICE_GWEI_BN = new BN(2)
 const GWEI_FACTOR = new BN(1e9)
@@ -54,7 +54,6 @@ PendingTx.prototype.render = function () {
   // Gas Price
   const gasPrice = txParams.gasPrice || MIN_GAS_PRICE_BN.toString(16)
   const gasPriceBn = hexToBn(gasPrice)
-  const gasPriceGweiBn = gasPriceBn.div(GWEI_FACTOR)
 
   const txFeeBn = gasBn.mul(gasPriceBn)
   const valueBn = hexToBn(txParams.value)
@@ -166,9 +165,10 @@ PendingTx.prototype.render = function () {
               h('.cell.label', 'Gas Limit'),
               h('.cell.value', {
               }, [
-                h(HexInput, {
+                h(BNInput, {
                   name: 'Gas Limit',
-                  value: gas,
+                  value: gasBn,
+                  precision: 0,
                   // The hard lower limit for gas.
                   min: MIN_GAS_LIMIT_BN.toString(10),
                   suffix: 'UNITS',
@@ -176,10 +176,10 @@ PendingTx.prototype.render = function () {
                     position: 'relative',
                     top: '5px',
                   },
-                  onChange: (newHex) => {
-                    log.info(`Gas limit changed to ${newHex}`)
+                  onChange: (newBN) => {
+                    log.info(`Gas limit changed to ${newBN.toString(10)}`)
                     const txMeta = this.gatherTxMeta()
-                    txMeta.txParams.gas = newHex
+                    txMeta.txParams.gas = '0x' + newBN.toString('hex')
                     this.setState({ txData: txMeta })
                   },
                   ref: (hexInput) => { this.inputs.push(hexInput) },
@@ -192,20 +192,20 @@ PendingTx.prototype.render = function () {
               h('.cell.label', 'Gas Price'),
               h('.cell.value', {
               }, [
-                h(HexInput, {
+                h(BNInput, {
                   name: 'Gas Price',
-                  value: gasPriceGweiBn.toString(16),
+                  value: gasPriceBn,
+                  precision: 9,
                   suffix: 'GWEI',
                   min: MIN_GAS_PRICE_GWEI_BN.toString(10),
                   style: {
                     position: 'relative',
                     top: '5px',
                   },
-                  onChange: (newHex) => {
-                    log.info(`Gas price changed to: ${newHex}`)
-                    const inWei = hexToBn(newHex).mul(GWEI_FACTOR)
+                  onChange: (newBN) => {
+                    log.info(`Gas price changed to: ${newBN.toString(10)}`)
                     const txMeta = this.gatherTxMeta()
-                    txMeta.txParams.gasPrice = inWei.toString(16)
+                    txMeta.txParams.gasPrice = '0x' + newBN.toString('hex')
                     this.setState({ txData: txMeta })
                   },
                   ref: (hexInput) => { this.inputs.push(hexInput) },
@@ -368,6 +368,7 @@ PendingTx.prototype.miniAccountPanelForRecipient = function () {
 }
 
 PendingTx.prototype.resetGasFields = function () {
+
   log.debug(`pending-tx resetGasFields`)
 
   this.inputs.forEach((hexInput) => {

From d8130f1effc31a866476e10153bd854709ae23be Mon Sep 17 00:00:00 2001
From: Kevin Serrano <kevin.serrano@consensys.net>
Date: Tue, 16 May 2017 16:20:58 -0700
Subject: [PATCH 03/17] Fix reset button.

---
 ui/app/components/bn-as-decimal-input.js |  6 +++---
 ui/app/components/pending-tx.js          | 12 +++++++-----
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/ui/app/components/bn-as-decimal-input.js b/ui/app/components/bn-as-decimal-input.js
index 6c2132ca1..d0eebe09e 100644
--- a/ui/app/components/bn-as-decimal-input.js
+++ b/ui/app/components/bn-as-decimal-input.js
@@ -16,10 +16,10 @@ function BnAsDecimalInput () {
 /* Bn as Decimal Input
  *
  * A component for allowing easy, decimal editing
- * of a passed in hex string value.
+ * of a passed in bn string value.
  *
  * On change, calls back its `onChange` function parameter
- * and passes it an updated hex string.
+ * and passes it an updated bn string.
  */
 
 BnAsDecimalInput.prototype.render = function () {
@@ -30,8 +30,8 @@ BnAsDecimalInput.prototype.render = function () {
 
   const suffix = props.suffix
   const style = props.style
-  const newValue = value.toNumber(10) / scale
   const scale = Math.pow(10, precision)
+  const newValue = value.toNumber(10) / scale
 
   return (
     h('.flex-column', [
diff --git a/ui/app/components/pending-tx.js b/ui/app/components/pending-tx.js
index 95d345a3d..5c8d81d07 100644
--- a/ui/app/components/pending-tx.js
+++ b/ui/app/components/pending-tx.js
@@ -180,7 +180,7 @@ PendingTx.prototype.render = function () {
                     log.info(`Gas limit changed to ${newBN.toString(10)}`)
                     const txMeta = this.gatherTxMeta()
                     txMeta.txParams.gas = '0x' + newBN.toString('hex')
-                    this.setState({ txData: txMeta })
+                    this.setState({ txData: cloneObj(txMeta) })
                   },
                   ref: (hexInput) => { this.inputs.push(hexInput) },
                 }),
@@ -206,7 +206,7 @@ PendingTx.prototype.render = function () {
                     log.info(`Gas price changed to: ${newBN.toString(10)}`)
                     const txMeta = this.gatherTxMeta()
                     txMeta.txParams.gasPrice = '0x' + newBN.toString('hex')
-                    this.setState({ txData: txMeta })
+                    this.setState({ txData: cloneObj(txMeta) })
                   },
                   ref: (hexInput) => { this.inputs.push(hexInput) },
                 }),
@@ -388,7 +388,7 @@ PendingTx.prototype.gatherTxMeta = function () {
   log.debug(`pending-tx gatherTxMeta`)
   const props = this.props
   const state = this.state
-  const txData = state.txData || props.txData
+  const txData = cloneObj(state.txData) || cloneObj(props.txData)
 
   log.debug(`UI has defaulted to tx meta ${JSON.stringify(txData)}`)
   return txData
@@ -409,7 +409,6 @@ PendingTx.prototype._notZeroOrEmptyString = function (obj) {
 
 function forwardCarrat () {
   return (
-
     h('img', {
       src: 'images/forward-carrat.svg',
       style: {
@@ -417,6 +416,9 @@ function forwardCarrat () {
         height: '37px',
       },
     })
-
   )
 }
+
+function cloneObj (obj) {
+  return JSON.parse(JSON.stringify(obj))
+}

From 44f25cd93c18c57acf993ace3387a4d569d8dcca Mon Sep 17 00:00:00 2001
From: Kevin Serrano <kevin.serrano@consensys.net>
Date: Tue, 16 May 2017 16:21:50 -0700
Subject: [PATCH 04/17] Changelog bump

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 422639f70..08dd41a3b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,8 @@
 ## Current Master
 
 - Trim currency list.
+- Enable decimals in our gas prices.
+- Fix reset button.
 
 ## 3.6.4 2017-5-8
 

From c0516ddf333336a7784787a02183c4fe212364b9 Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Wed, 17 May 2017 00:09:59 -0700
Subject: [PATCH 05/17] Add test requiring high precision

---
 .../components/bn-as-decimal-input-test.js    | 59 +++++++++++++++++++
 test/unit/components/pending-tx-test.js       |  2 +-
 2 files changed, 60 insertions(+), 1 deletion(-)
 create mode 100644 test/unit/components/bn-as-decimal-input-test.js

diff --git a/test/unit/components/bn-as-decimal-input-test.js b/test/unit/components/bn-as-decimal-input-test.js
new file mode 100644
index 000000000..4ea910fb0
--- /dev/null
+++ b/test/unit/components/bn-as-decimal-input-test.js
@@ -0,0 +1,59 @@
+var assert = require('assert')
+
+const additions = require('react-testutils-additions')
+const h = require('react-hyperscript')
+const ReactTestUtils = require('react-addons-test-utils')
+const ethUtil = require('ethereumjs-util')
+const BN = ethUtil.BN
+
+var BnInput = require('../../../ui/app/components/bn-as-decimal-input')
+
+describe.only('BnInput', function () {
+  let bnInput
+  const message = 'Hello, world!'
+  const buffer = new Buffer(message, 'utf8')
+  const hex = buffer.toString('hex')
+
+  it('can tolerate a large number at a high precision', function (done) {
+
+    const renderer = ReactTestUtils.createRenderer();
+
+    let valueStr = '1'
+    while (valueStr.length < 18 + 7) {
+      valueStr += '0'
+    }
+    const value = new BN(valueStr, 10)
+
+    let inputStr = '11'
+    while (inputStr.length < 7) {
+      inputStr += '0'
+    }
+    inputStr += '.01'
+
+    let targetStr = inputStr.split('.').join()
+    while (targetStr.length < 18 + 7) {
+      targetStr += '0'
+    }
+    const target = new BN(targetStr, 10)
+
+    const precision = 1e18 // ether precision
+
+    const props = {
+      value,
+      precision,
+      onChange: (newBn) => {
+        assert.equal(newBn.toString(), targetValue.toString(), 'should tolerate increase')
+        done()
+      }
+    }
+
+    const inputComponent = h(BnInput, props)
+    const component = additions.renderIntoDocument(inputComponent)
+    renderer.render(inputComponent)
+    const input = additions.find(component, 'input.hex-input')[0]
+    ReactTestUtils.Simulate.change(input, { preventDefault() {}, target: {
+      value: inputStr,
+      checkValidity() {return true} },
+    })
+  })
+})
diff --git a/test/unit/components/pending-tx-test.js b/test/unit/components/pending-tx-test.js
index fe8290003..166b471cb 100644
--- a/test/unit/components/pending-tx-test.js
+++ b/test/unit/components/pending-tx-test.js
@@ -9,7 +9,7 @@ const Factory = createReactFactory(PendingTx)
 const ReactTestUtils = require('react-addons-test-utils')
 const ethUtil = require('ethereumjs-util')
 
-describe.only('PendingTx', function () {
+describe('PendingTx', function () {
   let pendingTxComponent
 
   const identities = {

From e26501aa0192b26880a8fe63f41d76fdfa849d7b Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Wed, 17 May 2017 00:19:31 -0700
Subject: [PATCH 06/17] Simplify test to represent realistic use case

---
 test/unit/components/bn-as-decimal-input-test.js | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/test/unit/components/bn-as-decimal-input-test.js b/test/unit/components/bn-as-decimal-input-test.js
index 4ea910fb0..1f589c210 100644
--- a/test/unit/components/bn-as-decimal-input-test.js
+++ b/test/unit/components/bn-as-decimal-input-test.js
@@ -14,24 +14,20 @@ describe.only('BnInput', function () {
   const buffer = new Buffer(message, 'utf8')
   const hex = buffer.toString('hex')
 
-  it('can tolerate a large number at a high precision', function (done) {
+  it('can tolerate a gas decimal number at a high precision', function (done) {
 
     const renderer = ReactTestUtils.createRenderer();
 
-    let valueStr = '1'
-    while (valueStr.length < 18 + 7) {
+    let valueStr = '20'
+    while (valueStr.length < 20) {
       valueStr += '0'
     }
     const value = new BN(valueStr, 10)
 
-    let inputStr = '11'
-    while (inputStr.length < 7) {
-      inputStr += '0'
-    }
-    inputStr += '.01'
+    let inputStr = '2.3'
 
-    let targetStr = inputStr.split('.').join()
-    while (targetStr.length < 18 + 7) {
+    let targetStr = '23'
+    while (targetStr.length < 19) {
       targetStr += '0'
     }
     const target = new BN(targetStr, 10)

From 6f02f5bc5d741810edb2c011fc3095ee50f84bf9 Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Wed, 17 May 2017 00:33:19 -0700
Subject: [PATCH 07/17] Clean up test

---
 test/unit/components/bn-as-decimal-input-test.js | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/test/unit/components/bn-as-decimal-input-test.js b/test/unit/components/bn-as-decimal-input-test.js
index 1f589c210..502c9a2de 100644
--- a/test/unit/components/bn-as-decimal-input-test.js
+++ b/test/unit/components/bn-as-decimal-input-test.js
@@ -8,11 +8,8 @@ const BN = ethUtil.BN
 
 var BnInput = require('../../../ui/app/components/bn-as-decimal-input')
 
-describe.only('BnInput', function () {
+describe('BnInput', function () {
   let bnInput
-  const message = 'Hello, world!'
-  const buffer = new Buffer(message, 'utf8')
-  const hex = buffer.toString('hex')
 
   it('can tolerate a gas decimal number at a high precision', function (done) {
 

From bfb1c92ded2bef1a2f08e1c185721010278ca69b Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Wed, 17 May 2017 00:34:56 -0700
Subject: [PATCH 08/17] Linted test

---
 test/unit/components/bn-as-decimal-input-test.js | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/test/unit/components/bn-as-decimal-input-test.js b/test/unit/components/bn-as-decimal-input-test.js
index 502c9a2de..034bc3e18 100644
--- a/test/unit/components/bn-as-decimal-input-test.js
+++ b/test/unit/components/bn-as-decimal-input-test.js
@@ -9,11 +9,9 @@ const BN = ethUtil.BN
 var BnInput = require('../../../ui/app/components/bn-as-decimal-input')
 
 describe('BnInput', function () {
-  let bnInput
-
   it('can tolerate a gas decimal number at a high precision', function (done) {
 
-    const renderer = ReactTestUtils.createRenderer();
+    const renderer = ReactTestUtils.createRenderer()
 
     let valueStr = '20'
     while (valueStr.length < 20) {
@@ -35,9 +33,9 @@ describe('BnInput', function () {
       value,
       precision,
       onChange: (newBn) => {
-        assert.equal(newBn.toString(), targetValue.toString(), 'should tolerate increase')
+        assert.equal(newBn.toString(), target.toString(), 'should tolerate increase')
         done()
-      }
+      },
     }
 
     const inputComponent = h(BnInput, props)
@@ -46,7 +44,7 @@ describe('BnInput', function () {
     const input = additions.find(component, 'input.hex-input')[0]
     ReactTestUtils.Simulate.change(input, { preventDefault() {}, target: {
       value: inputStr,
-      checkValidity() {return true} },
+      checkValidity() { return true } },
     })
   })
 })

From 717db41d0b7bcd7b6f88a5c460aa4dcbc5828116 Mon Sep 17 00:00:00 2001
From: Kevin Serrano <kevin.serrano@consensys.net>
Date: Wed, 17 May 2017 14:18:01 -0700
Subject: [PATCH 09/17] Modify test, replace clone package.

---
 test/unit/components/bn-as-decimal-input-test.js |  4 ++--
 ui/app/components/pending-tx.js                  | 11 ++++-------
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/test/unit/components/bn-as-decimal-input-test.js b/test/unit/components/bn-as-decimal-input-test.js
index 034bc3e18..f515003bb 100644
--- a/test/unit/components/bn-as-decimal-input-test.js
+++ b/test/unit/components/bn-as-decimal-input-test.js
@@ -14,7 +14,7 @@ describe('BnInput', function () {
     const renderer = ReactTestUtils.createRenderer()
 
     let valueStr = '20'
-    while (valueStr.length < 20) {
+    while (valueStr.length < 15) {
       valueStr += '0'
     }
     const value = new BN(valueStr, 10)
@@ -22,7 +22,7 @@ describe('BnInput', function () {
     let inputStr = '2.3'
 
     let targetStr = '23'
-    while (targetStr.length < 19) {
+    while (targetStr.length < 14) {
       targetStr += '0'
     }
     const target = new BN(targetStr, 10)
diff --git a/ui/app/components/pending-tx.js b/ui/app/components/pending-tx.js
index 37a3a3bf3..5b238187c 100644
--- a/ui/app/components/pending-tx.js
+++ b/ui/app/components/pending-tx.js
@@ -2,6 +2,7 @@ const Component = require('react').Component
 const h = require('react-hyperscript')
 const inherits = require('util').inherits
 const actions = require('../actions')
+const clone = require('clone')
 
 const ethUtil = require('ethereumjs-util')
 const BN = ethUtil.BN
@@ -347,14 +348,14 @@ PendingTx.prototype.gasPriceChanged = function (newBN) {
   log.info(`Gas price changed to: ${newBN.toString(10)}`)
   const txMeta = this.gatherTxMeta()
   txMeta.txParams.gasPrice = '0x' + newBN.toString('hex')
-  this.setState({ txData: cloneObj(txMeta) })
+  this.setState({ txData: clone(txMeta) })
 }
 
 PendingTx.prototype.gasLimitChanged = function (newBN) {
   log.info(`Gas limit changed to ${newBN.toString(10)}`)
   const txMeta = this.gatherTxMeta()
   txMeta.txParams.gas = '0x' + newBN.toString('hex')
-  this.setState({ txData: cloneObj(txMeta) })
+  this.setState({ txData: clone(txMeta) })
 }
 
 PendingTx.prototype.resetGasFields = function () {
@@ -405,7 +406,7 @@ PendingTx.prototype.gatherTxMeta = function () {
   log.debug(`pending-tx gatherTxMeta`)
   const props = this.props
   const state = this.state
-  const txData = cloneObj(state.txData) || cloneObj(props.txData)
+  const txData = clone(state.txData) || clone(props.txData)
 
   log.debug(`UI has defaulted to tx meta ${JSON.stringify(txData)}`)
   return txData
@@ -435,7 +436,3 @@ function forwardCarrat () {
     })
   )
 }
-
-function cloneObj (obj) {
-  return JSON.parse(JSON.stringify(obj))
-}

From 959038132a6780f1dd7a4db3696d3fdbaad83b88 Mon Sep 17 00:00:00 2001
From: Kevin Serrano <kevin.serrano@consensys.net>
Date: Tue, 23 May 2017 10:43:37 -0700
Subject: [PATCH 10/17] Increase accuracy of our rounding schemes.

---
 ui/app/components/bn-as-decimal-input.js | 29 +++++++++++++++++++++---
 1 file changed, 26 insertions(+), 3 deletions(-)

diff --git a/ui/app/components/bn-as-decimal-input.js b/ui/app/components/bn-as-decimal-input.js
index d0eebe09e..fbe36abfb 100644
--- a/ui/app/components/bn-as-decimal-input.js
+++ b/ui/app/components/bn-as-decimal-input.js
@@ -30,8 +30,8 @@ BnAsDecimalInput.prototype.render = function () {
 
   const suffix = props.suffix
   const style = props.style
-  const scale = Math.pow(10, precision)
-  const newValue = value.toNumber(10) / scale
+  const valueString = value.toString(10)
+  const newValue = downsize(valueString, precision, precision)
 
   return (
     h('.flex-column', [
@@ -63,7 +63,9 @@ BnAsDecimalInput.prototype.render = function () {
           onChange: (event) => {
             this.updateValidity(event)
             const value = (event.target.value === '') ? '' : event.target.value
-            const scaledNumber = Math.floor(scale * value)
+
+
+            const scaledNumber = upsize(value, precision, precision)
             const precisionBN = new BN(scaledNumber, 10)
             onChange(precisionBN)
           },
@@ -141,3 +143,24 @@ BnAsDecimalInput.prototype.constructWarning = function () {
 
   return message
 }
+
+
+function downsize (number, scale, precision) {
+  if (scale === 0) {
+    return Number(number)
+  } else {
+    var decimals = (scale === precision) ? -1 : scale - precision
+    return Number(number.slice(0, -scale) + '.' + number.slice(-scale, decimals))
+  }
+}
+
+function upsize (number, scale, precision) {
+  var string = number.toString()
+  var stringArray = string.split('.')
+  var decimalLength = stringArray[1] ? stringArray[1].length : 0
+  var newString = ((scale === 0) || (decimalLength === 0)) ? stringArray[0] : stringArray[0] + stringArray[1].slice(0, precision)
+  for (var i = decimalLength; i < scale; i++) {
+    newString += '0'
+  }
+  return newString
+}

From 31d17c9e25458cd47f8c18ec3b967aecff236ba6 Mon Sep 17 00:00:00 2001
From: Kevin Serrano <kevin.serrano@consensys.net>
Date: Tue, 23 May 2017 14:26:37 -0700
Subject: [PATCH 11/17] Fix test, create new value for precision/scale

---
 test/unit/components/bn-as-decimal-input-test.js | 5 +++--
 ui/app/components/bn-as-decimal-input.js         | 6 +++---
 ui/app/components/pending-tx.js                  | 2 ++
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/test/unit/components/bn-as-decimal-input-test.js b/test/unit/components/bn-as-decimal-input-test.js
index f515003bb..6fe684dc5 100644
--- a/test/unit/components/bn-as-decimal-input-test.js
+++ b/test/unit/components/bn-as-decimal-input-test.js
@@ -10,7 +10,6 @@ var BnInput = require('../../../ui/app/components/bn-as-decimal-input')
 
 describe('BnInput', function () {
   it('can tolerate a gas decimal number at a high precision', function (done) {
-
     const renderer = ReactTestUtils.createRenderer()
 
     let valueStr = '20'
@@ -27,10 +26,12 @@ describe('BnInput', function () {
     }
     const target = new BN(targetStr, 10)
 
-    const precision = 1e18 // ether precision
+    const precision = 13 // ether precision
+    const scale = 13
 
     const props = {
       value,
+      scale,
       precision,
       onChange: (newBn) => {
         assert.equal(newBn.toString(), target.toString(), 'should tolerate increase')
diff --git a/ui/app/components/bn-as-decimal-input.js b/ui/app/components/bn-as-decimal-input.js
index fbe36abfb..8f56f29ab 100644
--- a/ui/app/components/bn-as-decimal-input.js
+++ b/ui/app/components/bn-as-decimal-input.js
@@ -26,12 +26,12 @@ BnAsDecimalInput.prototype.render = function () {
   const props = this.props
   const state = this.state
 
-  const { value, precision, onChange, min, max } = props
+  const { value, scale, precision, onChange, min, max } = props
 
   const suffix = props.suffix
   const style = props.style
   const valueString = value.toString(10)
-  const newValue = downsize(valueString, precision, precision)
+  const newValue = downsize(valueString, scale, precision)
 
   return (
     h('.flex-column', [
@@ -65,7 +65,7 @@ BnAsDecimalInput.prototype.render = function () {
             const value = (event.target.value === '') ? '' : event.target.value
 
 
-            const scaledNumber = upsize(value, precision, precision)
+            const scaledNumber = upsize(value, scale, precision)
             const precisionBN = new BN(scaledNumber, 10)
             onChange(precisionBN)
           },
diff --git a/ui/app/components/pending-tx.js b/ui/app/components/pending-tx.js
index 5b238187c..eed0fd9ae 100644
--- a/ui/app/components/pending-tx.js
+++ b/ui/app/components/pending-tx.js
@@ -156,6 +156,7 @@ PendingTx.prototype.render = function () {
                   name: 'Gas Limit',
                   value: gasBn,
                   precision: 0,
+                  scale: 0,
                   // The hard lower limit for gas.
                   min: MIN_GAS_LIMIT_BN.toString(10),
                   suffix: 'UNITS',
@@ -179,6 +180,7 @@ PendingTx.prototype.render = function () {
                   name: 'Gas Price',
                   value: gasPriceBn,
                   precision: 9,
+                  scale: 9,
                   suffix: 'GWEI',
                   min: MIN_GAS_PRICE_GWEI_BN.toString(10),
                   style: {

From 60281f72506c6b1775e75e8426a09d91893ab6ac Mon Sep 17 00:00:00 2001
From: Kevin Serrano <kevin.serrano@consensys.net>
Date: Wed, 24 May 2017 09:55:16 -0700
Subject: [PATCH 12/17] Cleanup code.

---
 ui/app/components/bn-as-decimal-input.js | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/ui/app/components/bn-as-decimal-input.js b/ui/app/components/bn-as-decimal-input.js
index 8f56f29ab..de01f8b5f 100644
--- a/ui/app/components/bn-as-decimal-input.js
+++ b/ui/app/components/bn-as-decimal-input.js
@@ -31,7 +31,7 @@ BnAsDecimalInput.prototype.render = function () {
   const suffix = props.suffix
   const style = props.style
   const valueString = value.toString(10)
-  const newValue = downsize(valueString, scale, precision)
+  const newValue = this.downsize(valueString, scale, precision)
 
   return (
     h('.flex-column', [
@@ -65,7 +65,7 @@ BnAsDecimalInput.prototype.render = function () {
             const value = (event.target.value === '') ? '' : event.target.value
 
 
-            const scaledNumber = upsize(value, scale, precision)
+            const scaledNumber = this.upsize(value, scale, precision)
             const precisionBN = new BN(scaledNumber, 10)
             onChange(precisionBN)
           },
@@ -145,20 +145,28 @@ BnAsDecimalInput.prototype.constructWarning = function () {
 }
 
 
-function downsize (number, scale, precision) {
+BnAsDecimalInput.prototype.downsize = function (number, scale, precision) {
+  // if there is no scaling, simply return the number
   if (scale === 0) {
     return Number(number)
   } else {
+    // if the scale is the same as the precision, account for this edge case.
     var decimals = (scale === precision) ? -1 : scale - precision
     return Number(number.slice(0, -scale) + '.' + number.slice(-scale, decimals))
   }
 }
 
-function upsize (number, scale, precision) {
-  var string = number.toString()
-  var stringArray = string.split('.')
+BnAsDecimalInput.prototype.upsize = function (number, scale, precision) {
+  var stringArray = number.toString().split('.')
   var decimalLength = stringArray[1] ? stringArray[1].length : 0
-  var newString = ((scale === 0) || (decimalLength === 0)) ? stringArray[0] : stringArray[0] + stringArray[1].slice(0, precision)
+  var newString = stringArray[0]
+
+  // If there is scaling and decimal parts exist, integrate them in.
+  if ((scale !== 0) && (decimalLength !== 0)) {
+    newString += stringArray[1].slice(0, precision)
+  }
+
+  // Add 0s to account for the upscaling.
   for (var i = decimalLength; i < scale; i++) {
     newString += '0'
   }

From 2d739647b909732c26a7725cb78cf018c71d6621 Mon Sep 17 00:00:00 2001
From: Kevin Serrano <kevin.serrano@consensys.net>
Date: Wed, 24 May 2017 10:01:45 -0700
Subject: [PATCH 13/17] Bump changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 215aee936..2ad61254c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ## Current Master
 
 - Now when switching networks the extension does not restart
+- Cleanup decimal bugs in our gas inputs.
 
 ## 3.7.0 2017-5-23
 

From 10ca3b6467af2bea723e661160ba5cf2a41ab3b0 Mon Sep 17 00:00:00 2001
From: Kevin Serrano <kevin.serrano@consensys.net>
Date: Wed, 24 May 2017 10:13:43 -0700
Subject: [PATCH 14/17] Fix bug where submit was enabled when invalid params
 were filled out.

---
 CHANGELOG.md                             |  1 +
 ui/app/components/bn-as-decimal-input.js |  2 +-
 ui/app/components/pending-tx.js          | 14 ++++++++++----
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2ad61254c..aea0df1fa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 - Now when switching networks the extension does not restart
 - Cleanup decimal bugs in our gas inputs.
+- Fix bug where submit button was enabled for invalid gas inputs.
 
 ## 3.7.0 2017-5-23
 
diff --git a/ui/app/components/bn-as-decimal-input.js b/ui/app/components/bn-as-decimal-input.js
index de01f8b5f..1d292ca2a 100644
--- a/ui/app/components/bn-as-decimal-input.js
+++ b/ui/app/components/bn-as-decimal-input.js
@@ -67,7 +67,7 @@ BnAsDecimalInput.prototype.render = function () {
 
             const scaledNumber = this.upsize(value, scale, precision)
             const precisionBN = new BN(scaledNumber, 10)
-            onChange(precisionBN)
+            onChange(precisionBN, event.target.checkValidity())
           },
           onInvalid: (event) => {
             const msg = this.constructWarning()
diff --git a/ui/app/components/pending-tx.js b/ui/app/components/pending-tx.js
index eed0fd9ae..8e63f5c76 100644
--- a/ui/app/components/pending-tx.js
+++ b/ui/app/components/pending-tx.js
@@ -346,18 +346,24 @@ PendingTx.prototype.miniAccountPanelForRecipient = function () {
   }
 }
 
-PendingTx.prototype.gasPriceChanged = function (newBN) {
+PendingTx.prototype.gasPriceChanged = function (newBN, valid) {
   log.info(`Gas price changed to: ${newBN.toString(10)}`)
   const txMeta = this.gatherTxMeta()
   txMeta.txParams.gasPrice = '0x' + newBN.toString('hex')
-  this.setState({ txData: clone(txMeta) })
+  this.setState({
+    txData: clone(txMeta),
+    valid,
+  })
 }
 
-PendingTx.prototype.gasLimitChanged = function (newBN) {
+PendingTx.prototype.gasLimitChanged = function (newBN, valid) {
   log.info(`Gas limit changed to ${newBN.toString(10)}`)
   const txMeta = this.gatherTxMeta()
   txMeta.txParams.gas = '0x' + newBN.toString('hex')
-  this.setState({ txData: clone(txMeta) })
+  this.setState({
+    txData: clone(txMeta),
+    valid,
+  })
 }
 
 PendingTx.prototype.resetGasFields = function () {

From 5e19a4a8332703aa3467470073411ad9cccca52a Mon Sep 17 00:00:00 2001
From: Kevin Serrano <kevin.serrano@consensys.net>
Date: Wed, 24 May 2017 10:51:44 -0700
Subject: [PATCH 15/17] Modfiy test to ether standards.

---
 test/unit/components/bn-as-decimal-input-test.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/test/unit/components/bn-as-decimal-input-test.js b/test/unit/components/bn-as-decimal-input-test.js
index 6fe684dc5..b3365b6f9 100644
--- a/test/unit/components/bn-as-decimal-input-test.js
+++ b/test/unit/components/bn-as-decimal-input-test.js
@@ -13,7 +13,7 @@ describe('BnInput', function () {
     const renderer = ReactTestUtils.createRenderer()
 
     let valueStr = '20'
-    while (valueStr.length < 15) {
+    while (valueStr.length < 20) {
       valueStr += '0'
     }
     const value = new BN(valueStr, 10)
@@ -21,13 +21,13 @@ describe('BnInput', function () {
     let inputStr = '2.3'
 
     let targetStr = '23'
-    while (targetStr.length < 14) {
+    while (targetStr.length < 19) {
       targetStr += '0'
     }
     const target = new BN(targetStr, 10)
 
-    const precision = 13 // ether precision
-    const scale = 13
+    const precision = 18 // ether precision
+    const scale = 18
 
     const props = {
       value,

From 293d0b4a574e5b20662da244d54357138ac81d5b Mon Sep 17 00:00:00 2001
From: Kevin Serrano <kevin.serrano@consensys.net>
Date: Wed, 24 May 2017 11:02:26 -0700
Subject: [PATCH 16/17] Minor cleanup

---
 ui/app/components/bn-as-decimal-input.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ui/app/components/bn-as-decimal-input.js b/ui/app/components/bn-as-decimal-input.js
index 1d292ca2a..f3ace4720 100644
--- a/ui/app/components/bn-as-decimal-input.js
+++ b/ui/app/components/bn-as-decimal-input.js
@@ -47,8 +47,8 @@ BnAsDecimalInput.prototype.render = function () {
           type: 'number',
           step: 'any',
           required: true,
-          min: min,
-          max: max,
+          min,
+          max,
           style: extend({
             display: 'block',
             textAlign: 'right',

From 9554788c14eab7be51abe0496bab17f9fe40291b Mon Sep 17 00:00:00 2001
From: Kevin Serrano <kevin.serrano@consensys.net>
Date: Wed, 24 May 2017 11:02:58 -0700
Subject: [PATCH 17/17] Minor cleanup of lint

---
 ui/app/components/pending-tx.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ui/app/components/pending-tx.js b/ui/app/components/pending-tx.js
index 8e63f5c76..d66d98dd5 100644
--- a/ui/app/components/pending-tx.js
+++ b/ui/app/components/pending-tx.js
@@ -367,7 +367,6 @@ PendingTx.prototype.gasLimitChanged = function (newBN, valid) {
 }
 
 PendingTx.prototype.resetGasFields = function () {
-
   log.debug(`pending-tx resetGasFields`)
 
   this.inputs.forEach((hexInput) => {