Updates bitcore-wallet-client and fix functions

package.json

@@ -40,7 +40,7 @@
     "url": "https://github.com/bitpay/copay/issues"
   },
   "dependencies": {
-    "bitcore-wallet-client": "1.5.0",
+    "bitcore-wallet-client": "2.1.0",
     "express": "^4.11.2",
     "fs": "0.0.2",
     "grunt": "^0.4.5",

src/js/controllers/walletHome.js

@@ -808,11 +808,6 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
         'message': comment
       });
 
-      txSignService.prepare(function(err) {
-        if (err) {
-          return self.setSendError(err);
-        }
-
       var opts = {
         toAddress: address,
         amount: amount,
@@ -845,32 +840,35 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
         }
       });
 
-      });
     }, 100);
   }; 
 
   this.acceptTx = function(txp) {
     var self = this;
-    this.confirmTxPopup = null;
-    this.setOngoingProcess(gettextCatalog.getString('Sending transaction'));
-    txSignService.publishTx(txp, function(err) {
-      self.setOngoingProcess();
+    txSignService.prepare(function(err) {
       if (err) {
-        $log.debug(err);
+        return self.setSendError(err);
+      }
+      self.setOngoingProcess(gettextCatalog.getString('Sending transaction'));
+      txSignService.publishTx(txp, function(err, txpPublished) {
+        if (err) {
+          self.setOngoingProcess();
           self.setSendError(err);
         } else {
-        self.resetForm();
-        // self.signAndBroadcastTx(txp);
+          self.prepareSignAndBroadcastTx(txpPublished);
         }
       });
+    });
   };
 
-  this.signAndBroadcastTx = function() {
+  this.prepareSignAndBroadcastTx = function(txp) {
+    var fc = profileService.focusedClient;
     var self = this;
-    txSignService.signAndBroadcast(txp, {
+    txSignService.prepareAndSignAndBroadcast(txp, {
       reporterFn: self.setOngoingProcess.bind(self)
     }, function(err, txp) {
       self.resetForm();
+
       if (err) {
         self.error = err.message ? err.message : gettext('The payment was created but could not be completed. Please try again from home screen');
         $scope.$emit('Local/TxProposalAction');
@@ -882,7 +880,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
         txStatus.notify(txp, function() {
           $scope.$emit('Local/TxProposalAction', txp.status == 'broadcasted');
         });
-      };
+      }
     });
   };
 

src/js/services/txSignService.js

@@ -120,9 +120,9 @@ angular.module('copayApp.services').factory('txSignService', function($rootScope
 
   root.publishTx = function(txp, cb) {
     var fc = profileService.focusedClient;
-    fc.publishTxProposal({txp: txp}, function(err) {
+    fc.publishTxProposal({txp: txp}, function(err, txp) {
       if (err) return cb(err);
-      else return cb();
+      else return cb(null, txp);
     });
   };