Fix glidera issues (tx proposals and ui)

This commit is contained in:
Gustavo Maximiliano Cortez 2016-09-06 11:59:05 -03:00
commit 241213ca4f
No known key found for this signature in database
GPG key ID: 15EDAD8D9F2EB1AF
11 changed files with 42 additions and 47 deletions

View file

@ -1,5 +1,8 @@
<div class="wallet-activity" ng-class="{'wallet-activity-not-pending':!tx.pendingForUs}">
<div class="wallet-activity-amount">
{{tx.amountStr}}
</div>
<span ng-show="!tx.merchant">
<span ng-show="addressbook[tx.toAddress] && !tx.message">
{{addressbook[tx.toAddress]}}
@ -18,11 +21,6 @@
<span>
</span>
<div class="wallet-activity-amount">
{{tx.amountStr}}
</div>
<p class="wallet-activity-note">
<i class="icon ion-record wallet-activity-note-child" ng-style="{'color':tx.wallet.color}"></i>
<span class="wallet-activity-note-child">{{tx.wallet.name}}</span>