From 15516644bd3398540b253cf0383cce0c8f648406 Mon Sep 17 00:00:00 2001
From: Ramesh Nair <ram@hiddentao.com>
Date: Mon, 13 Jun 2016 18:17:56 +0800
Subject: [PATCH 1/2] upgrade to electron 1.2.2

---
 .gitignore  | 1 +
 README.md   | 4 ++--
 gulpfile.js | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index b566a9cc7..bd99d5e53 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+.DS_Store
 node_modules/
 packages/
 interface_build/
diff --git a/README.md b/README.md
index 750a4193d..d9fe013c9 100644
--- a/README.md
+++ b/README.md
@@ -34,13 +34,13 @@ Once a Mist version is released the Meteor frontend part is bundled using `meteo
 
 Requirements: 
 
-* Electron v1.0.1
+* Electron v1.2.2
 * Node v4.3.0 or above
 
 To run mist in development you need [Node.js NPM](https://nodejs.org) and [Meteor](https://www.meteor.com/install) and electron installed:
 
     $ curl https://install.meteor.com/ | sh
-    $ npm install -g electron-prebuilt@1.0.1
+    $ npm install -g electron-prebuilt@1.2.2
 
 ### Installation
 
diff --git a/gulpfile.js b/gulpfile.js
index b1f49d66f..8268fcb12 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -36,7 +36,7 @@ var filenameLowercase = 'mist';
 var filenameUppercase = 'Mist';
 var applicationName = 'Mist'; 
 
-var electronVersion = '1.0.1';
+var electronVersion = '1.2.2';
 var osVersions = [];
 var packJson = require('./package.json');
 var version = packJson.version;

From fc31a9fadcc5bd183919c1527083ee2cc315a53f Mon Sep 17 00:00:00 2001
From: Ramesh Nair <ram@hiddentao.com>
Date: Tue, 14 Jun 2016 12:41:31 +0800
Subject: [PATCH 2/2] fix web3.isConnected() issue

---
 modules/ipc/ipcProviderBackend.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/modules/ipc/ipcProviderBackend.js b/modules/ipc/ipcProviderBackend.js
index 087b83b73..cea9892e5 100644
--- a/modules/ipc/ipcProviderBackend.js
+++ b/modules/ipc/ipcProviderBackend.js
@@ -156,8 +156,6 @@ class IpcProviderBackend {
                     })
                     .then(() => {
                         log.debug(`Socket connected, id=${ownerId}`);
-
-                        owner.send('ipcProvider-setWritable', true);
                     })
                     .finally(() => {
                         delete this._connectionPromise[ownerId];
@@ -168,6 +166,8 @@ class IpcProviderBackend {
             }
         })
         .then(() => {
+            owner.send('ipcProvider-setWritable', true);
+
             return this._connections[ownerId];
         });
     }
@@ -384,6 +384,9 @@ class IpcProviderBackend {
                 });
             }
 
+            delete ret.params;
+            delete ret.method;
+
             ret.jsonrpc = '2.0';
 
             return ret;