From c0e235c01ac54d17242d310ee1feb9525d7f98eb Mon Sep 17 00:00:00 2001
From: Mononaut <github@monospace.live>
Date: Fri, 16 Jun 2023 13:47:09 -0400
Subject: [PATCH] Mark RBF transactions as removed if earlier version is mined

---
 .../app/components/transaction/transaction.component.html  | 7 ++++++-
 .../components/confirmations/confirmations.component.html  | 5 ++++-
 .../components/confirmations/confirmations.component.ts    | 1 +
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/frontend/src/app/components/transaction/transaction.component.html b/frontend/src/app/components/transaction/transaction.component.html
index 64eeeaecd..a5a44ee90 100644
--- a/frontend/src/app/components/transaction/transaction.component.html
+++ b/frontend/src/app/components/transaction/transaction.component.html
@@ -18,7 +18,12 @@
       </span>
 
       <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>
     </ng-container>
   </div>
diff --git a/frontend/src/app/shared/components/confirmations/confirmations.component.html b/frontend/src/app/shared/components/confirmations/confirmations.component.html
index 1d7138c7c..914ed714f 100644
--- a/frontend/src/app/shared/components/confirmations/confirmations.component.html
+++ b/frontend/src/app/shared/components/confirmations/confirmations.component.html
@@ -8,6 +8,9 @@
 <ng-template [ngIf]="!hideUnconfirmed && !confirmations && replaced">
   <button type="button" class="btn btn-sm btn-danger {{buttonClass}}" i18n="transaction.unconfirmed|Transaction unconfirmed state">Replaced</button>
 </ng-template>
-<ng-template [ngIf]="!hideUnconfirmed && !confirmations && !replaced">
+<ng-template [ngIf]="!hideUnconfirmed && !confirmations && !replaced && removed">
+  <button type="button" class="btn btn-sm btn-danger {{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>
 </ng-template>
\ No newline at end of file
diff --git a/frontend/src/app/shared/components/confirmations/confirmations.component.ts b/frontend/src/app/shared/components/confirmations/confirmations.component.ts
index 8d14128e5..624c58278 100644
--- a/frontend/src/app/shared/components/confirmations/confirmations.component.ts
+++ b/frontend/src/app/shared/components/confirmations/confirmations.component.ts
@@ -11,6 +11,7 @@ export class ConfirmationsComponent implements OnChanges {
   @Input() chainTip: number;
   @Input() height: number;
   @Input() replaced: boolean = false;
+  @Input() removed: boolean = false;
   @Input() hideUnconfirmed: boolean = false;
   @Input() buttonClass: string = '';