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

Fix show contacts from tx proposals and tx views

Browse source
This commit is contained in:
Gustavo Maximiliano Cortez 2016-10-23 19:15:08 -03:00
commit ad9c840ac7
No known key found for this signature in database
GPG key ID: 15EDAD8D9F2EB1AF
5 changed files with 12 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
www/views/includes/txp.html
View file

@ -4,8 +4,8 @@
{{tx.amountStr}}
</div>
<span ng-show="!tx.merchant">
<span ng-show="addressbook[tx.toAddress] && !tx.message">
{{addressbook[tx.toAddress]}}
<span ng-show="addressbook[tx.toAddress] && addressbook[tx.toAddress].name && !tx.message">
{{addressbook[tx.toAddress].name}}
</span>
<span class="ellipsis" ng-show="!addressbook[tx.toAddress] && tx.message">
{{tx.message}}
@ -18,8 +18,6 @@
<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>
<span>
</span>
<p class="wallet-activity-note">
<i class="icon ion-record wallet-activity-note-child" ng-style="{'color':tx.wallet.color}"></i>