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

Merge pull request #3064 from greggzigler/bug/receivedHistoryAmount

Browse source 
txhistory of received payments show non-receiver outputs
This commit is contained in:
Gustavo Maximiliano Cortez 2015-08-10 10:48:07 -03:00
commit 77abe774ac
2 changed files with 18 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

20
public/views/modals/tx-details.html
View file

@ -29,13 +29,21 @@
<h4 class="title m0" translate>Details</h4> <h4 class="title m0" translate>Details</h4>
<ul class="no-bullet size-14 m0"> <ul class="no-bullet size-14 m0">
<div ng-if="!btx.showSingle" <div ng-if="btx.action == 'received'">
ng-repeat="output in [ btx.outputs.summary ]" <li class="line-b p10 oh" ng-if="btx.message">
ng-include="'views/includes/output.html'"> <span class="text-gray" translate>Note</span>:
<span class="right">{{btx.message}}</span>
</li>
</div> </div>
<div ng-if="!btx.showSingle && btx.outputs.summary.showDetails" <div ng-if="btx.action != 'received'">
ng-repeat="output in btx.outputs.details" <div ng-if="!btx.showSingle"
ng-include="'views/includes/output.html'"> ng-repeat="output in [ btx.outputs.summary ]"
ng-include="'views/includes/output.html'">
</div>
<div ng-if="!btx.showSingle && btx.outputs.summary.showDetails"
ng-repeat="output in btx.outputs.details"
ng-include="'views/includes/output.html'">
</div>
</div> </div>
<li ng-if="btx.showSingle && btx.addressTo && btx.addressTo != 'N/A'" class="line-b p10 oh" ng-click="copyAddress(btx.addressTo)"> <li ng-if="btx.showSingle && btx.addressTo && btx.addressTo != 'N/A'" class="line-b p10 oh" ng-click="copyAddress(btx.addressTo)">
<span class="text-gray" translate>To</span>: <span class="text-gray" translate>To</span>:

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

@ -430,10 +430,13 @@ angular.module('copayApp.controllers').controller('indexController', function($r
if (tx.outputs) { if (tx.outputs) {
tx.showSingle = false; tx.showSingle = false;
tx.outputs.details = lodash.clone(tx.outputs); tx.outputs.details = lodash.clone(tx.outputs);
tx.amount = lodash.reduce(tx.outputs.details, function(total, o) { var total = lodash.reduce(tx.outputs.details, function(total, o) {
formatAmount(o); formatAmount(o);
return total + o.amount; return total + o.amount;
}, 0); }, 0);
if (tx.action != 'received') {
tx.amount = total;
}
tx.outputs.summary = { tx.outputs.summary = {
amount: tx.amount, amount: tx.amount,
message: tx.message, message: tx.message,