+
-
-
+ @if (tx.status.confirmed) {
+
+ } @else {
+
+ }
+
+ @if (!tx.status.confirmed) {
+
+ }
-
Accelerated
-
-
+ @if (tx.status.confirmed) {
+
Accelerated
+ }
+ @if (tx.status.confirmed && accelerationInfo) {
+
+ } @else if (!tx.status.confirmed) {
+
+ @if (now - acceleratedAt > 60) {
+
+ }
+ } @else {
+
+
+
+ }
+ @if (tx.status.confirmed) {
+ } @else {
+
+ }
-
-
-
+
+ @if (tx.status.confirmed) {
+
+ } @else {
+
+ }
+
-
Mined
-
-
+ @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 dd815ba45..69f7580af 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: -64px;
+ margin-top: -66px;
.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 38d48dd05..ff6411dc4 100644
--- a/frontend/src/app/components/acceleration-timeline/acceleration-timeline.component.ts
+++ b/frontend/src/app/components/acceleration-timeline/acceleration-timeline.component.ts
@@ -1,6 +1,7 @@
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',
@@ -10,6 +11,7 @@ import { Transaction } from '../../interfaces/electrs.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 3e7c67359..211573869 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
diff --git a/frontend/src/app/components/transaction/transaction.component.scss b/frontend/src/app/components/transaction/transaction.component.scss
index 7db417126..45a44e2bf 100644
--- a/frontend/src/app/components/transaction/transaction.component.scss
+++ b/frontend/src/app/components/transaction/transaction.component.scss
@@ -158,6 +158,7 @@
.effective-fee-container {
display: block;
+ width: 100%;
@media (min-width: 768px){
display: inline-block;
}