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

delete unused view and wording fixes

Browse source
This commit is contained in:
Gabriel Bazán 2017-05-16 14:36:20 -03:00
commit c558b64403
4 changed files with 5 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -164,7 +164,7 @@ angular.module('copayApp.controllers').controller('confirmController', function(
};
function resetValues() {
$scope.displayAmount = $scope.displayUnit = $scope.fee = $scope.feeFiat = $scope.feePercent = $scope.alternativeAmountStr = $scope.insufficientFunds = $scope.noMatchingWallet = null;
$scope.displayAmount = $scope.displayUnit = $scope.fee = $scope.feeFiat = $scope.feeRateStr = $scope.alternativeAmountStr = $scope.insufficientFunds = $scope.noMatchingWallet = null;
$scope.showAddress = false;
};
@ -263,7 +263,7 @@ angular.module('copayApp.controllers').controller('confirmController', function(
txFormatService.formatAlternativeStr(data.amount, function(v) {
$scope.alternativeAmountStr = v;
});
$scope.feePercent = (data.fee * 100 / (data.amount + data.fee)).toFixed(2);
$scope.feeRateStr = (data.fee / (data.amount + data.fee) * 100).toFixed(2) + '%';
$timeout(function() {
$scope.$apply();
});
@ -389,7 +389,7 @@ angular.module('copayApp.controllers').controller('confirmController', function(
$scope.feeFiat = v;
});
$scope.txp = txp;
$scope.feePercent = (txp.fee * 100 / (txp.amount + txp.fee)).toFixed(2);
$scope.feeRateStr = (txp.fee / (txp.amount + txp.fee) * 100).toFixed(2) + '%';
$timeout(function() {
$scope.$apply();
});

2
src/sass/views/confirm.scss
View file

@ -3,7 +3,7 @@
@extend .deflash-blue;
.item-note {
float: none;
.fee-percent {
.fee-rate {
display: inline-block;
}
}