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

Merge pull request #175 from cmgustavo/matias/feat/send-all-fee-txp

Browse source 
Adds Fee to TXP modal
This commit is contained in:
Matias Alejo Garcia 2015-06-22 11:36:15 -03:00
commit 4325a94d1d
3 changed files with 6 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
public/views/modals/txp-details.html
View file

@ -24,6 +24,10 @@
<span class="label gray radius">{{alternativeAmountStr}}</span>
</span>
</li>
<li class="line-b p10">
<span class="text-gray" translate>Fee</span>:
<span class="right">{{feeStr}}</span>
</li>
<li class="line-b p10">
<span class="text-gray" translate>Time</span>:
<span class="right">

1
src/js/controllers/index.js
View file

@ -349,6 +349,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r
lodash.each(txps, function(tx) {
var amount = tx.amount * self.satToUnit;
tx.amountStr = profileService.formatAmount(tx.amount) + ' ' + config.unitName;
tx.feeStr = profileService.formatAmount(tx.fee) + ' ' + config.unitName;
tx.alternativeAmount = rateService.toFiat(tx.amount, config.alternativeIsoCode) ? rateService.toFiat(tx.amount, config.alternativeIsoCode).toFixed(2) : 'N/A';
tx.alternativeAmountStr = tx.alternativeAmount + " " + config.alternativeIsoCode;
tx.alternativeIsoCode = config.alternativeIsoCode;

1
src/js/controllers/walletHome.js
View file

@ -132,6 +132,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
$scope.error = null;
$scope.tx = tx;
$scope.amountStr = tx.amountStr;
$scope.feeStr = tx.feeStr;
$scope.alternativeAmountStr = tx.alternativeAmountStr;
$scope.copayers = copayers
$scope.copayerId = fc.credentials.copayerId;