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

fix confirm popup on confirm view

Browse source
This commit is contained in:
Gabriel Bazán 2016-12-16 14:54:16 -03:00
commit dddb3d6456
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -223,13 +223,13 @@ angular.module('copayApp.controllers').controller('confirmController', function(
function setSendMaxValues(data) { function setSendMaxValues(data) {
resetValues(); resetValues();
var config = configService.getSync().wallet; var config = configService.getSync().wallet;
var unitName = config.settings.unitName;
var unitToSatoshi = config.settings.unitToSatoshi; var unitToSatoshi = config.settings.unitToSatoshi;
var satToUnit = 1 / unitToSatoshi; var satToUnit = 1 / unitToSatoshi;
var unitDecimals = config.settings.unitDecimals; var unitDecimals = config.settings.unitDecimals;
$scope.displayAmount = txFormatService.formatAmount(data.amount, true); $scope.amountStr = txFormatService.formatAmountStr(data.amount, true);
$scope.displayUnit = unitName; $scope.displayAmount = getDisplayAmount($scope.amountStr);
$scope.displayUnit = getDisplayUnit($scope.amountStr);
$scope.fee = txFormatService.formatAmountStr(data.fee); $scope.fee = txFormatService.formatAmountStr(data.fee);
toAmount = parseFloat((data.amount * satToUnit).toFixed(unitDecimals)); toAmount = parseFloat((data.amount * satToUnit).toFixed(unitDecimals));
txFormatService.formatAlternativeStr(data.amount, function(v) { txFormatService.formatAlternativeStr(data.amount, function(v) {
@ -483,12 +483,12 @@ angular.module('copayApp.controllers').controller('confirmController', function(
} }
}); });
return; return;
} }
ongoingProcess.set('creatingTx', true, onSendStatusChange); ongoingProcess.set('creatingTx', true, onSendStatusChange);
createTx(wallet, false, function(err, txp) { createTx(wallet, false, function(err, txp) {
ongoingProcess.set('creatingTx', false, onSendStatusChange); ongoingProcess.set('creatingTx', false, onSendStatusChange);
if (err) return; if (err) return;
var config = configService.getSync(); var config = configService.getSync();
var spendingPassEnabled = walletService.isEncrypted(wallet); var spendingPassEnabled = walletService.isEncrypted(wallet);
@ -533,8 +533,8 @@ angular.module('copayApp.controllers').controller('confirmController', function(
$log.debug('statusChangeHandler: ', processName, showName, isOn); $log.debug('statusChangeHandler: ', processName, showName, isOn);
if ( if (
( (
processName === 'broadcastingTx' || processName === 'broadcastingTx' ||
((processName === 'signingTx') && $scope.wallet.m > 1) || ((processName === 'signingTx') && $scope.wallet.m > 1) ||
(processName == 'sendingTx' && !$scope.wallet.canSign() && !$scope.wallet.isPrivKeyExternal()) (processName == 'sendingTx' && !$scope.wallet.canSign() && !$scope.wallet.isPrivKeyExternal())
) && !isOn) { ) && !isOn) {
$scope.sendStatus = 'success'; $scope.sendStatus = 'success';