Merge branch 'master' into livereload

3 files changed, 28 insertions, 19 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1f414e0fd..5cc22af4a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,9 +2,12 @@
 
 ## Current Master
 
+## 2.10.1 2016-09-02
+
 - Fix bug where provider menu did not allow switching to custom network from a custom network.
 - Sending a transaction from within MetaMask no longer triggers a popup.
 - The ability to build without livereload features (such as for production) can be enabled with the gulp --disableLiveReload flag.
+- Fix Ethereum JSON RPC Filters bug.
 
 ## 2.10.0 2016-08-29
 
diff --git a/app/manifest.json b/app/manifest.json
index 5444007fa..7d23e7d31 100644
--- a/app/manifest.json
+++ b/app/manifest.json
@@ -1,7 +1,7 @@
 {
   "name": "MetaMask",
   "short_name": "Metamask",
-  "version": "2.10.0",
+  "version": "2.10.1",
   "manifest_version": 2,
   "author": "https://metamask.io",
   "description": "Ethereum Browser Extension",
diff --git a/app/scripts/lib/notifications.js b/app/scripts/lib/notifications.js
index df4fe73dd..4e3f7558c 100644
--- a/app/scripts/lib/notifications.js
+++ b/app/scripts/lib/notifications.js
@@ -9,20 +9,26 @@ module.exports = notifications
 window.METAMASK_NOTIFIER = notifications
 
 function show () {
-  getWindows((windows) => {
+  getPopup((err, popup) => {
+    if (err) throw err
 
-    if (windows.length > 0) {
-      const win = windows[0]
-      return extension.windows.update(win.id, { focused: true })
-    }
+    if (popup) {
+
+      // bring focus to existing popup
+      extension.windows.update(popup.id, { focused: true })
+
+    } else {
 
-    extension.windows.create({
-      url: 'notification.html',
-      type: 'popup',
-      focused: true,
-      width: 360,
-      height: 500,
-    })
+      // create new popup
+      extension.windows.create({
+        url: 'notification.html',
+        type: 'popup',
+        focused: true,
+        width: 360,
+        height: 500,
+      })
+
+    }
   })
 }
 
@@ -38,19 +44,19 @@ function getWindows(cb) {
 }
 
 function getPopup(cb) {
-  getWindows((windows) => {
-    cb(getPopupIn(windows))
+  getWindows((err, windows) => {
+    if (err) throw err
+    cb(null, getPopupIn(windows))
   })
 }
 
 function getPopupIn(windows) {
-  return windows ? windows.find((win) => {
-    return win.type === 'popup'
-  }) : null
+  return windows ? windows.find((win) => win.type === 'popup') : null
 }
 
 function closePopup() {
-  getPopup((popup) => {
+  getPopup((err, popup) => {
+    if (err) throw err
     if (!popup) return
     extension.windows.remove(popup.id, console.error)
   })