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

fix alternativeAmount for list of pending transactions proposals

Browse source
This commit is contained in:
Gustavo Maximiliano Cortez 2014-11-07 17:02:54 -03:00
commit b71bef495a
2 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
js/services/controllerUtils.js
View file

@ -349,6 +349,9 @@ angular.module('copayApp.services')
var w = $rootScope.wallet; var w = $rootScope.wallet;
if (!w) return root.onErrorDigest(); if (!w) return root.onErrorDigest();
var res = w.getPendingTxProposals(); var res = w.getPendingTxProposals();
_.each(res.txs, function(tx) {
root.computeAlternativeAmount(w, tx);
});
$rootScope.txps = res.txs; $rootScope.txps = res.txs;
if ($rootScope.pendingTxCount < res.pendingForUs) { if ($rootScope.pendingTxCount < res.pendingForUs) {
$rootScope.txAlertCount = res.pendingForUs; $rootScope.txAlertCount = res.pendingForUs;

4
views/includes/transaction.html
View file

@ -10,7 +10,9 @@
<div class="large-3 medium-3 small-4 columns"> <div class="large-3 medium-3 small-4 columns">
<div class="size-12"> <div class="size-12">
<span>{{out.value |noFractionNumber}} {{$root.wallet.settings.unitName}}</span> <span>{{out.value |noFractionNumber}} {{$root.wallet.settings.unitName}}</span>
<span>{{out.alternativeAmount|noFractionNumber}} {{out.alternativeIsoCode}}</span> <span class="label secondary round">
{{out.alternativeAmount|noFractionNumber}} {{out.alternativeIsoCode}}
</span>
</div> </div>
</div> </div>
<div class="large-1 medium-1 small-1 columns fi-arrow-right"></div> <div class="large-1 medium-1 small-1 columns fi-arrow-right"></div>