Skip to content
Permalink
Browse files

Merge pull request #10207 from cmgustavo/bug/paypro-confirm-view-01

fix(confirm): hide paypro info until wallet is selected
  • Loading branch information...
gabrielbazan7 committed Oct 9, 2019
2 parents 0aec7c0 + 636db45 commit ee45c6d51e17b07a27f3002ba05b1cba60205464
Showing with 4 additions and 4 deletions.
  1. +4 −4 src/pages/send/confirm/confirm.html
@@ -56,13 +56,13 @@
</div>
</button>

<ion-item *ngIf="tx.paypro">
<ion-item *ngIf="tx.paypro && wallet">
<span translate>Payment Expires:</span>
<ion-note *ngIf="!paymentExpired" item-end>{{remainingTimeStr}}</ion-note>
<ion-note *ngIf="paymentExpired" [ngStyle]="{'color': 'red'}" item-end>{{'Expired' | translate}}</ion-note>
</ion-item>

<ion-item class="container-to">
<ion-item class="container-to" *ngIf="wallet">
<span translate>To</span>

<div class="payment-proposal-to address-coppied" *ngIf="!tx.recipientType">
@@ -183,9 +183,9 @@ <h3>
</ion-content>

<ion-footer>
<page-slide-to-accept #slideButton *ngIf="isCordova" [ngClass]="{'slide-confirm-fast slide-confirm-down': hideSlideButton, 'slide-confirm-slow': !hideSlideButton}" [disabled]="!wallet || !tx?.txp[wallet.id]" [buttonText]="buttonText" (slideDone)="approve(tx, wallet)">
<page-slide-to-accept #slideButton *ngIf="isCordova" [ngClass]="{'slide-confirm-fast slide-confirm-down': hideSlideButton, 'slide-confirm-slow': !hideSlideButton}" [disabled]="!wallet || !tx?.txp[wallet.id] || paymentExpired" [buttonText]="buttonText" (slideDone)="approve(tx, wallet)">
</page-slide-to-accept>
<ion-toolbar *ngIf="!isCordova">
<button ion-button full class="button-footer" (click)="approve(tx, wallet)" [disabled]="!wallet || !tx.txp[wallet.id]">{{buttonText}}</button>
<button ion-button full class="button-footer" (click)="approve(tx, wallet)" [disabled]="!wallet || !tx?.txp[wallet.id] || paymentExpired">{{buttonText}}</button>
</ion-toolbar>
</ion-footer>

0 comments on commit ee45c6d

Please sign in to comment.
You can’t perform that action at this time.