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

Merge pull request #403 from gabrielbazan7/fix/confirmation

Browse source 
fix confirmation popup
This commit is contained in:
Gustavo Maximiliano Cortez 2016-10-12 11:16:48 -03:00 • committed by GitHub
commit 736174132a
1 changed files with 15 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/js/controllers/confirm.js
View file

@ -297,7 +297,7 @@ angular.module('copayApp.controllers').controller('confirmController', function(
var config = configService.getSync(); var config = configService.getSync();
var spendingPassEnabled = walletService.isEncrypted(wallet); var spendingPassEnabled = walletService.isEncrypted(wallet);
var touchIdEnabled = config.touchIdFor && !config.touchIdFor[wallet.id]; var touchIdEnabled = config.touchIdFor && config.touchIdFor[wallet.id];
var isCordova = $scope.isCordova; var isCordova = $scope.isCordova;
var bigAmount = parseFloat(txFormatService.formatToUSD(txp.amount)) > 20; var bigAmount = parseFloat(txFormatService.formatToUSD(txp.amount)) > 20;
var message = gettextCatalog.getString('Sending {{amountStr}} from your {{name}} wallet', { var message = gettextCatalog.getString('Sending {{amountStr}} from your {{name}} wallet', {
@ -308,17 +308,20 @@ angular.module('copayApp.controllers').controller('confirmController', function(
var cancelText = gettextCatalog.getString('Cancel'); var cancelText = gettextCatalog.getString('Cancel');
if (!spendingPassEnabled && !touchIdEnabled) { if (!spendingPassEnabled && !touchIdEnabled) {
if (isCordova && bigAmount) { if (isCordova) {
popupService.showConfirm(null, message, okText, cancelText, function(ok) { if (bigAmount) {
if (!ok) { popupService.showConfirm(null, message, okText, cancelText, function(ok) {
$scope.sendStatus = ''; if (!ok) {
$timeout(function() { $scope.sendStatus = '';
$scope.$apply(); $timeout(function() {
}); $scope.$apply();
return; });
} return;
publishAndSign(wallet, txp, onSendStatusChange); }
}); publishAndSign(wallet, txp, onSendStatusChange);
});
}
else publishAndSign(wallet, txp, onSendStatusChange);
} }
else { else {
popupService.showConfirm(null, message, okText, cancelText, function(ok) { popupService.showConfirm(null, message, okText, cancelText, function(ok) {