BTCPrivate
/
copay
mirror of https://github.com/BTCPrivate/copay.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

ref - use alert instead confirm

This commit is contained in:
Javier 2016-11-25 10:02:56 -03:00
parent ac15e99b42
commit b30a371a68
4 changed files with 8 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/js/controllers/amount.js
View File

@ -21,10 +21,6 @@ angular.module('copayApp.controllers').controller('amountController', function($
$scope.toEmail = data.stateParams.toEmail;
$scope.showAlternativeAmount = !!$scope.cardId || !!$scope.isGiftCard;
$scope.toColor = data.stateParams.toColor;
$scope.network = (new bitcore.Address($scope.toAddress)).network.name;
$scope.wallets = profileService.getWallets({
network: $scope.network
});
$scope.customAmount = data.stateParams.customAmount;

17
src/js/controllers/confirm.js
View File

@ -147,11 +147,6 @@ angular.module('copayApp.controllers').controller('confirmController', function(
feePerKb: feePerKb,
};
toAmount = parseFloat((resp.amount * satToUnit).toFixed(unitDecimals));
txFormatService.formatAlternativeStr(resp.amount, function(v) {
$scope.alternativeAmountStr = v;
});
var msg = gettextCatalog.getString("{{fee}} will be deducted for bitcoin networking fees", {
fee: txFormatService.formatAmount(resp.fee) + ' ' + unitName
});
@ -160,13 +155,14 @@ angular.module('copayApp.controllers').controller('confirmController', function(
if (!lodash.isEmpty(warningMsg))
msg += '. \n' + warningMsg;
popupService.showConfirm(null, msg, 'Ok', gettextCatalog.getString('Cancel'), function(result) {
if (!result) return;
var amount = txFormatService.formatAmount(resp.amount, true);
$scope.displayAmount = amount;
popupService.showAlert(null, msg, function() {
$scope.displayAmount = txFormatService.formatAmount(resp.amount, true);
$scope.displayUnit = unitName;
$scope.fee = txFormatService.formatAmount($scope.sendMaxInfo.fee) + ' ' + unitName;
toAmount = parseFloat((resp.amount * satToUnit).toFixed(unitDecimals));
txFormatService.formatAlternativeStr(resp.amount, function(v) {
$scope.alternativeAmountStr = v;
});
createTx($scope.wallet, true, function(err, txp) {
if (err) return;
@ -374,6 +370,7 @@ angular.module('copayApp.controllers').controller('confirmController', function(
};
$scope.approve = function(onSendStatusChange) {
if (!toAmount) return;
if ($scope.paypro && $scope.paymentExpired.value) {
popupService.showAlert(null, gettextCatalog.getString('This bitcoin payment request has expired.'));

2
src/js/services/feeService.js
View File

@ -1,6 +1,6 @@
'use strict';
angular.module('copayApp.services').factory('feeService', function($log, $stateParams, bwcService, walletService, configService, gettext, lodash, txFormatService, profileService, gettextCatalog) {
angular.module('copayApp.services').factory('feeService', function($log, $stateParams, bwcService, walletService, configService, gettext, lodash, txFormatService, gettextCatalog) {
var root = {};
// Constant fee options to translate

4
src/sass/views/amount.scss
View File

@ -54,10 +54,6 @@
color: $dark-gray;
font-weight: bold;
}
.send-max {
float: right;
padding-top: 10px;
}
}
.amount {
display: flex;