mirror of https://github.com/BTCPrivate/copay.git
rollback
This commit is contained in:
parent
7340b4af29
commit
c15ec58643
|
@ -145,29 +145,26 @@ angular.module('copayApp.controllers').controller('SendController',
|
||||||
}
|
}
|
||||||
|
|
||||||
$scope.loading = true;
|
$scope.loading = true;
|
||||||
|
var comment = form.comment.$modelValue;
|
||||||
|
var merchantData = $scope._merchantData;
|
||||||
|
var address, amount;
|
||||||
|
if (!merchantData) {
|
||||||
|
address = form.address.$modelValue;
|
||||||
|
amount = parseInt((form.amount.$modelValue * unitToSat).toFixed(0));
|
||||||
|
}
|
||||||
|
|
||||||
$timeout(function() {
|
w.spend({
|
||||||
var comment = form.comment.$modelValue;
|
merchantData: merchantData,
|
||||||
var merchantData = $scope._merchantData;
|
toAddress: address,
|
||||||
var address, amount;
|
amountSat: amount,
|
||||||
if (!merchantData) {
|
comment: comment,
|
||||||
address = form.address.$modelValue;
|
}, function(err, txid, status) {
|
||||||
amount = parseInt((form.amount.$modelValue * unitToSat).toFixed(0));
|
$scope.loading = false;
|
||||||
}
|
if (err)
|
||||||
|
|
||||||
w.spend({
|
|
||||||
merchantData: merchantData,
|
|
||||||
toAddress: address,
|
|
||||||
amountSat: amount,
|
|
||||||
comment: comment,
|
|
||||||
}, function(err, txid, status) {
|
|
||||||
$scope.loading = false;
|
|
||||||
if (err)
|
|
||||||
return $scope.setError(err);
|
return $scope.setError(err);
|
||||||
txStatus.notify(status);
|
txStatus.notify(status);
|
||||||
$scope.resetForm();
|
$scope.resetForm();
|
||||||
});
|
});
|
||||||
}, 100);
|
|
||||||
};
|
};
|
||||||
|
|
||||||
// QR code Scanner
|
// QR code Scanner
|
||||||
|
|
Loading…
Reference in New Issue