machankura/mempool
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #4977 from mempool/nymkappa/fix-copy

Browse Source 
[accelerator] fix pizza accel copy/eta
This commit is contained in:
wiz 2024-04-16 21:14:56 +09:00 committed by GitHub
commit d9dec44c8f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.html
View File

@ -21,7 +21,7 @@
<input type="radio" class="form-check-input" id="accelerate" name="accelerate" (change)="selectedOptionChanged($event)"> <input type="radio" class="form-check-input" id="accelerate" name="accelerate" (change)="selectedOptionChanged($event)">
<label class="form-check-label d-flex flex-column" for="accelerate"> <label class="form-check-label d-flex flex-column" for="accelerate">
<span class="font-weight-bold">Accelerate</span> <span class="font-weight-bold">Accelerate</span>
<span style="color: rgb(186, 186, 186); font-size: 14px;">Settlement expected in ~1 hour or less<br> <span style="color: rgb(186, 186, 186); font-size: 14px;">Confirmation expected within ~30 minutes<br>
@if (!calculating) { @if (!calculating) {
<app-fiat [value]="cost"></app-fiat>fee (<span><small style="font-family: monospace;">{{ cost | number }}</small>&nbsp;<span class="symbol" i18n="shared.sats|sats">sats</span></span>) <app-fiat [value]="cost"></app-fiat>fee (<span><small style="font-family: monospace;">{{ cost | number }}</small>&nbsp;<span class="symbol" i18n="shared.sats|sats">sats</span></span>)
} @else { } @else {
@ -38,7 +38,13 @@
<input type="radio" class="form-check-input" id="wait" name="accelerate" (change)="selectedOptionChanged($event)"> <input type="radio" class="form-check-input" id="wait" name="accelerate" (change)="selectedOptionChanged($event)">
<label class="form-check-label d-flex flex-column" for="wait"> <label class="form-check-label d-flex flex-column" for="wait">
<span class="font-weight-bold">Wait</span> <span class="font-weight-bold">Wait</span>
<span style="color: rgb(186, 186, 186); font-size: 14px;">Settlement expected to occur <app-time kind="within" [time]="eta" [fastRender]="false" [fixedRender]="true"></app-time></span> @if (eta) {
<span style="color: rgb(186, 186, 186); font-size: 14px;">Confirmation expected <app-time kind="within" [time]="eta" [fastRender]="false" [fixedRender]="true"></app-time></span>
} @else {
<span style="color: rgb(186, 186, 186); font-size: 14px;">
<span>Settlement expected within several hours</span>
</span>
}
</label> </label>
</div> </div>
</div> </div>

2
frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.ts
View File

@ -11,7 +11,7 @@ import { AudioService } from '../../services/audio.service';
styleUrls: ['./accelerate-checkout.component.scss'] styleUrls: ['./accelerate-checkout.component.scss']
}) })
export class AccelerateCheckout implements OnInit, OnDestroy { export class AccelerateCheckout implements OnInit, OnDestroy {
@Input() eta: number = Date.now() + 123456789; @Input() eta: number | null = null;
@Input() txid: string = '70c18d76cdb285a1b5bd87fdaae165880afa189809c30b4083ff7c0e69ee09ad'; @Input() txid: string = '70c18d76cdb285a1b5bd87fdaae165880afa189809c30b4083ff7c0e69ee09ad';
@Input() scrollEvent: boolean; @Input() scrollEvent: boolean;
@Output() close = new EventEmitter<null>(); @Output() close = new EventEmitter<null>();