anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

android fix 2

Browse source
This commit is contained in:
Matias Alejo Garcia 2015-04-28 17:28:49 -03:00
commit 6b167d4bfd
1 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/js/controllers/walletHome.js
View file

@ -484,11 +484,11 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
} }
} else { } else {
self.onGoingProcess = name; self.onGoingProcess = name;
};
$timeout(function() { $timeout(function() {
$rootScope.$apply(); $rootScope.$apply();
}); });
}; };
};
this.submitForm = function() { this.submitForm = function() {
var fc = profileService.focusedClient; var fc = profileService.focusedClient;
@ -556,13 +556,12 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
if (signedTx.status == 'accepted') { if (signedTx.status == 'accepted') {
self.setOngoingProcess('Broadcasting transaction'); self.setOngoingProcess('Broadcasting transaction');
fc.broadcastTxProposal(signedTx, function(err, btx) { fc.broadcastTxProposal(signedTx, function(err, btx) {
if (err) {
self.setOngoingProcess(); self.setOngoingProcess();
if (err) {
$scope.error = 'Transaction not broadcasted. Please try again.'; $scope.error = 'Transaction not broadcasted. Please try again.';
$scope.$digest(); $scope.$digest();
return; return cb(err);
} }
self.setOngoingProcess();
$scope.$emit('Local/TxProposalAction'); $scope.$emit('Local/TxProposalAction');
txStatus.notify(btx, function() { txStatus.notify(btx, function() {
return cb(); return cb();