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

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

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
parent bf1c25f135 ec50b26f3c
commit f6ca41851e
2 changed files with 11 additions and 3 deletions
Show Stats 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();

5
www/views/confirm.html
View File

@ -85,9 +85,8 @@
</a>
<div class="item single-line" ng-if="!insufficientFunds && !noMatchingWallet">
<span class="label">{{'Fee' | translate}}: {{feeLevel | translate}}</span>
<span class="item-note">
{{fee || '...'}}
</span>
<span ng-if="!showFeeFiat" class="item-note" ng-click="toggleFeeValue()">{{fee || '...'}}</span>
<span ng-if="showFeeFiat" class="item-note" ng-click="toggleFeeValue()">{{feeFiat || '...'}}</span>
</div>
<div class="text-center" ng-show="noMatchingWallet">
<span class="badge badge-energized" translate>No wallets available</span>