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

Merge pull request #1733 from isocolsky/sign

Browse source 
made wallet#sign synchronous
This commit is contained in:
Matias Alejo Garcia 2014-11-06 14:56:25 -03:00
commit 37f2a27e79
4 changed files with 64 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

29
js/controllers/send.js
View file

@ -445,20 +445,23 @@ angular.module('copayApp.controllers').controller('SendController',
$scope.sign = function(ntxid) {
$scope.loading = true;
w.sign(ntxid, function(ret) {
if (!ret) {
$scope.error = 'There was an error signing the transaction';
try {
w.sign(ntxid);
} catch (e) {
$scope.error = 'There was an error signing the transaction';
$scope.loadTxs();
return;
}
var p = w.txProposals.getTxProposal(ntxid);
if (p.builder.isFullySigned()) {
$scope.send(ntxid, function() {
$scope.loadTxs();
} else {
var p = w.txProposals.getTxProposal(ntxid);
if (p.builder.isFullySigned()) {
$scope.send(ntxid, function() {
$scope.loadTxs();
});
} else
$scope.loadTxs();
}
});
});
} else {
$scope.loadTxs();
}
};
$scope.reject = function(ntxid) {