From 769262f06bfeb332b59f2487116a9d43e93b6ee0 Mon Sep 17 00:00:00 2001 From: Matias Alejo Garcia Date: Tue, 28 Apr 2015 15:17:13 -0300 Subject: [PATCH] turn off spinner on notification --- src/js/controllers/walletHome.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/js/controllers/walletHome.js b/src/js/controllers/walletHome.js index c832510fa..e19fcae6a 100644 --- a/src/js/controllers/walletHome.js +++ b/src/js/controllers/walletHome.js @@ -267,10 +267,11 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi }); modalInstance.result.then(function(txp) { + $scope.$emit('Local/TxProposalAction'); if (txp) { + self.setOngoingProcess(); txStatus.notify(txp); } - $scope.$emit('Local/TxProposalAction'); }); }; @@ -539,15 +540,15 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi return; } $scope.$emit('Local/TxProposalAction'); + self.setOngoingProcess(); txStatus.notify(btx, function() { - self.setOngoingProcess(); return cb(); }); }); } else { $scope.$emit('Local/TxProposalAction'); + self.setOngoingProcess(); txStatus.notify(signedTx, function() { - self.setOngoingProcess(); return cb(); }); }