Merge branch 'master' into ModularFiatBalance

2 files changed, 8 insertions, 2 deletions

diff --git a/app/scripts/background.js b/app/scripts/background.js
index 5dae8235f..18aaed7bf 100644
--- a/app/scripts/background.js
+++ b/app/scripts/background.js
@@ -35,6 +35,12 @@ function showUnconfirmedTx (txParams, txData, onTxDoneCb) {
   notification.show()
 }
 
+// On first install, open a window to MetaMask website to how-it-works.
+
+extension.runtime.onInstalled.addListener(function (object) {
+  extension.tabs.create({url: 'https://metamask.io/#how-it-works'})
+})
+
 //
 // connect to other contexts
 //
@@ -80,6 +86,7 @@ function setupControllerConnection (stream) {
   stream.pipe(dnode).pipe(stream)
   dnode.on('remote', (remote) => {
     // push updates to popup
+    controller.ethStore.removeListener('update', controller.sendUpdate.bind(controller))
     controller.ethStore.on('update', controller.sendUpdate.bind(controller))
     controller.listeners.push(remote)
     idStore.on('update', controller.sendUpdate.bind(controller))
@@ -160,4 +167,3 @@ function getOldStyleData () {
 function setData (data) {
   window.localStorage[STORAGE_KEY] = JSON.stringify(data)
 }
-
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index 83827ec76..5373cf0d9 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -220,7 +220,7 @@ module.exports = class MetamaskController {
   }
 
   enforceTxValidations (txParams) {
-    if (txParams.value.indexOf('-') === 0) {
+    if (('value' in txParams) && txParams.value.indexOf('-') === 0) {
       const msg = `Invalid transaction value of ${txParams.value} not a positive number.`
       return new Error(msg)
     }