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

FIX: transaction proposal UI

This commit is contained in:
Gabriel Bazán 2018-03-20 12:37:37 -03:00
parent 2179b8aeb4
commit eb02e8815b
2 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -72,9 +72,11 @@
<div class="payment-proposal-to" copy-to-clipboard="{{tx.toAddress}}">
<img class="icon-bitcoin" src="assets/img/icon-bitcoin-small.svg" />
<!-- <contact ng-if="!tx.hasMultiplesOutputs" class="ellipsis" address="{{tx.toAddress}}"></contact> TODO -->
<span *ngIf="tx && !tx.name">{{tx.toAddress}}</span>
<span *ngIf="tx && tx.name">{{tx.name}}</span>
<span *ngIf="tx && tx.hasMultiplesOutputs" translate>Multiple recipients</span>
<div class="ellipsis">
<span *ngIf="tx && !tx.name">{{tx.toAddress}}</span>
<span *ngIf="tx && tx.name">{{tx.name}}</span>
<span *ngIf="tx && tx.hasMultiplesOutputs" translate>Multiple recipients</span>
</div>
</div>
<div *ngIf="tx && tx.hasMultiplesOutputs" (click)="showMultiplesOutputs = !showMultiplesOutputs">
@ -219,8 +221,8 @@
<ion-item-divider></ion-item-divider>
</div>
<div *ngIf="(tx && !tx.removed) && (tx && tx.canBeRemoved) || (tx && tx.status == 'accepted' && !tx.broadcastedOn)">
<button ion-item class="btn-remove" (click)="remove()" [disabled]="loading">
<div class="proposal-deletion" *ngIf="(tx && !tx.removed) && (tx && tx.canBeRemoved) || (tx && tx.status == 'accepted' && !tx.broadcastedOn)">
<button ion-button outline color="danger" class="button-standard" (click)="remove()" [disabled]="loading">
<span translate>Delete Payment Proposal</span>
</button>
<div class="proposal-deletion-help" *ngIf="!tx.isGlidera && isShared" translate>

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

@ -30,14 +30,15 @@ page-txp-details {
}
}
.proposal-deletion-help {
text-align: center;
color: color($colors, grey);
.proposal-deletion {
background-color: color($colors, blank);
padding: 2rem;
font-size: 12.5px;
.proposal-deletion-help {
text-align: center;
color: color($colors, grey);
font-size: 12.5px;
}
}
@mixin row-flex {
display: flex;
align-items: center;
@ -161,9 +162,5 @@ page-txp-details {
}
}
}
.btn-remove {
font-size: 1.2rem;
color: color($colors, danger);
}
}