Fix duplicate request of password or touchid
This commit is contained in:
parent
9ecbe53de6
commit
72ac721642
1 changed files with 18 additions and 24 deletions
|
|
@ -944,35 +944,29 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
|
||||||
self.setOngoingProcess();
|
self.setOngoingProcess();
|
||||||
self.setSendError(err);
|
self.setSendError(err);
|
||||||
} else {
|
} else {
|
||||||
self.prepareSignAndBroadcastTx(txpPublished);
|
txService.signAndBroadcast(txpPublished, {
|
||||||
|
reporterFn: self.setOngoingProcess.bind(self)
|
||||||
|
}, function(err, txp) {
|
||||||
|
self.resetForm();
|
||||||
|
|
||||||
|
if (err) {
|
||||||
|
self.error = err.message ? err.message : gettext('The payment was created but could not be completed. Please try again from home screen');
|
||||||
|
$scope.$emit('Local/TxProposalAction');
|
||||||
|
$timeout(function() {
|
||||||
|
$scope.$digest();
|
||||||
|
}, 1);
|
||||||
|
} else {
|
||||||
|
go.walletHome();
|
||||||
|
txStatus.notify(txp, function() {
|
||||||
|
$scope.$emit('Local/TxProposalAction', txp.status == 'broadcasted');
|
||||||
|
});
|
||||||
|
}
|
||||||
|
});
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
this.prepareSignAndBroadcastTx = function(txp) {
|
|
||||||
var fc = profileService.focusedClient;
|
|
||||||
var self = this;
|
|
||||||
txService.prepareAndSignAndBroadcast(txp, {
|
|
||||||
reporterFn: self.setOngoingProcess.bind(self)
|
|
||||||
}, function(err, txp) {
|
|
||||||
self.resetForm();
|
|
||||||
|
|
||||||
if (err) {
|
|
||||||
self.error = err.message ? err.message : gettext('The payment was created but could not be completed. Please try again from home screen');
|
|
||||||
$scope.$emit('Local/TxProposalAction');
|
|
||||||
$timeout(function() {
|
|
||||||
$scope.$digest();
|
|
||||||
}, 1);
|
|
||||||
} else {
|
|
||||||
go.walletHome();
|
|
||||||
txStatus.notify(txp, function() {
|
|
||||||
$scope.$emit('Local/TxProposalAction', txp.status == 'broadcasted');
|
|
||||||
});
|
|
||||||
}
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
this.setForm = function(to, amount, comment) {
|
this.setForm = function(to, amount, comment) {
|
||||||
var form = $scope.sendForm;
|
var form = $scope.sendForm;
|
||||||
if (to) {
|
if (to) {
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue