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

Merge pull request #5260 from mempool/simon/tx-page-ui-jump

Browse Source 
Fix accelerator ui jumps
This commit is contained in:
softsimon 2024-07-03 17:31:07 +09:00 committed by GitHub
commit 6ce1970ef4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 14 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
frontend/src/app/components/transaction/transaction.component.html
View File

@ -6,16 +6,6 @@
<app-truncate [text]="rbfTransaction.txid" [lastChars]="12" [link]="['/tx/' | relativeUrl, rbfTransaction.txid]"></app-truncate> <app-truncate [text]="rbfTransaction.txid" [lastChars]="12" [link]="['/tx/' | relativeUrl, rbfTransaction.txid]"></app-truncate>
</div> </div>
<!-- <div *ngIf="tx && acceleratorAvailable && accelerateCtaType === 'alert' && !tx.status.confirmed && !tx.acceleration" class="alert alert-dismissible alert-purple" role="alert">
<div>
<a class="btn btn-sm blink-bg" (click)="onAccelerateClicked()">Accelerate</a>
<span class="align-middle">this transaction using Mempool Accelerator &trade;</span>
</div>
<button type="button" class="close" aria-label="Close" (click)="dismissAccelAlert()">
<span aria-hidden="true">&times;</span>
</button>
</div> -->
<ng-container *ngIf="!rbfTransaction || rbfTransaction?.size || tx"> <ng-container *ngIf="!rbfTransaction || rbfTransaction?.size || tx">
<h1 i18n="shared.transaction">Transaction</h1> <h1 i18n="shared.transaction">Transaction</h1>
@ -133,7 +123,7 @@
</ng-template> </ng-template>
<!-- Accelerator --> <!-- Accelerator -->
<ng-container *ngIf="!tx?.status?.confirmed && showAccelerationSummary"> <ng-container *ngIf="!tx?.status?.confirmed && showAccelerationSummary && (ETA$ | async) as eta;">
<br> <br>
<div class="title float-left"> <div class="title float-left">
<h2 i18n="transaction.accelerate|Accelerate button label">Accelerate</h2> <h2 i18n="transaction.accelerate|Accelerate button label">Accelerate</h2>
@ -144,21 +134,19 @@
<div class="clearfix"></div> <div class="clearfix"></div>
<ng-container *ngIf="(ETA$ | async) as eta;"> <app-accelerate-checkout
<app-accelerate-checkout *ngIf="(da$ | async) as da;"
*ngIf="(da$ | async) as da;" [cashappEnabled]="cashappEligible"
[cashappEnabled]="cashappEligible" [advancedEnabled]="true"
[advancedEnabled]="true" [tx]="tx"
[tx]="tx" [eta]="eta"
[eta]="eta" [miningStats]="miningStats"
[miningStats]="miningStats" [scrollEvent]="scrollIntoAccelPreview"
[scrollEvent]="scrollIntoAccelPreview" [showDetails]="showAccelerationDetails"
[showDetails]="showAccelerationDetails" [noCTA]="true"
[noCTA]="true" (hasDetails)="setHasAccelerationDetails($event)"
(hasDetails)="setHasAccelerationDetails($event)" class="h-100 w-100"
class="h-100 w-100" ></app-accelerate-checkout>
></app-accelerate-checkout>
</ng-container>
</ng-container> </ng-container>
<br> <br>
@ -598,8 +586,6 @@
</td> </td>
</tr> </tr>
} }
} @else {
<ng-container *ngTemplateOutlet="skeletonDetailsRow"></ng-container>
} }
</ng-template> </ng-template>