mirror of https://github.com/BTCPrivate/copay.git
Fixes transactions and send pages
This commit is contained in:
Gustavo Maximiliano Cortez
parent
d7adc854c9
commit
5921a1f1ae
10
css/main.css
10
css/main.css
|
|
@ -251,7 +251,7 @@ a:hover {
|
||||||
margin-bottom: 1rem;
|
margin-bottom: 1rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
.box-note {
|
.send-note {
|
||||||
font-style: italic;
|
font-style: italic;
|
||||||
color: gray;
|
color: gray;
|
||||||
background-color: #EDEDF5;
|
background-color: #EDEDF5;
|
||||||
|
|
@ -259,6 +259,14 @@ a:hover {
|
||||||
width: 400px;
|
width: 400px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.box-note {
|
||||||
|
text-align: center;
|
||||||
|
clear: both;
|
||||||
|
font-style: italic;
|
||||||
|
color: gray;
|
||||||
|
margin-bottom: 10px;
|
||||||
|
}
|
||||||
|
|
||||||
.button-setup a {
|
.button-setup a {
|
||||||
display: block;
|
display: block;
|
||||||
padding: 20px 30px;
|
padding: 20px 30px;
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
<div class="text-center">
|
<div class="text-center">
|
||||||
<qrcode size="160" data="{{address.address}}"></qrcode>
|
<qrcode size="160" data="{{address.address}}"></qrcode>
|
||||||
<h2>{{address.address}}</h2>
|
<h4>{{address.address}}</h4>
|
||||||
<div>
|
<div>
|
||||||
<span ng-if="$root.updatingBalance">
|
<span ng-if="$root.updatingBalance">
|
||||||
<i class="fi-bitcoin-circle icon-rotate spinner"></i>
|
<i class="fi-bitcoin-circle icon-rotate spinner"></i>
|
||||||
|
|
|
||||||
|
|
@ -103,7 +103,7 @@
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="large-6 columns">
|
<div class="large-6 columns">
|
||||||
<div class="box-note">
|
<div class="send-note">
|
||||||
<h6>Send to</h6>
|
<h6>Send to</h6>
|
||||||
<p class="text-gray" ng-class="{'hidden': sendForm.address.$invalid || !address}">
|
<p class="text-gray" ng-class="{'hidden': sendForm.address.$invalid || !address}">
|
||||||
{{address}}
|
{{address}}
|
||||||
|
|
@ -124,7 +124,7 @@
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="large-12 columns line-dashed">
|
<div class="large-12 columns line-dashed">
|
||||||
<h3>Address Book</h3>
|
<h2>Address Book</h2>
|
||||||
<p class="text-gray" ng-hide="showAddressBook()">Empty. Create an alias for your addresses</p>
|
<p class="text-gray" ng-hide="showAddressBook()">Empty. Create an alias for your addresses</p>
|
||||||
<table ng-show="showAddressBook()">
|
<table ng-show="showAddressBook()">
|
||||||
<thead>
|
<thead>
|
||||||
|
|
|
||||||
|
|
@ -1,176 +1,178 @@
|
||||||
<div class="transactions" data-ng-controller="TransactionsController">
|
<div class="transactions" data-ng-controller="TransactionsController">
|
||||||
<div class="row" ng-show='$root.wallet.isReady()'>
|
<div ng-show='$root.wallet.isReady()'>
|
||||||
<div class="large-12 columns" ng-show="wallet.totalCopayers > 1">
|
<h1 ng-show="wallet.totalCopayers > 1"> Transaction proposals <small>({{txs.length}})</small></h1>
|
||||||
<h1> Transaction proposals <small>({{txs.length}})</small></h1>
|
<div class="row">
|
||||||
|
<div class="large-12 columns" ng-show="wallet.totalCopayers > 1">
|
||||||
<ul class="inline-list">
|
<ul class="inline-list">
|
||||||
<li> <a class="text-gray size-12" ng-click="show(true)" ng-disabled="loading || onlyPending" loading="Updating" ng-class="{'active' : onlyPending}"> [ Pending ] </a> </li>
|
<li> <a class="text-gray size-12" ng-click="show(true)" ng-disabled="loading || onlyPending" loading="Updating" ng-class="{'active' : onlyPending}"> [ Pending ] </a> </li>
|
||||||
<li> <a class="text-gray size-12" ng-click="show()" ng-disabled="loading || !onlyPending" loading="Updating" ng-class="{'active' : !onlyPending}"> [ All ] </a> </li>
|
<li> <a class="text-gray size-12" ng-click="show()" ng-disabled="loading || !onlyPending" loading="Updating" ng-class="{'active' : !onlyPending}"> [ All ] </a> </li>
|
||||||
</ul>
|
</ul>
|
||||||
<div class="last-transactions" ng-repeat="tx in txs | paged">
|
<div class="last-transactions" ng-repeat="tx in txs | paged">
|
||||||
<div class="last-transactions-header row">
|
<div class="last-transactions-header row">
|
||||||
<div class="large-8 medium-8 small-12 columns">
|
<div class="large-8 medium-8 small-12 columns">
|
||||||
<div class="row" ng-repeat="out in tx.outs">
|
<div class="row" ng-repeat="out in tx.outs">
|
||||||
<div class="large-3 medium-3 small-3 columns ellipsis">
|
<div class="large-3 medium-3 small-3 columns ellipsis">
|
||||||
{{out.value | noFractionNumber}} {{$root.unitName}}</div>
|
{{out.value | noFractionNumber}} {{$root.unitName}}</div>
|
||||||
<div class="large-1 medium-1 small-2 columns fi-arrow-right size-24"> </div>
|
<div class="large-1 medium-1 small-2 columns fi-arrow-right size-24"> </div>
|
||||||
<div class="large-8 medium-8 small-7 columns ellipsis">
|
<div class="large-8 medium-8 small-7 columns ellipsis">
|
||||||
<contact address="{{out.address}}" tooltip-popup-delay="500" tooltip tooltip-placement="right"/>
|
<contact address="{{out.address}}" tooltip-popup-delay="500" tooltip tooltip-placement="right"/>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
<div class="large-4 medium-4 small-12 columns text-right">
|
||||||
<div class="large-4 medium-4 small-12 columns text-right">
|
<h6>{{tx.createdTs | amCalendar}}</h6>
|
||||||
<h6>{{tx.createdTs | amCalendar}}</h6>
|
</div>
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="last-transactions-content">
|
|
||||||
<div class="box-note large-12" ng-show="tx.comment">
|
|
||||||
"{{tx.comment}}" - {{$root.wallet.publicKeyRing.nicknameForCopayer(tx.creator)}}
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="box-copayer" ng-repeat="(cId, actions) in tx.peerActions">
|
<div class="last-transactions-content">
|
||||||
|
<div class="box-note large-12" ng-show="tx.comment">
|
||||||
|
"{{tx.comment}}" - {{$root.wallet.publicKeyRing.nicknameForCopayer(tx.creator)}}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="box-copayer" ng-repeat="(cId, actions) in tx.peerActions">
|
||||||
<a href="/transactions" class="has-tip" tooltip-popup-delay="1000" tooltip="{{cId === $root.wallet.getMyCopayerId() ? 'You' : $root.wallet.publicKeyRing.nicknameForCopayer(cId)}}">
|
<a href="/transactions" class="has-tip" tooltip-popup-delay="1000" tooltip="{{cId === $root.wallet.getMyCopayerId() ? 'You' : $root.wallet.publicKeyRing.nicknameForCopayer(cId)}}">
|
||||||
<img class="copayer-ico br100" src="./img/satoshi.gif" alt="{{cId}}">
|
<img class="copayer-ico br100" src="./img/satoshi.gif" alt="{{cId}}">
|
||||||
</a>
|
</a>
|
||||||
<div class="box-status">
|
<div class="box-status">
|
||||||
<span ng-repeat="(action, ts) in actions">
|
<span ng-repeat="(action, ts) in actions">
|
||||||
<a ng-if="action == 'create'" href="/transactions" tooltip-popup-delay="1000" tooltip="Created {{ts | amTimeAgo}}">
|
<a ng-if="action == 'create'" href="/transactions" tooltip-popup-delay="1000" tooltip="Created {{ts | amTimeAgo}}">
|
||||||
<i class="fi-crown icon-status icon-active"></i>
|
<i class="fi-crown icon-status icon-active"></i>
|
||||||
</a>
|
</a>
|
||||||
<a ng-if="action == 'seen'" href="/transactions" tooltip-popup-delay="1000" tooltip="Seen {{ts | amTimeAgo}}">
|
<a ng-if="action == 'seen'" href="/transactions" tooltip-popup-delay="1000" tooltip="Seen {{ts | amTimeAgo}}">
|
||||||
<i class="fi-eye icon-status icon-active"></i>
|
<i class="fi-eye icon-status icon-active"></i>
|
||||||
</a>
|
</a>
|
||||||
<a ng-if="action == 'sign'" href="/transactions" tooltip-popup-delay="1000" tooltip="Signed {{ts | amTimeAgo}}">
|
<a ng-if="action == 'sign'" href="/transactions" tooltip-popup-delay="1000" tooltip="Signed {{ts | amTimeAgo}}">
|
||||||
<i class="fi-check icon-status icon-active-check"></i>
|
<i class="fi-check icon-status icon-active-check"></i>
|
||||||
</a>
|
</a>
|
||||||
<a ng-if="action == 'rejected'" href="/transactions" tooltip-popup-delay="1000" tooltip="Rejected {{ts | amTimeAgo}}">
|
<a ng-if="action == 'rejected'" href="/transactions" tooltip-popup-delay="1000" tooltip="Rejected {{ts | amTimeAgo}}">
|
||||||
<i class="fi-x icon-status icon-active-x"></i>
|
<i class="fi-x icon-status icon-active-x"></i>
|
||||||
</a>
|
</a>
|
||||||
</span>
|
</span>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="text-center">
|
||||||
|
{{$root.wallet.publicKeyRing.nicknameForCopayer(cId)}}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="row last-transactions-footer">
|
||||||
|
<div class="large-5 medium-5 columns" ng-show="!tx.sentTs">
|
||||||
|
<div ng-show="!tx.signedByUs && !tx.rejectedByUs && !tx.finallyRejected && tx.missingSignatures">
|
||||||
|
<button class="secondary radius m10r" ng-click="sign(tx.ntxid)" ng-disabled="loading" loading="Signing">
|
||||||
|
<i class="fi-check"></i> Sign
|
||||||
|
</button>
|
||||||
|
<button class="warning radius" ng-click="reject(tx.ntxid)" ng-disabled="loading" loading="Rejecting">
|
||||||
|
<i class="fi-x" ></i> Reject
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
<div ng-show="!tx.missingSignatures && !tx.sentTs">
|
||||||
|
<button class="primary radius" ng-click="send(tx.ntxid)" ng-disabled="loading" loading="Broadcasting"> <i class=".fi-upload-cloud"></i>
|
||||||
|
Broadcast Transaction
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="text-center">
|
<div class="large-7 medium-7 columns text-right">
|
||||||
{{$root.wallet.publicKeyRing.nicknameForCopayer(cId)}}
|
<div ng-show="tx.finallyRejected" class="text-warning m10b">
|
||||||
</div>
|
Transaction finally rejected
|
||||||
</div>
|
</div>
|
||||||
</div>
|
<div ng-show="!tx.missingSignatures && tx.sentTs">
|
||||||
|
<div class="success m10b">
|
||||||
<div class="row last-transactions-footer">
|
<strong>Sent</strong> <span class="text-gray" am-time-ago="tx.sentTs"></span>
|
||||||
<div class="large-5 medium-5 columns" ng-show="!tx.sentTs">
|
</div>
|
||||||
<div ng-show="!tx.signedByUs && !tx.rejectedByUs && !tx.finallyRejected && tx.missingSignatures">
|
<div class="ellipsis small">
|
||||||
<button class="secondary radius m10r" ng-click="sign(tx.ntxid)" ng-disabled="loading" loading="Signing">
|
Transaction ID:
|
||||||
<i class="fi-check"></i> Sign
|
<a href="http://{{getShortNetworkName()}}.insight.is/tx/{{tx.sentTxid}}" target="blank">
|
||||||
</button>
|
{{tx.sentTxid}}
|
||||||
<button class="warning radius" ng-click="reject(tx.ntxid)" ng-disabled="loading" loading="Rejecting">
|
</a>
|
||||||
<i class="fi-x" ></i> Reject
|
</div>
|
||||||
</button>
|
</div>
|
||||||
</div>
|
<p class="text-gray m5b" ng-show="!tx.finallyRejected && tx.missingSignatures==1">
|
||||||
<div ng-show="!tx.missingSignatures && !tx.sentTs">
|
One signature missing
|
||||||
<button class="primary radius" ng-click="send(tx.ntxid)" ng-disabled="loading" loading="Broadcasting"> <i class=".fi-upload-cloud"></i>
|
</p>
|
||||||
Broadcast Transaction
|
<p class="text-gray m5b" ng-show="!tx.finallyRejected && tx.missingSignatures>1">
|
||||||
</button>
|
{{tx.missingSignatures}} signatures missing</p>
|
||||||
</div>
|
<div class="ellipsis small text-gray">
|
||||||
</div>
|
<strong>Fee:</strong> {{tx.fee|noFractionNumber}} {{$root.unitName}}
|
||||||
|
<strong>Proposal ID:</strong> {{tx.ntxid}}
|
||||||
<div class="large-7 medium-7 columns text-right">
|
</div>
|
||||||
<div ng-show="tx.finallyRejected" class="text-warning m10b">
|
|
||||||
Transaction finally rejected
|
|
||||||
</div>
|
|
||||||
<div ng-show="!tx.missingSignatures && tx.sentTs">
|
|
||||||
<div class="success m10b">
|
|
||||||
<strong>Sent</strong> <span class="text-gray" am-time-ago="tx.sentTs"></span>
|
|
||||||
</div>
|
|
||||||
<div class="ellipsis small">
|
|
||||||
Transaction ID:
|
|
||||||
<a href="http://{{getShortNetworkName()}}.insight.is/tx/{{tx.sentTxid}}" target="blank">
|
|
||||||
{{tx.sentTxid}}
|
|
||||||
</a>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<p class="text-gray m5b" ng-show="!tx.finallyRejected && tx.missingSignatures==1">
|
|
||||||
One signature missing
|
|
||||||
</p>
|
|
||||||
<p class="text-gray m5b" ng-show="!tx.finallyRejected && tx.missingSignatures>1">
|
|
||||||
{{tx.missingSignatures}} signatures missing</p>
|
|
||||||
<div class="ellipsis small text-gray">
|
|
||||||
<strong>Fee:</strong> {{tx.fee|noFractionNumber}} {{$root.unitName}}
|
|
||||||
<strong>Proposal ID:</strong> {{tx.ntxid}}
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
<p ng-show="onlyPending && txs.length == 0">No pending transactions proposals.</p>
|
||||||
|
<p ng-show="!onlyPending && txs.length == 0">No transactions proposals yet.</p>
|
||||||
|
<pagination ng-show="!onlyPending && txs.length > txpItemsPerPage" total-items="txs.length" items-per-page="txpItemsPerPage" page="txpCurrentPage" on-select-page="show()" class="pagination-small primary"></pagination>
|
||||||
</div>
|
</div>
|
||||||
<p ng-show="onlyPending && txs.length == 0">No pending transactions proposals.</p>
|
|
||||||
<p ng-show="!onlyPending && txs.length == 0">No transactions proposals yet.</p>
|
|
||||||
<pagination ng-show="!onlyPending && txs.length > txpItemsPerPage" total-items="txs.length" items-per-page="txpItemsPerPage" page="txpCurrentPage" on-select-page="show()" class="pagination-small primary"></pagination>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="large-12 columns line-dashed-h" ng-hide="wallet.totalCopayers == 1"></div>
|
|
||||||
|
|
||||||
<div class="large-12 columns">
|
|
||||||
<h1>
|
|
||||||
Last transactions
|
|
||||||
<small ng-hide="wallet.totalCopayers > 1 || !loading">
|
|
||||||
<i class="fi-bitcoin-circle icon-rotate spinner"></i>
|
|
||||||
</small>
|
|
||||||
</h1>
|
|
||||||
<div class="m10b size-12" ng-hide="wallet.totalCopayers == 1">
|
|
||||||
<a class="text-gray active" ng-click="toogleLast()" ng-disabled="loading" loading="Loading" ng-hide="lastShowed && !loading">[ Show ]</a>
|
|
||||||
<a class="text-gray" ng-click="toogleLast()" ng-disabled="loading" loading="Loading" ng-show="lastShowed && !loading">[ Hide ]</a>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="btransactions" ng-if="lastShowed">
|
<h1 ng-class="{'line-dashed': wallet.totalCopayers > 1}">
|
||||||
<div ng-if="!blockchain_txs[0].txid && !loading">
|
Last transactions
|
||||||
No transactions yet.
|
<small ng-hide="wallet.totalCopayers > 1 || !loading">
|
||||||
|
<i class="fi-bitcoin-circle icon-rotate spinner"></i>
|
||||||
|
</small>
|
||||||
|
</h1>
|
||||||
|
|
||||||
|
<div class="row">
|
||||||
|
<div class="large-12 columns">
|
||||||
|
<div class="m10b size-12" ng-hide="wallet.totalCopayers == 1">
|
||||||
|
<a class="text-gray active" ng-click="toogleLast()" ng-disabled="loading" loading="Loading" ng-hide="lastShowed && !loading">[ Show ]</a>
|
||||||
|
<a class="text-gray" ng-click="toogleLast()" ng-disabled="loading" loading="Loading" ng-show="lastShowed && !loading">[ Hide ]</a>
|
||||||
</div>
|
</div>
|
||||||
<div class="last-transactions" ng-repeat="btx in blockchain_txs | orderBy: 'time':true">
|
|
||||||
<div class="last-transactions-header">
|
<div class="btransactions" ng-if="lastShowed">
|
||||||
<div class="row">
|
<div ng-if="!blockchain_txs[0].txid && !loading">
|
||||||
<div class="large-8 columns">
|
No transactions yet.
|
||||||
<a class="ellipsis" href="http://{{getShortNetworkName()}}.insight.is/tx/{{btx.txid}}" target="blank">
|
</div>
|
||||||
{{btx.txid}}
|
<div class="last-transactions" ng-repeat="btx in blockchain_txs | orderBy: 'time':true">
|
||||||
</a>
|
<div class="last-transactions-header">
|
||||||
</div>
|
<div class="row">
|
||||||
<div class="large-4 columns text-right">
|
<div class="large-8 columns">
|
||||||
<div data-ng-show="btx.firstSeenTs">
|
<a class="ellipsis" href="http://{{getShortNetworkName()}}.insight.is/tx/{{btx.txid}}" target="blank">
|
||||||
first seen at
|
{{btx.txid}}
|
||||||
<time>{{btx.firstSeenTs * 1000 | amCalendar}}</time>
|
</a>
|
||||||
</div>
|
</div>
|
||||||
<div data-ng-show="btx.time && !btx.firstSeenTs">
|
<div class="large-4 columns text-right">
|
||||||
mined at
|
<div data-ng-show="btx.firstSeenTs">
|
||||||
<time>{{btx.time * 1000 | amCalendar}}</time>
|
first seen at
|
||||||
|
<time>{{btx.firstSeenTs * 1000 | amCalendar}}</time>
|
||||||
|
</div>
|
||||||
|
<div data-ng-show="btx.time && !btx.firstSeenTs">
|
||||||
|
mined at
|
||||||
|
<time>{{btx.time * 1000 | amCalendar}}</time>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
<div class="last-transactions-content">
|
||||||
<div class="last-transactions-content">
|
<div class="row">
|
||||||
<div class="row">
|
<div class="large-5 medium-5 small-5 columns">
|
||||||
<div class="large-5 medium-5 small-5 columns">
|
<div ng-repeat="vin in btx.vinSimple">
|
||||||
<div ng-repeat="vin in btx.vinSimple">
|
<small class="right m5t">{{vin.value| noFractionNumber}} {{$root.unitName}}</small>
|
||||||
<small class="right m5t">{{vin.value| noFractionNumber}} {{$root.unitName}}</small>
|
<p class="ellipsis text-gray size-12">
|
||||||
<p class="ellipsis text-gray size-12">
|
<contact address="{{vin.addr}}" tooltip-popup-delay="500" tooltip tooltip-placement="right"/>
|
||||||
<contact address="{{vin.addr}}" tooltip-popup-delay="500" tooltip tooltip-placement="right"/>
|
</p>
|
||||||
</p>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
<div class="large-1 medium-1 small-1 columns text-center">
|
||||||
<div class="large-1 medium-1 small-1 columns text-center">
|
<i class="fi-arrow-right"></i>
|
||||||
<i class="fi-arrow-right"></i>
|
</div>
|
||||||
</div>
|
<div class="large-6 medium-6 small-6 columns">
|
||||||
<div class="large-6 medium-6 small-6 columns">
|
<div ng-repeat="vout in btx.voutSimple">
|
||||||
<div ng-repeat="vout in btx.voutSimple">
|
<small class="right m5t">{{vout.value| noFractionNumber}} {{$root.unitName}}</small>
|
||||||
<small class="right m5t">{{vout.value| noFractionNumber}} {{$root.unitName}}</small>
|
<p class="ellipsis text-gray size-12">
|
||||||
<p class="ellipsis text-gray size-12">
|
<contact address="{{vout.addr}}" tooltip-popup-delay="500" tooltip tooltip-placement="right"/>
|
||||||
<contact address="{{vout.addr}}" tooltip-popup-delay="500" tooltip tooltip-placement="right"/>
|
</p>
|
||||||
</p>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
<div class="last-transactions-footer">
|
||||||
<div class="last-transactions-footer">
|
<div class="row">
|
||||||
<div class="row">
|
<div class="large-4 medium-4 small-4 columns">Fees: {{btx.fees | noFractionNumber}} {{$root.unitName}}</div>
|
||||||
<div class="large-4 medium-4 small-4 columns">Fees: {{btx.fees | noFractionNumber}} {{$root.unitName}}</div>
|
<div class="large-4 medium-4 small-4 columns text-center">Confirmations: {{btx.confirmations || 0}}</div>
|
||||||
<div class="large-4 medium-4 small-4 columns text-center">Confirmations: {{btx.confirmations || 0}}</div>
|
<div class="large-4 medium-4 small-4 columns text-right">Total: {{btx.valueOut| noFractionNumber}} {{$root.unitName}}</div>
|
||||||
<div class="large-4 medium-4 small-4 columns text-right">Total: {{btx.valueOut| noFractionNumber}} {{$root.unitName}}</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue