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

ui tx proposal pending

Browse source
This commit is contained in:
bechi 2015-12-03 15:07:38 -03:00
commit 0ed427070a
3 changed files with 54 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

55
public/views/includes/transaction.html
View file

@ -1,37 +1,36 @@
<div class="ng-animate-disabled row collapse last-transactions-content line-b"
ng-class="{'text-gray':!tx.pendingForUs}"
ng-click="home.openTxpModal(tx, index.copayers, !!index.glideraStatus)">
<div class="small-1 columns text-center" >
<i class="icon-circle-active size-10" ng-show="tx.pendingForUs" ng-style="{'color':index.backgroundColor}" style="margin-top:8px;"></i>
&nbsp;
</div>
<div class="small-10 columns">
<div>
<span class="text-bold size-16"><span translate>Send</span> {{tx.amountStr}}</span>
<time class="right size-12 text-gray m5t">{{ (tx.ts || tx.createdOn ) * 1000 | amTimeAgo}}</time>
</div>
<div class="ellipsis size-14">
<span ng-if="tx.hasMultiplesOutputs">
<span translate>Recipients</span>:
<span>{{tx.recipientCount}}</span>
<div class="large-6 medium-6 small-6 columns size-14">
<div class="m10r left pr">
<i class="icon-circle-active size-10" ng-show="tx.pendingForUs" ng-style="{'color':index.backgroundColor}"></i>
<img src="img/icon-proposal.svg" alt="sync" width="40">
</div>
<div class="m10t">
<span ng-if="!tx.merchant">
{{index.addressbook[tx.toAddress]}}
<span ng-show="!index.addressbook[tx.toAddress] && tx.message">
<span class="ellipsis">{{tx.message}}</span>
</span>
<span ng-if="!tx.hasMultiplesOutputs">
<span translate>To</span>:
<span ng-if="tx.merchant">
<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 ng-if="!tx.merchant">
{{index.addressbook[tx.toAddress] || tx.toAddress}}
</span>
<span ng-show="!index.addressbook[tx.toAddress] && !tx.message">
<span translate> Sending</span>
</span>
</div>
<div class="ellipsis text-gray size-14">
{{tx.message}}
</div>
</span>
<span ng-if="tx.merchant">
<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>
</div>
</div>
<div class="small-1 columns text-right">
<br>
<div class="large-5 medium-5 small-5 columns text-right">
<span class="size-16">
- {{tx.amountStr}}
</span>
<div class="size-12 text-gray">
<time>{{ (tx.ts || tx.createdOn ) * 1000 | amTimeAgo}}</time>
</div>
</div>
<div class="large-1 medium-1 small-1 columns text-right m10t">
<i class="icon-arrow-right3 size-18"></i>
</div>
</div>