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

Merge pull request #5657 from JDonadio/ref/fee-fiat

Browse source 
Show fee in fiat - Confirm view
This commit is contained in:
Gabriel Edgardo Bazán 2017-02-22 14:38:07 -05:00 • committed by GitHub
commit f6ca41851e
2 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -13,6 +13,7 @@ angular.module('copayApp.controllers').controller('confirmController', function(
toAmount = data.stateParams.toAmount;
cachedSendMax = {};
$scope.showFeeFiat = false;
$scope.useSendMax = data.stateParams.useSendMax == 'true' ? true : false;
$scope.recipientType = data.stateParams.recipientType || null;
$scope.toAddress = data.stateParams.toAddress;
@ -124,6 +125,10 @@ angular.module('copayApp.controllers').controller('confirmController', function(
});
};
$scope.toggleFeeValue = function() {
$scope.showFeeFiat = !$scope.showFeeFiat;
};
var initConfirm = function() {
if ($scope.paypro) _paymentTimeControl($scope.paypro.expires);
@ -147,6 +152,7 @@ angular.module('copayApp.controllers').controller('confirmController', function(
function resetValues() {
$scope.displayAmount = $scope.displayUnit = $scope.fee = $scope.alternativeAmountStr = $scope.insufficientFunds = $scope.noMatchingWallet = null;
$scope.showFeeFiat = false;
};
$scope.getSendMaxInfo = function() {
@ -363,6 +369,9 @@ angular.module('copayApp.controllers').controller('confirmController', function(
function apply(txp) {
$scope.fee = txFormatService.formatAmountStr(txp.fee);
txFormatService.formatAlternativeStr(txp.fee, function(v) {
$scope.feeFiat = v;
});
$scope.txp = txp;
$timeout(function() {
$scope.$apply();