mirror of https://github.com/BTCPrivate/copay.git
commit
11d675e46a
|
@ -333,19 +333,20 @@ angular.module('copayApp.controllers').controller('indexController', function($r
|
||||||
|
|
||||||
self.setSendMax = function() {
|
self.setSendMax = function() {
|
||||||
|
|
||||||
|
self.feeToSendMaxStr = null;
|
||||||
|
self.feeRateToSendMax = null;
|
||||||
|
|
||||||
// Set Send max
|
// Set Send max
|
||||||
if (self.currentFeeLevel && self.totalBytesToSendMax) {
|
if (self.currentFeeLevel && self.totalBytesToSendMax) {
|
||||||
feeService.getCurrentFeeValue(self.currentFeeLevel, function(err, feePerKb) {
|
feeService.getCurrentFeeValue(self.currentFeeLevel, function(err, feePerKb) {
|
||||||
|
|
||||||
// KB to send max
|
// KB to send max
|
||||||
if (self.totalBytesToSendMax) {
|
|
||||||
var feeToSendMaxSat = parseInt(((self.totalBytesToSendMax * feePerKb) / 1000.).toFixed(0));
|
var feeToSendMaxSat = parseInt(((self.totalBytesToSendMax * feePerKb) / 1000.).toFixed(0));
|
||||||
self.feeRateToSendMax = feePerKb;
|
self.feeRateToSendMax = feePerKb;
|
||||||
|
|
||||||
|
if (self.availableBalanceSat > feeToSendMaxSat) {
|
||||||
self.availableMaxBalance = strip((self.availableBalanceSat - feeToSendMaxSat) * self.satToUnit);
|
self.availableMaxBalance = strip((self.availableBalanceSat - feeToSendMaxSat) * self.satToUnit);
|
||||||
self.feeToSendMaxStr = profileService.formatAmount(feeToSendMaxSat) + ' ' + self.unitName;
|
self.feeToSendMaxStr = profileService.formatAmount(feeToSendMaxSat) + ' ' + self.unitName;
|
||||||
} else {
|
|
||||||
self.feeToSendMaxStr = null;
|
|
||||||
self.feeRateToSendMax = null;
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
|
@ -147,7 +147,10 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
|
||||||
$scope.addAddressbookEntry = false;
|
$scope.addAddressbookEntry = false;
|
||||||
$scope.selectedAddressbook = {};
|
$scope.selectedAddressbook = {};
|
||||||
$scope.newAddress = address;
|
$scope.newAddress = address;
|
||||||
$scope.addressbook = { 'address' : ($scope.newAddress || '') , 'label' : ''};
|
$scope.addressbook = {
|
||||||
|
'address': ($scope.newAddress || ''),
|
||||||
|
'label': ''
|
||||||
|
};
|
||||||
$scope.color = fc.backgroundColor;
|
$scope.color = fc.backgroundColor;
|
||||||
|
|
||||||
$scope.beforeQrCodeScann = function() {
|
$scope.beforeQrCodeScann = function() {
|
||||||
|
@ -185,7 +188,10 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
|
||||||
|
|
||||||
$scope.toggleAddAddressbookEntry = function() {
|
$scope.toggleAddAddressbookEntry = function() {
|
||||||
$scope.error = null;
|
$scope.error = null;
|
||||||
$scope.addressbook = { 'address' : ($scope.newAddress || '') , 'label' : ''};
|
$scope.addressbook = {
|
||||||
|
'address': ($scope.newAddress || ''),
|
||||||
|
'label': ''
|
||||||
|
};
|
||||||
$scope.addAddressbookEntry = !$scope.addAddressbookEntry;
|
$scope.addAddressbookEntry = !$scope.addAddressbookEntry;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -1159,6 +1165,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
|
||||||
|
|
||||||
this.setFromUri = function(uri) {
|
this.setFromUri = function(uri) {
|
||||||
var self = this;
|
var self = this;
|
||||||
|
|
||||||
function sanitizeUri(uri) {
|
function sanitizeUri(uri) {
|
||||||
// Fixes when a region uses comma to separate decimals
|
// Fixes when a region uses comma to separate decimals
|
||||||
var regex = /[\?\&]amount=(\d+([\,\.]\d+)?)/i;
|
var regex = /[\?\&]amount=(\d+([\,\.]\d+)?)/i;
|
||||||
|
@ -1302,37 +1309,13 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
|
||||||
this.setForm(null, amount, null, feeRate);
|
this.setForm(null, amount, null, feeRate);
|
||||||
};
|
};
|
||||||
|
|
||||||
// TODO: showPopup alike
|
|
||||||
this.confirmDialog = function(msg, cb) {
|
|
||||||
if (isCordova) {
|
|
||||||
navigator.notification.confirm(
|
|
||||||
msg,
|
|
||||||
function(buttonIndex) {
|
|
||||||
if (buttonIndex == 1) {
|
|
||||||
$timeout(function() {
|
|
||||||
return cb(true);
|
|
||||||
}, 1);
|
|
||||||
} else {
|
|
||||||
return cb(false);
|
|
||||||
}
|
|
||||||
},
|
|
||||||
confirm_msg, [accept_msg, cancel_msg]
|
|
||||||
);
|
|
||||||
} else if (isChromeApp) {
|
|
||||||
// No feedback, alert/confirm not supported.
|
|
||||||
return cb(true);
|
|
||||||
} else {
|
|
||||||
return cb(confirm(msg));
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
this.sendAll = function(amount, feeStr, feeRate) {
|
this.sendAll = function(amount, feeStr, feeRate) {
|
||||||
var self = this;
|
var self = this;
|
||||||
var msg = gettextCatalog.getString("{{fee}} will be deducted for bitcoin networking fees", {
|
var msg = gettextCatalog.getString("{{fee}} will be deducted for bitcoin networking fees", {
|
||||||
fee: feeStr
|
fee: feeStr
|
||||||
});
|
});
|
||||||
|
|
||||||
this.confirmDialog(msg, function(confirmed) {
|
confirmDialog.show(msg, function(confirmed) {
|
||||||
if (confirmed)
|
if (confirmed)
|
||||||
self._doSendAll(amount, feeRate);
|
self._doSendAll(amount, feeRate);
|
||||||
});
|
});
|
||||||
|
@ -1345,5 +1328,4 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
|
||||||
this.setAddress();
|
this.setAddress();
|
||||||
this.setSendFormInputs();
|
this.setSendFormInputs();
|
||||||
}
|
}
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
Loading…
Reference in New Issue