mirrors/mempool
1
0
Fork 0
mirror of https://github.com/mempool/mempool.git synced 2024-11-20 02:11:49 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3871 from mempool/mononaut/rbf-removed-not-mined

Browse Source 
Change RBF status badges
This commit is contained in:
softsimon 2023-06-17 15:05:12 +02:00 committed by GitHub
commit e5efc2957a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
frontend/cypress/e2e/mainnet/mainnet.spec.ts
View File

@ -537,7 +537,7 @@ describe('Mainnet', () => {
cy.get('.container-xl > :nth-child(3)').invoke('css', 'width').should('equal', alertWidth); cy.get('.container-xl > :nth-child(3)').invoke('css', 'width').should('equal', alertWidth);
}); });
cy.get('.btn-danger').then(getRectangle).then((rectA) => { cy.get('.btn-warning').then(getRectangle).then((rectA) => {
cy.get('.alert').then(getRectangle).then((rectB) => { cy.get('.alert').then(getRectangle).then((rectB) => {
expect(areOverlapping(rectA, rectB), 'Confirmations box and RBF alert are overlapping').to.be.false; expect(areOverlapping(rectA, rectB), 'Confirmations box and RBF alert are overlapping').to.be.false;
}); });
@ -582,7 +582,7 @@ describe('Mainnet', () => {
cy.get(alertLocator).invoke('css', 'width').should('equal', firstWidth); cy.get(alertLocator).invoke('css', 'width').should('equal', firstWidth);
}); });
cy.get('.btn-danger').then(getRectangle).then((rectA) => { cy.get('.btn-warning').then(getRectangle).then((rectA) => {
cy.get('.alert').then(getRectangle).then((rectB) => { cy.get('.alert').then(getRectangle).then((rectB) => {
expect(areOverlapping(rectA, rectB), 'Confirmations box and RBF alert are overlapping').to.be.false; expect(areOverlapping(rectA, rectB), 'Confirmations box and RBF alert are overlapping').to.be.false;
}); });

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

@ -18,7 +18,12 @@
</span> </span>
<div class="container-buttons"> <div class="container-buttons">
<app-confirmations [chainTip]="latestBlock?.height" [height]="tx?.status?.block_height" [replaced]="replaced"></app-confirmations> <app-confirmations
[chainTip]="latestBlock?.height"
[height]="tx?.status?.block_height"
[replaced]="replaced"
[removed]="this.rbfInfo?.mined && !this.tx?.status?.confirmed"
></app-confirmations>
</div> </div>
</ng-container> </ng-container>
</div> </div>

7
frontend/src/app/shared/components/confirmations/confirmations.component.html
View File

@ -6,8 +6,11 @@
</button> </button>
</ng-template> </ng-template>
<ng-template [ngIf]="!hideUnconfirmed && !confirmations && replaced"> <ng-template [ngIf]="!hideUnconfirmed && !confirmations && replaced">
<button type="button" class="btn btn-sm btn-danger {{buttonClass}}" i18n="transaction.unconfirmed|Transaction unconfirmed state">Replaced</button> <button type="button" class="btn btn-sm btn-warning {{buttonClass}}" i18n="transaction.replaced|Transaction replaced state">Replaced</button>
</ng-template> </ng-template>
<ng-template [ngIf]="!hideUnconfirmed && !confirmations && !replaced"> <ng-template [ngIf]="!hideUnconfirmed && !confirmations && !replaced && removed">
<button type="button" class="btn btn-sm btn-warning {{buttonClass}}" i18n="transaction.audit.removed|Transaction removed state">Removed</button>
</ng-template>
<ng-template [ngIf]="!hideUnconfirmed && !confirmations && !replaced && !removed">
<button type="button" class="btn btn-sm btn-danger {{buttonClass}}" i18n="transaction.unconfirmed|Transaction unconfirmed state">Unconfirmed</button> <button type="button" class="btn btn-sm btn-danger {{buttonClass}}" i18n="transaction.unconfirmed|Transaction unconfirmed state">Unconfirmed</button>
</ng-template> </ng-template>

1
frontend/src/app/shared/components/confirmations/confirmations.component.ts
View File

@ -11,6 +11,7 @@ export class ConfirmationsComponent implements OnChanges {
@Input() chainTip: number; @Input() chainTip: number;
@Input() height: number; @Input() height: number;
@Input() replaced: boolean = false; @Input() replaced: boolean = false;
@Input() removed: boolean = false;
@Input() hideUnconfirmed: boolean = false; @Input() hideUnconfirmed: boolean = false;
@Input() buttonClass: string = ''; @Input() buttonClass: string = '';