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

Merge pull request #2776 from matiu/bug/refresh2

Browse source 
fix refresh on reject
This commit is contained in:
Gustavo Maximiliano Cortez 2015-05-28 14:58:45 -03:00
commit 46c76aa9d1
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -218,7 +218,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
} else { } else {
if (memo) if (memo)
$log.info(memo); $log.info(memo);
$modalInstance.close(txpsb); $modalInstance.close(txpsb, true);
} }
}); });
} else { } else {
@ -287,7 +287,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
if (memo) if (memo)
$log.info(memo); $log.info(memo);
$modalInstance.close(txpb); $modalInstance.close(txpb, true);
} }
}); });
}, 100); }, 100);
@ -314,11 +314,11 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
m.addClass('slideOutRight'); m.addClass('slideOutRight');
}); });
modalInstance.result.then(function(txp) { modalInstance.result.then(function(txp, refreshUntilItChanges) {
self.setOngoingProcess(); self.setOngoingProcess();
if (txp) { if (txp) {
txStatus.notify(txp, function() { txStatus.notify(txp, function() {
$scope.$emit('Local/TxProposalAction', true); $scope.$emit('Local/TxProposalAction', refreshUntilItChanges);
}); });
} else { } else {
$timeout(function() { $timeout(function() {
@ -633,7 +633,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
$log.info(memo); $log.info(memo);
txStatus.notify(btx, function() { txStatus.notify(btx, function() {
$scope.$emit('Local/TxProposalAction'); $scope.$emit('Local/TxProposalAction', true);
return cb(); return cb();
}); });
}); });