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

display wallet selector if use send max

This commit is contained in:
Javier 2016-11-25 15:24:02 -03:00
parent a7b2dc24af
commit f23b0e136d
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22,6 +22,7 @@ angular.module('copayApp.controllers').controller('confirmController', function(
giftCardUUID = data.stateParams.giftCardUUID; giftCardUUID = data.stateParams.giftCardUUID;
toAmount = data.stateParams.toAmount; toAmount = data.stateParams.toAmount;
$scope.useSendMax = data.stateParams.useSendMax;
$scope.isWallet = data.stateParams.isWallet; $scope.isWallet = data.stateParams.isWallet;
$scope.cardId = data.stateParams.cardId; $scope.cardId = data.stateParams.cardId;
$scope.toAddress = data.stateParams.toAddress; $scope.toAddress = data.stateParams.toAddress;
@ -29,7 +30,6 @@ angular.module('copayApp.controllers').controller('confirmController', function(
$scope.toEmail = data.stateParams.toEmail; $scope.toEmail = data.stateParams.toEmail;
$scope.description = data.stateParams.description; $scope.description = data.stateParams.description;
$scope.paypro = data.stateParams.paypro; $scope.paypro = data.stateParams.paypro;
$scope.useSendMax = data.stateParams.useSendMax;
$scope.insuffientFunds = false; $scope.insuffientFunds = false;
$scope.noMatchingWallet = false; $scope.noMatchingWallet = false;
$scope.paymentExpired = { $scope.paymentExpired = {
@ -56,8 +56,8 @@ angular.module('copayApp.controllers').controller('confirmController', function(
$scope.wallet = $scope.wallets[0]; $scope.wallet = $scope.wallets[0];
} }
if (!$scope.useSendMax) initConfirm(); if ($scope.useSendMax) $scope.showWalletSelector();
else $scope.getSendMaxInfo(); else initConfirm();
}); });
var initConfirm = function() { var initConfirm = function() {
@ -107,6 +107,8 @@ angular.module('copayApp.controllers').controller('confirmController', function(
}; };
$scope.getSendMaxInfo = function() { $scope.getSendMaxInfo = function() {
$scope.displayAmount = $scope.displayUnit = $scope.fee = $scope.alternativeAmountStr = null;
ongoingProcess.set('gettingFeeLevels', true); ongoingProcess.set('gettingFeeLevels', true);
feeService.getCurrentFeeValue($scope.network, function(err, feePerKb) { feeService.getCurrentFeeValue($scope.network, function(err, feePerKb) {
ongoingProcess.set('gettingFeeLevels', false); ongoingProcess.set('gettingFeeLevels', false);

2
www/views/confirm.html
View File

@ -17,7 +17,7 @@
</div> </div>
<div class="amount-label"> <div class="amount-label">
<div class="amount">{{displayAmount || '...'}} <span class="unit">{{displayUnit}}</span></div> <div class="amount">{{displayAmount || '...'}} <span class="unit">{{displayUnit}}</span></div>
<div class="alternative">{{alternativeAmountStr}}</div> <div class="alternative">{{alternativeAmountStr || '...'}}</div>
</div> </div>
</div> </div>
<div class="info"> <div class="info">