mirror of https://github.com/BTCPrivate/copay.git
formatted locked amounts and addressbook backward compatibility
This commit is contained in:
parent
f6806fcdf3
commit
014175f1b6
|
@ -61,6 +61,12 @@
|
||||||
.tx-search:before {
|
.tx-search:before {
|
||||||
font-size: 22px !important;
|
font-size: 22px !important;
|
||||||
}
|
}
|
||||||
|
.description {
|
||||||
|
background-color: #f2f2f2;
|
||||||
|
text-align: center;
|
||||||
|
font-size: 13px;
|
||||||
|
color: $mid-gray;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.wallet-details-wallet-info {
|
.wallet-details-wallet-info {
|
||||||
|
|
|
@ -4,8 +4,8 @@
|
||||||
{{tx.amountStr}}
|
{{tx.amountStr}}
|
||||||
</div>
|
</div>
|
||||||
<span ng-show="!tx.merchant">
|
<span ng-show="!tx.merchant">
|
||||||
<span ng-show="addressbook[tx.toAddress] && addressbook[tx.toAddress].name && !tx.message">
|
<span ng-show="addressbook[tx.toAddress] && !tx.message">
|
||||||
{{addressbook[tx.toAddress].name}}
|
{{addressbook[tx.toAddress].name || addressbook[tx.toAddress]}}
|
||||||
</span>
|
</span>
|
||||||
<span class="ellipsis" ng-show="!addressbook[tx.toAddress] && tx.message">
|
<span class="ellipsis" ng-show="!addressbook[tx.toAddress] && tx.message">
|
||||||
{{tx.message}}
|
{{tx.message}}
|
||||||
|
|
|
@ -99,7 +99,7 @@
|
||||||
<div ng-repeat="tx in txps" class="item item-icon-left" ng-click="openTxpModal(tx)">
|
<div ng-repeat="tx in txps" class="item item-icon-left" ng-click="openTxpModal(tx)">
|
||||||
<span ng-include="'views/includes/txp.html'"></span>
|
<span ng-include="'views/includes/txp.html'"></span>
|
||||||
</div>
|
</div>
|
||||||
<div class="item item-footer" ng-show="status.lockedBalanceSat">
|
<div class="item item-footer description" ng-show="status.lockedBalanceSat">
|
||||||
<span translate>Total Locked Balance</span>:
|
<span translate>Total Locked Balance</span>:
|
||||||
<b>{{status.lockedBalanceStr}} </b>
|
<b>{{status.lockedBalanceStr}} </b>
|
||||||
<span> {{status.lockedBalanceAlternative}} {{status.alternativeIsoCode}} </span>
|
<span> {{status.lockedBalanceAlternative}} {{status.alternativeIsoCode}} </span>
|
||||||
|
@ -158,10 +158,10 @@
|
||||||
<div ng-show="btx.action == 'sent'" class="ellipsis">
|
<div ng-show="btx.action == 'sent'" class="ellipsis">
|
||||||
<div ng-if="btx.message">{{btx.message}}</div>
|
<div ng-if="btx.message">{{btx.message}}</div>
|
||||||
<div ng-if="!btx.message && btx.note.body">{{btx.note.body}}</div>
|
<div ng-if="!btx.message && btx.note.body">{{btx.note.body}}</div>
|
||||||
<div ng-if="!btx.message && !btx.note.body && addressbook[btx.addressTo] && addressbook[btx.addressTo].name">
|
<div ng-if="!btx.message && !btx.note.body && addressbook[btx.addressTo]">
|
||||||
{{addressbook[btx.addressTo].name}}
|
{{addressbook[btx.addressTo].name || addressbook[btx.addressTo]}}
|
||||||
</div>
|
</div>
|
||||||
<div ng-if="!btx.message && !btx.note.body && !(addressbook[btx.addressTo] && addressbook[btx.addressTo].name)" translate>Sent</div>
|
<div ng-if="!btx.message && !btx.note.body && !addressbook[btx.addressTo]" translate>Sent</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div ng-show="btx.action == 'moved'" class="ellipsis">
|
<div ng-show="btx.action == 'moved'" class="ellipsis">
|
||||||
|
|
Loading…
Reference in New Issue