Merge branch 'master' into infura-rest-api

6 files changed, 32 insertions, 5 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cacc4b522..4b4218210 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Current Master
 
+## 3.13.4 2018-1-9
+
 - Remove recipient field if application initializes a tx with an empty string, or 0x, and tx data. Throw an error with the same condition, but without tx data.
 - Improve gas price suggestion to be closer to the lowest that will be accepted.
 - Throw an error if a application tries to submit a tx whose value is a decimal, and inform that it should be in wei.
diff --git a/app/manifest.json b/app/manifest.json
index d6c57d681..df7b1f1aa 100644
--- a/app/manifest.json
+++ b/app/manifest.json
@@ -1,7 +1,7 @@
 {
   "name": "MetaMask",
   "short_name": "Metamask",
-  "version": "3.13.3",
+  "version": "3.13.4",
   "manifest_version": 2,
   "author": "https://metamask.io",
   "description": "Ethereum Browser Extension",
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index 66738db51..f62b5e5cd 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -490,9 +490,15 @@ module.exports = class MetamaskController extends EventEmitter {
   getGasPrice () {
     const { recentBlocksController } = this
     const { recentBlocks } = recentBlocksController.store.getState()
+
+    // Return 1 gwei if no blocks have been observed:
+    if (recentBlocks.length === 0) {
+      return '0x' + GWEI_BN.toString(16)
+    }
+
     const lowestPrices = recentBlocks.map((block) => {
-      if (!block.gasPrices) {
-        return new BN(0)
+      if (!block.gasPrices || block.gasPrices.length < 1) {
+        return GWEI_BN
       }
       return block.gasPrices
       .map(hexPrefix => hexPrefix.substr(2))
@@ -502,6 +508,7 @@ module.exports = class MetamaskController extends EventEmitter {
       })[0]
     })
     .map(number => number.div(GWEI_BN).toNumber())
+
     const percentileNum = percentile(50, lowestPrices)
     const percentileNumBn = new BN(percentileNum)
     return '0x' + percentileNumBn.mul(GWEI_BN).toString(16)
diff --git a/package.json b/package.json
index 3b64c14c1..bf20fe480 100644
--- a/package.json
+++ b/package.json
@@ -73,7 +73,7 @@
     "eth-block-tracker": "^2.2.0",
     "eth-contract-metadata": "^1.1.4",
     "eth-hd-keyring": "^1.2.1",
-    "eth-json-rpc-filters": "^1.2.4",
+    "eth-json-rpc-filters": "^1.2.5",
     "eth-json-rpc-infura": "^2.0.5",
     "eth-keyring-controller": "^2.1.2",
     "eth-phishing-detect": "^1.1.4",
diff --git a/test/unit/metamask-controller-test.js b/test/unit/metamask-controller-test.js
index 9ec7cd0af..3fc7f9a98 100644
--- a/test/unit/metamask-controller-test.js
+++ b/test/unit/metamask-controller-test.js
@@ -72,6 +72,25 @@ describe('MetaMaskController', function () {
 
         metamaskController.recentBlocksController = realRecentBlocksController
       })
+
+      it('gives the 1 gwei price if no blocks have been seen.', async function () {
+        const realRecentBlocksController = metamaskController.recentBlocksController
+        metamaskController.recentBlocksController = {
+          store: {
+            getState: () => {
+              return {
+                recentBlocks: []
+              }
+            }
+          }
+        }
+
+        const gasPrice = metamaskController.getGasPrice()
+        assert.equal(gasPrice, '0x' + GWEI_BN.toString(16), 'defaults to 1 gwei')
+
+        metamaskController.recentBlocksController = realRecentBlocksController
+      })
+
     })
 
     describe('#createNewVaultAndKeychain', function () {
diff --git a/ui/app/info.js b/ui/app/info.js
index 24c211c1f..110678a46 100644
--- a/ui/app/info.js
+++ b/ui/app/info.js
@@ -138,7 +138,6 @@ InfoScreen.prototype.render = function () {
               h('div.fa.fa-envelope', [
                 h('a.info', {
                   target: '_blank',
-                  style: { width: '85vw' },
                   href: 'mailto:help@metamask.io?subject=Feedback',
                 }, 'Email us!'),
               ]),