Merge pull request #617 from MetaMask/i616-FixListenerLeak

I616 fix listener leak

3 files changed, 3 insertions, 1 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9021fdf01..bea356ab6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 - On fresh install, open a new tab with the MetaMask Introduction video.
 - Block negative values from transactions.
+- Fixed a memory leak.
 
 ## 2.10.2 2016-09-02
 
diff --git a/app/scripts/background.js b/app/scripts/background.js
index 21a5eea65..18aaed7bf 100644
--- a/app/scripts/background.js
+++ b/app/scripts/background.js
@@ -86,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))
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)
     }