+
- @if (tx.status.confirmed) {
-
- } @else {
-
- }
-
+
+
- @if (!tx.status.confirmed) {
-
- }
- @if (tx.status.confirmed) {
-
Accelerated
- }
- @if (tx.status.confirmed && accelerationInfo) {
-
-
+
Accelerated
+
- } @else if (!tx.status.confirmed) {
-
- @if (now - acceleratedAt > 60) {
-
- }
- } @else {
-
-
-
- }
- @if (tx.status.confirmed) {
- } @else {
-
- }
-
- @if (tx.status.confirmed) {
-
- } @else {
-
- }
-
+
+
+
- @if (tx.status.confirmed) {
-
Mined
- }
- @if (tx.status.confirmed && accelerationInfo) {
-
- @if (accelerationInfo?.acceleratedFeeRate && (!tx.effectiveFeePerVsize || accelerationInfo.acceleratedFeeRate >= tx.effectiveFeePerVsize || tx.acceleration)) {
- @if (!tx.effectiveFeePerVsize) {
-
- } @else {
-
- }
- } @else {
-
- }
-
- } @else if (!tx.status.confirmed) {
-
- } @else {
-
+
+
+
+
+} @else if (acceleratedETA) {
+} @else if (standardETA) {
+
+
+
+
+
+
+
+
+
+
First seen
+
+
0" kind="since" [time]="transactionTime">
+
+
+
+
+
+
- }
-
+}
\ No newline at end of file
diff --git a/frontend/src/app/components/acceleration-timeline/acceleration-timeline.component.scss b/frontend/src/app/components/acceleration-timeline/acceleration-timeline.component.scss
index 69f7580af..dd815ba45 100644
--- a/frontend/src/app/components/acceleration-timeline/acceleration-timeline.component.scss
+++ b/frontend/src/app/components/acceleration-timeline/acceleration-timeline.component.scss
@@ -209,7 +209,7 @@
}
.status {
- margin-top: -66px;
+ margin-top: -64px;
.badge.badge-waiting {
opacity: 0.5;
diff --git a/frontend/src/app/components/acceleration-timeline/acceleration-timeline.component.ts b/frontend/src/app/components/acceleration-timeline/acceleration-timeline.component.ts
index ff6411dc4..38d48dd05 100644
--- a/frontend/src/app/components/acceleration-timeline/acceleration-timeline.component.ts
+++ b/frontend/src/app/components/acceleration-timeline/acceleration-timeline.component.ts
@@ -1,7 +1,6 @@
import { Component, Input, OnInit, OnChanges } from '@angular/core';
import { ETA } from '../../services/eta.service';
import { Transaction } from '../../interfaces/electrs.interface';
-import { Acceleration } from '../../interfaces/node-api.interface';
@Component({
selector: 'app-acceleration-timeline',
@@ -11,7 +10,6 @@ import { Acceleration } from '../../interfaces/node-api.interface';
export class AccelerationTimelineComponent implements OnInit, OnChanges {
@Input() transactionTime: number;
@Input() tx: Transaction;
- @Input() accelerationInfo: Acceleration;
@Input() eta: ETA;
// A mined transaction has standard ETA and accelerated ETA undefined
// A transaction in mempool has either standardETA defined (if accelerated) or acceleratedETA defined (if not accelerated yet)
diff --git a/frontend/src/app/components/transaction/transaction.component.html b/frontend/src/app/components/transaction/transaction.component.html
index 86c8dc780..22916b242 100644
--- a/frontend/src/app/components/transaction/transaction.component.html
+++ b/frontend/src/app/components/transaction/transaction.component.html
@@ -167,7 +167,7 @@
Acceleration Timeline