web3 coinbase async fix

Signed-off-by: Andrey Shovkoplyas <motor4ik@gmail.com>

resources/js/web3_init.js

@@ -24,35 +24,41 @@ var StatusHttpProvider = function (host, timeout) {
 
 StatusHttpProvider.prototype.isStatus = true;
 
-function syncResponse(payload, result){
+function web3Response (payload, result){
     return {id: payload.id,
             jsonrpc: "2.0",
             result: result};
 }
 
+function getSyncResponse (payload) {
+    if (payload.method == "eth_accounts"){
+        return web3Response(payload, [currentAccountAddress])
+    } else if (payload.method == "eth_coinbase"){
+        return web3Response(payload, currentAccountAddress)
+    } else if (payload.method == "net_version"){
+        return web3Response(payload, networkId)
+    } else {
+        return null;
+    }
+}
+
 StatusHttpProvider.prototype.send = function (payload) {
     //TODO to be compatible with MM https://github.com/MetaMask/faq/blob/master/DEVELOPERS.md#dizzy-all-async---think-of-metamask-as-a-light-client
-    if (payload.method == "eth_accounts"){
+    var syncResponse = getSyncResponse(payload);
-        return syncResponse(payload, [currentAccountAddress])
+    if (syncResponse){
-    } else if (payload.method == "eth_coinbase"){
+        return syncResponse;
-        return syncResponse(payload, currentAccountAddress)
-    } else if (payload.method == "net_version"){
-        return syncResponse(payload, networkId)
     } else {
         alert('You tried to send "' + payload.method + '" synchronously. Synchronous requests are not supported, sorry.');
         return null;
     }
 };
 
-StatusHttpProvider.prototype.prepareRequest = function () {
+StatusHttpProvider.prototype.sendAsync = function (payload, callback) {
-    var request = new XMLHttpRequest();
+    var syncResponse = getSyncResponse(payload);
-
+    if (syncResponse){
-    request.open('POST', this.host, false);
+        callback(null, syncResponse);
-    request.setRequestHeader('Content-Type', 'application/json');
+    }
-    return request;
+    else {
-};
-
-function sendAsync(payload, callback) {
         var messageId = callbackId++;
         callbacks[messageId] = callback;
         if (typeof StatusBridge == "undefined") {
@@ -66,9 +72,16 @@ function sendAsync(payload, callback) {
         } else {
             StatusBridge.sendRequest(this.host, JSON.stringify(messageId), JSON.stringify(payload));
         }
+    }
 };
 
-StatusHttpProvider.prototype.sendAsync = sendAsync;
+StatusHttpProvider.prototype.prepareRequest = function () {
+    var request = new XMLHttpRequest();
+
+    request.open('POST', this.host, false);
+    request.setRequestHeader('Content-Type', 'application/json');
+    return request;
+};
 
 /**
  * Synchronously tries to make Http request