BTCPrivate
/
copay
mirror of https://github.com/BTCPrivate/copay.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #8031 from gabrielbazan7/ref/txtxpdetails 

[V4] REF: UI tx and txp details
This commit is contained in:
Gustavo Maximiliano Cortez 2018-02-13 15:18:24 -03:00 committed by GitHub
parent 647e5e9490 bc2f9eddd9
commit 4ec2ee4793
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 63 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/pages/tx-details/tx-details.html
View File

@ -5,8 +5,7 @@
</ion-header>
<ion-content no-bounce>
<ion-card *ngIf="btx">
<ion-card-content>
<div *ngIf="btx" padding>
<div class="sending-label" *ngIf="btx.confirmations > 0">
<img class="sending-img" src="assets/img/tx-action/icon-sent.svg" width="40" *ngIf="btx.action === 'sent'">
<img class="sending-img" src="assets/img/tx-action/icon-received.svg" width="40" *ngIf="btx.action === 'received'">
@ -34,8 +33,7 @@
</span>
</div>
</div>
</ion-card-content>
</ion-card>
</div>
<ion-list *ngIf="btx">
<ion-item *ngIf="btx.action === 'sent'">

39
src/pages/txp-details/txp-details.html
View File

@ -13,8 +13,7 @@
<ion-content no-bounce>
<ion-card>
<ion-card-content>
<div padding>
<div class="sending-label">
<img class="sending-img" src="assets/img/icon-tx-sent-outline.svg">
<span translate>Sending</span>
@ -23,38 +22,31 @@
<div class="amount">{{tx.amountStr}}</div>
<div class="alternative" *ngIf="tx.alternativeAmountStr">{{tx.alternativeAmountStr}}</div>
</div>
</ion-card-content>
</ion-card>
</div>
<ion-card *ngIf="tx.removed">
<ion-card-content>
<ion-item *ngIf="tx.removed" text-wrap>
<span translate>The payment was removed by creator</span>
</ion-card-content>
</ion-card>
</ion-item>
<ion-card *ngIf="tx.status != 'pending'">
<ion-card-content>
<div *ngIf="tx.status != 'pending'">
<div *ngIf="tx.status == 'accepted' && !tx.isGlidera">
<div translate>Payment accepted, but not yet broadcasted</div>
<button ion-button block type="button" (click)="broadcast(tx)" [disabled]="loading">
<ion-item text-wrap translate>Payment accepted, but not yet broadcasted</ion-item>
<button ion-item class="btn-broadcast" icon-left (click)="broadcast(tx)" [disabled]="loading">
<ion-icon name="cloud-upload"></ion-icon>
<span translate>Broadcast Payment</span>
</button>
</div>
<div *ngIf="tx.status == 'accepted' && tx.isGlidera">
<div translate>Payment accepted. It will be broadcasted by Glidera. In case there is a problem, it can be deleted 6 hours after
it was created.</div>
<ion-item *ngIf="tx.status == 'accepted' && tx.isGlidera" text-wrap>
<span translate>Payment accepted. It will be broadcasted by Glidera. In case there is a problem, it can be deleted 6 hours after it
was created.</span>
</ion-item>
<ion-item *ngIf="tx.status == 'broadcasted'" text-wrap translate>Payment Sent</ion-item>
<ion-item *ngIf="tx.status =='rejected'" text-wrap translate>Payment Rejected</ion-item>
</div>
<div *ngIf="tx.status == 'broadcasted'" translate>Payment Sent</div>
<div *ngIf="tx.status =='rejected'" translate>Payment Rejected</div>
</ion-card-content>
</ion-card>
<ion-card *ngIf="!currentSpendUnconfirmed && tx.hasUnconfirmedInputs">
<ion-card-content>
<ion-item *ngIf="!currentSpendUnconfirmed && tx.hasUnconfirmedInputs">
<span translate>Warning: this transaction has unconfirmed inputs</span>
</ion-card-content>
</ion-card>
</ion-item>
<ion-list>
<ion-item class="container-to">
@ -101,7 +93,6 @@
<div>
<div class="wallet" *ngIf="wallet">
<img class="icon-wallet" src="assets/img/icon-wallet.svg" />
<!-- TODO ng-include="'views/includes/walletIcon.html'" -->
<div>{{wallet.name}}</div>
</div>
</div>

3
src/pages/txp-details/txp-details.scss
View File

@ -140,5 +140,8 @@ page-txp-details {
.btn-remove {
color: color($colors, danger);
}
.btn-broadcast {
color: color($colors, primary);
}
}