mirror of https://github.com/BTCPrivate/copay.git
Merge pull request #1482 from bechi/bugs/u-05
fix private message on tx proposal
This commit is contained in:
Matias Alejo Garcia
commit
82acccce2a
|
|
@ -279,11 +279,11 @@ a:hover {
|
||||||
}
|
}
|
||||||
|
|
||||||
.last-transactions-header {
|
.last-transactions-header {
|
||||||
padding: 1rem 0;
|
padding: 1rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
.last-transactions-footer {
|
.last-transactions-footer {
|
||||||
padding: 1rem 0;
|
padding: 1rem;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -325,6 +325,12 @@ a:hover {
|
||||||
color: #fff;
|
color: #fff;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.last-transactions-header .label, .last-transactions-footer .label {
|
||||||
|
white-space: normal;
|
||||||
|
text-align: left;
|
||||||
|
line-height: 1.2rem;
|
||||||
|
}
|
||||||
|
|
||||||
.input-note {
|
.input-note {
|
||||||
margin-top: -10px;
|
margin-top: -10px;
|
||||||
display: block;
|
display: block;
|
||||||
|
|
|
||||||
|
|
@ -1,31 +1,34 @@
|
||||||
<div class="last-transactions-header oh">
|
<div class="last-transactions-header">
|
||||||
<div class="hide-for-small-only large-1 medium-1 columns">
|
<div class="row collapse">
|
||||||
<a class="text-black" ng-show="tx.comment">
|
<div class="hide-for-small-only large-1 medium-1 columns">
|
||||||
<i class="fi-comment-quotes size-24" Popover-animation="true" popover="{{$root.wallet.publicKeyRing.nicknameForCopayer(tx.creator)}}" popover-title="{{tx.comment}}" popover-placement="right" popover-trigger="mouseenter"></i>
|
<a class="text-black" ng-show="tx.comment">
|
||||||
</a>
|
<i class="fi-comment-quotes size-24" Popover-animation="true" popover="{{$root.wallet.publicKeyRing.nicknameForCopayer(tx.creator)}}" popover-title="{{tx.comment}}" popover-placement="right" popover-trigger="mouseenter"></i>
|
||||||
<a class="disable" ng-show="!tx.comment">
|
</a>
|
||||||
<i class="fi-comment-quotes size-24 text-gray"></i>
|
<a class="disable" ng-show="!tx.comment">
|
||||||
</a>
|
<i class="fi-comment-quotes size-24 text-gray"></i>
|
||||||
</div>
|
</a>
|
||||||
<div class="show-for-small-only small-12 columns m10b" ng-show="tx.comment">
|
</div>
|
||||||
<p class="size-14 label ellipsis text-left">
|
<div class="show-for-small-only small-12 columns m10b" ng-show="tx.comment">
|
||||||
{{tx.comment}} Created by <strong>{{$root.wallet.publicKeyRing.nicknameForCopayer(tx.creator)}}</strong>
|
<p class="size-14 label ">
|
||||||
</p>
|
{{tx.comment}} Created by <strong>{{$root.wallet.publicKeyRing.nicknameForCopayer(tx.creator)}}</strong>
|
||||||
</div>
|
</p>
|
||||||
<div class="large-8 medium-8 small-9 columns">
|
</div>
|
||||||
<div ng-repeat="out in tx.outs">
|
<div class="large-8 medium-8 small-9 columns">
|
||||||
<div class="large-3 medium-3 small-4 columns">
|
<div class="row collapse" ng-repeat="out in tx.outs">
|
||||||
<p class="size-14 hide-for-small-only">{{out.value | noFractionNumber}} {{$root.wallet.settings.unitName}}</p>
|
<div class="large-3 medium-3 small-4 columns">
|
||||||
<p class="size-12 show-for-small-only">{{out.value | noFractionNumber}} {{$root.wallet.settings.unitName}}</p>
|
<p class="size-14 hide-for-small-only">{{out.value | noFractionNumber}} {{$root.wallet.settings.unitName}}</p>
|
||||||
</div>
|
<p class="size-12 show-for-small-only">{{out.value | noFractionNumber}} {{$root.wallet.settings.unitName}}</p>
|
||||||
<div class="large-1 medium-1 small-2 columns fi-arrow-right"></div>
|
</div>
|
||||||
<div class="large-8 medium-8 small-7 columns ellipsis">
|
<div class="large-1 medium-1 small-1 columns fi-arrow-right"></div>
|
||||||
<contact address="{{out.address}}" tooltip-popup-delay="500" tooltip tooltip-placement="right" />
|
<div class="large-8 medium-8 small-7 columns ellipsis">
|
||||||
|
<contact address="{{out.address}}" tooltip-popup-delay="500" tooltip tooltip-placement="right" />
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
|
||||||
<div class="large-3 medium-3 small-3 columns text-right">
|
<div class="large-3 medium-3 small-3 columns text-right">
|
||||||
<p class="size-12">{{tx.createdTs | amCalendar}}</p>
|
<p class="size-12">{{tx.createdTs | amCalendar}}</p>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,9 @@
|
||||||
<div class="large-12" ng-show="wallet.isShared()">
|
<div class="large-12" ng-show="wallet.isShared()">
|
||||||
|
|
||||||
<div class="last-transactions" ng-repeat="tx in txs | paged">
|
<div class="last-transactions" ng-repeat="tx in txs | paged">
|
||||||
<div ng-include="'views/includes/transaction.html'"></div>
|
<div class="row collapse">
|
||||||
|
<div ng-include="'views/includes/transaction.html'"></div>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<p ng-show="txs.length == 0"><span translate>No transactions proposals yet.</span>
|
<p ng-show="txs.length == 0"><span translate>No transactions proposals yet.</span>
|
||||||
</p>
|
</p>
|
||||||
|
|
@ -29,21 +31,23 @@
|
||||||
<div ng-if="!blockchain_txs[0].txid && !loading">
|
<div ng-if="!blockchain_txs[0].txid && !loading">
|
||||||
<em><strong translate>No transactions yet.</strong></em></div>
|
<em><strong translate>No transactions yet.</strong></em></div>
|
||||||
<div class="last-transactions" ng-repeat="btx in blockchain_txs | orderBy: 'time':true">
|
<div class="last-transactions" ng-repeat="btx in blockchain_txs | orderBy: 'time':true">
|
||||||
<div class="last-transactions-header oh size-14">
|
<div class="last-transactions-header size-14">
|
||||||
<div class="large-8 medium-7 small-4 columns ellipsis">
|
<div class="row collapse">
|
||||||
<a href="http://{{getShortNetworkName()}}.insight.is/tx/{{btx.txid}}" target="_blank">
|
<div class="large-8 medium-7 small-4 columns ellipsis">
|
||||||
{{btx.txid}}
|
<a href="http://{{getShortNetworkName()}}.insight.is/tx/{{btx.txid}}" target="_blank">
|
||||||
</a>
|
{{btx.txid}}
|
||||||
<span class="btn-copy" clip-copy="btx.txid"></span>
|
</a>
|
||||||
</div>
|
<span class="btn-copy" clip-copy="btx.txid"></span>
|
||||||
<div class="large-4 medium-5 small-8 columns text-right">
|
|
||||||
<div data-ng-show="btx.firstSeenTs">
|
|
||||||
<span translate>first seen at</span>
|
|
||||||
<time>{{btx.firstSeenTs * 1000 | amCalendar}}</time>
|
|
||||||
</div>
|
</div>
|
||||||
<div data-ng-show="btx.time && !btx.firstSeenTs">
|
<div class="large-4 medium-5 small-8 columns text-right">
|
||||||
<span translate>mined</span>
|
<div data-ng-show="btx.firstSeenTs">
|
||||||
<time>{{btx.time * 1000 | amCalendar}}</time>
|
<span translate>first seen at</span>
|
||||||
|
<time>{{btx.firstSeenTs * 1000 | amCalendar}}</time>
|
||||||
|
</div>
|
||||||
|
<div data-ng-show="btx.time && !btx.firstSeenTs">
|
||||||
|
<span translate>mined</span>
|
||||||
|
<time>{{btx.time * 1000 | amCalendar}}</time>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -72,12 +76,14 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="last-transactions-footer">
|
<div class="last-transactions-footer">
|
||||||
<div class="large-6 medium-6 small-6 columns">
|
<div class="row collapse">
|
||||||
<p class="size-12"><span translate>Fee</span>: {{btx.fees | noFractionNumber}} {{$root.wallet.settings.unitName}}</p>
|
<div class="large-6 medium-6 small-6 columns">
|
||||||
<p class="size-12"><span translate>Confirmations</span>: {{btx.confirmations || 0}}</p>
|
<p class="size-12"><span translate>Fee</span>: {{btx.fees | noFractionNumber}} {{$root.wallet.settings.unitName}}</p>
|
||||||
</div>
|
<p class="size-12"><span translate>Confirmations</span>: {{btx.confirmations || 0}}</p>
|
||||||
<div class="large-6 medium-6 small-6 columns text-right">
|
</div>
|
||||||
<p class="label size-14"><span translate>Total</span>: {{btx.valueOut| noFractionNumber}} {{$root.wallet.settings.unitName}}</p>
|
<div class="large-6 medium-6 small-6 columns text-right">
|
||||||
|
<p class="label size-14"><span translate>Total</span>: {{btx.valueOut| noFractionNumber}} {{$root.wallet.settings.unitName}}</p>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue