Merge branch 'i1381-GasPriceInGwei' of github.com:MetaMask/metamask-plugin into i1381-GasPriceInGwei

5 files changed, 22 insertions, 11 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d552e6ab8..157c4186a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,13 +2,15 @@
 
 ## Current Master
 
+- Input gas price in Gwei.
+- Enforce Safe Gas Minimum recommended by EthGasStation.
+- Fix bug where block-tracker could stop polling for new blocks.
+- Reduce UI size by removing internal web3.
+
 ## 3.6.1 2017-4-30
 
 - Made fox less nosy.
-
-
 - Fix bug where error was reported in debugger console when Chrome opened a new window.
-- Fix bug where block-tracker could stop polling for new blocks.
 
 ## 3.6.0 2017-4-26
 
diff --git a/package.json b/package.json
index 1ec784a69..e2268d20a 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,7 @@
     "start": "npm run dev",
     "dev": "gulp dev --debug",
     "disc": "gulp disc --debug",
-    "dist": "gulp dist --disableLiveReload",
+    "dist": "npm install && gulp dist --disableLiveReload",
     "test": "npm run lint && npm run test-unit && npm run test-integration",
     "test-unit": "METAMASK_ENV=test mocha --require test/helper.js --recursive \"test/unit/**/*.js\"",
     "test-integration": "npm run buildMock && npm run buildCiUnits && testem ci -P 2",
diff --git a/ui/app/components/ens-input.js b/ui/app/components/ens-input.js
index 0457bde2e..ec3cd60ed 100644
--- a/ui/app/components/ens-input.js
+++ b/ui/app/components/ens-input.js
@@ -63,6 +63,7 @@ EnsInput.prototype.render = function () {
           return h('option', {
             value: identity.address,
             label: identity.name,
+            key: identity.address,
           })
         }),
       ]),
diff --git a/ui/app/components/pending-tx.js b/ui/app/components/pending-tx.js
index 4b28ae099..71d4d767a 100644
--- a/ui/app/components/pending-tx.js
+++ b/ui/app/components/pending-tx.js
@@ -15,7 +15,9 @@ const addressSummary = util.addressSummary
 const nameForAddress = require('../../lib/contract-namer')
 const HexInput = require('./hex-as-decimal-input')
 
-const MIN_GAS_PRICE_BN = new BN(20000000)
+const MIN_GAS_PRICE_GWEI_BN = new BN(2)
+const GWEI_FACTOR = new BN(1e9)
+const MIN_GAS_PRICE_BN = MIN_GAS_PRICE_GWEI_BN.mul(GWEI_FACTOR)
 const MIN_GAS_LIMIT_BN = new BN(21000)
 
 module.exports = connect(mapStateToProps)(PendingTx)
@@ -39,16 +41,20 @@ PendingTx.prototype.render = function () {
   const txMeta = this.gatherTxMeta()
   const txParams = txMeta.txParams || {}
 
+  // Account Details
   const address = txParams.from || props.selectedAddress
   const identity = props.identities[address] || { address: address }
   const account = props.accounts[address]
   const balance = account ? account.balance : '0x0'
 
+  // Gas
   const gas = txParams.gas
-  const gasPrice = txParams.gasPrice
-
   const gasBn = hexToBn(gas)
+
+  // 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)
@@ -187,17 +193,18 @@ PendingTx.prototype.render = function () {
               }, [
                 h(HexInput, {
                   name: 'Gas Price',
-                  value: gasPrice,
-                  suffix: 'WEI',
-                  min: MIN_GAS_PRICE_BN.toString(10),
+                  value: gasPriceGweiBn.toString(16),
+                  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)
                     const txMeta = this.gatherTxMeta()
-                    txMeta.txParams.gasPrice = newHex
+                    txMeta.txParams.gasPrice = inWei.toString(16)
                     this.setState({ txData: txMeta })
                   },
                   ref: (hexInput) => { this.inputs.push(hexInput) },
diff --git a/ui/app/reducers.js b/ui/app/reducers.js
index c656af849..11efca529 100644
--- a/ui/app/reducers.js
+++ b/ui/app/reducers.js
@@ -44,6 +44,7 @@ function rootReducer (state, action) {
 window.logState = function () {
   var stateString = JSON.stringify(window.METAMASK_CACHED_LOG_STATE, removeSeedWords, 2)
   console.log(stateString)
+  return stateString
 }
 
 function removeSeedWords (key, value) {