Merge pull request #5339 from mempool/mononaut/fix-pizza-status

fix pizza status
This commit is contained in:
softsimon 2024-07-14 17:22:53 +09:00 committed by GitHub
commit f7f1a99486
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 75 additions and 60 deletions

View File

@ -117,7 +117,8 @@
<div class="spinner-border text-light" style="width: 1em; height: 1em"></div>
</div>
<span class="explainer">&nbsp;</span>
} @else if (showAccelerationSummary) {
} @else {
@if (!tx.status?.confirmed && showAccelerationSummary) {
<ng-container *ngIf="(ETA$ | async) as eta;">
<app-accelerate-checkout
*ngIf="(da$ | async) as da;"
@ -130,10 +131,11 @@
[eta]="eta"
[scrollEvent]="scrollIntoAccelPreview"
(unavailable)="eligibleForAcceleration = false"
class="h-100 w-100"
class="w-100"
></app-accelerate-checkout>
</ng-container>
} @else {
}
<div class="status-panel d-flex flex-column h-100 w-100 justify-content-center align-items-center" [class.small-status]="!tx.status?.confirmed && showAccelerationSummary">
@if (tx?.acceleration && !tx.status?.confirmed) {
<div class="progress-icon">
<fa-icon [icon]="['fas', 'wand-magic-sparkles']" [fixedWidth]="true"></fa-icon>
@ -179,6 +181,7 @@
}
}
}
</div>
}
</div>

View File

@ -166,7 +166,7 @@
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
justify-content: start;
.explainer {
margin: 0 1em;
@ -178,6 +178,15 @@
font-size: clamp(30px, 20vw, 150px);
}
.status-panel {
&.small-status {
min-height: 180px;
.progress-icon {
font-size: clamp(20px, 13vw, 100px);
}
}
}
.footer-link {
display: flex;
flex-direction: row;

View File

@ -596,6 +596,9 @@ export class TrackerComponent implements OnInit, OnDestroy {
this.isAccelerated$,
this.txChanged$,
]).pipe(
filter(([position, mempoolBlocks, da, isAccelerated]) => {
return this.tx && !this.tx?.status?.confirmed && position && this.tx.txid === position.txid;
}),
map(([position, mempoolBlocks, da, isAccelerated]) => {
return this.etaService.calculateETA(
this.network,