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

handle multiple outputs in transaction proposal

Browse source
This commit is contained in:
Gregg Zigler 2015-07-01 15:36:44 -07:00
commit 805eebb752
4 changed files with 82 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

20
public/views/includes/output.html Normal file
View file

@ -0,0 +1,20 @@
<div class="ng-animate-disabled row collapse line-b" ng-class="text-gray'">
<ul class="no-bullet size-14 m0">
<li class="line-b p10 oh">
</li>
<li class="line-b p10 oh" ng-click="copyAddress(output.toAddress)">
<span class="text-gray" translate>To</span>:
<span class="right enable_text_select">{{output.toAddress}}</span>
</li>
<li class="line-b p10">
<span class="text-gray" translate>Amount</span>:
<span class="right">{{output.amountStr}}
<span class="label gray radius">{{output.alternativeAmountStr}}</span>
</span>
</li>
<li class="line-b p10 oh">
<span class="text-gray" translate>Note</span>:
<span class="right">{{output.message}}</span>
</li>
</ul>
</div>

12
public/views/includes/transaction.html
View file

@ -16,8 +16,16 @@
<span ng-show="tx.merchant.pr.ca"><i class="fi-lock"></i> {{tx.merchant.domain}}</span>
<span ng-show="!tx.merchant.pr.ca"><i class="fi-unlock"></i> {{tx.merchant.domain}}</span>
</span>
<contact address="{{tx.toAddress}}" ng-hide="tx.merchant"> </contact>
{{tx.toAddress}}
<span ng-if="tx.outputs">
{{tx.outputs[0].toAddress.substring(0, 16)+'...'}}
<span translate>and </span>
{{tx.outputs.length - 1}}
<span translate> more</span>
</span>
<span ng-if="!tx.outputs">
<contact address="{{tx.toAddress}}" ng-hide="tx.merchant"> </contact>
{{tx.toAddress}}
</span>
</div>
<div class="ellipsis text-gray size-14">
{{tx.message}}

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

@ -16,7 +16,8 @@
<ul class="no-bullet size-14 m0">
<li class="line-b p10 oh" ng-click="copyAddress(tx.toAddress)">
<span class="text-gray" translate>To</span>:
<span class="right enable_text_select">{{tx.toAddress}}</span>
<span class="right" translate ng-if="tx.outputs">See details below</span>
<span class="right enable_text_select" ng-if="!tx.outputs">{{tx.toAddress}}</span>
</li>
<li class="line-b p10">
<span class="text-gray" translate>Amount</span>:
@ -147,5 +148,11 @@
</button>
</div>
<div ng-if="tx.outputs">
<div ng-repeat="output in tx.outputs"
ng-include="'views/includes/output.html'">
</div>
</div>
<div class="extra-margin-bottom"></div>
</div>