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

refresh txps

Browse source
This commit is contained in:
Matias Alejo Garcia 2016-08-23 13:20:57 -03:00
commit 4809050ae4
No known key found for this signature in database
GPG key ID: 02470DB551277AB3
3 changed files with 44 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/js/controllers/modals/txpDetails.js
View file

@ -54,19 +54,14 @@ angular.module('copayApp.controllers').controller('txpDetailsController', functi
$scope.loading = true;
$scope.error = null;
$timeout(function() {
ongoingProcess.set('rejectTx', true);
walletService.rejectTx($scope.wallet, $scope.tx, function(err, txpr) {
ongoingProcess.set('rejectTx', false);
walletService.reject($scope.wallet, $scope.tx, function(err, txpr) {
if (err)
return setError(err, gettextCatalog.getString('Could not reject payment'));
$scope.close(txpr);
});
if (err) {
$scope.$emit('UpdateTx');
return setError(err, gettextCatalog.getString('Could not reject payment'));
}
$scope.close(txpr);
});
}, 10);
};
$scope.remove = function() {
@ -196,14 +191,8 @@ angular.module('copayApp.controllers').controller('txpDetailsController', functi
$scope.loading = null;
if (txp) {
var type = txStatus.notify(txp);
$scope.openStatusModal(type, txp, function() {
$scope.$emit('Local/TxProposalAction', txp.status == 'broadcasted');
});
} else {
$timeout(function() {
$scope.$emit('Local/TxProposalAction');
}, 100);
}
$scope.openStatusModal(type, txp, function() {});
}
$scope.cancel();
};