From 91475d44b97da3eb6cb9e511fec737837ba47c0f Mon Sep 17 00:00:00 2001
From: Anthony Laibe <anthony@laibe.cc>
Date: Fri, 7 Sep 2018 15:38:28 +0100
Subject: [PATCH] Fix showing the indicator

---
 src/blockchain.js | 5 +++--
 src/index.js      | 6 ++----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/blockchain.js b/src/blockchain.js
index 13f1659..7fb7435 100644
--- a/src/blockchain.js
+++ b/src/blockchain.js
@@ -99,7 +99,6 @@ let Contract = function (options) {
 
   if (Contract.isNewWeb3(this.web3)) {
     ContractClass = new this.web3.eth.Contract(this.abi, this.address);
-    ContractClass.setProvider(this.web3.currentProvider);
     ContractClass.options.data = this.code;
     ContractClass.options.from = this.from || this.web3.eth.defaultAccount;
     ContractClass.abi = ContractClass.options.abi;
@@ -109,7 +108,9 @@ let Contract = function (options) {
     let originalMethods = Object.keys(ContractClass);
 
     Blockchain.execWhenReady(function() {
-      ContractClass.setProvider(web3.currentProvider);
+      if(!ContractClass.currentProvider){
+        ContractClass.setProvider(web3.currentProvider);
+      }
       ContractClass.options.from = web3.eth.defaultAccount;
     });
 
diff --git a/src/index.js b/src/index.js
index 852dc53..debe954 100644
--- a/src/index.js
+++ b/src/index.js
@@ -6,10 +6,8 @@ import Utils from './utils';
 
 var EmbarkJS = {
   onReady: function (cb) {
-    if (this.Blockchain.done) {
-      return cb();
-    }
-    this.Blockchain.finalCb = function() {
+    Blockchain.execWhenReady(cb)
+    Blockchain.finalCb = function() {
       cb();
     }
   }