diff --git a/frontend/src/app/components/acceleration/active-acceleration-box/active-acceleration-box.component.html b/frontend/src/app/components/acceleration/active-acceleration-box/active-acceleration-box.component.html index 75e821e9f..d009a5e63 100644 --- a/frontend/src/app/components/acceleration/active-acceleration-box/active-acceleration-box.component.html +++ b/frontend/src/app/components/acceleration/active-acceleration-box/active-acceleration-box.component.html @@ -1,8 +1,8 @@ - - + - - - + diff --git a/frontend/src/app/components/acceleration/active-acceleration-box/active-acceleration-box.component.scss b/frontend/src/app/components/acceleration/active-acceleration-box/active-acceleration-box.component.scss index 6dba0b06f..12849dc65 100644 --- a/frontend/src/app/components/acceleration/active-acceleration-box/active-acceleration-box.component.scss +++ b/frontend/src/app/components/acceleration/active-acceleration-box/active-acceleration-box.component.scss @@ -1,9 +1,50 @@ .td-width { - width: 150px; - min-width: 150px; + width: 150px; + min-width: 150px; - @media (max-width: 768px) { - width: 175px; - min-width: 175px; - } + @media (max-width: 768px) { + width: 175px; + min-width: 175px; + } +} + +.field-label { + @media (max-width: 849px) { + text-align: left; + } + @media (max-width: 649px) { + width: auto; + min-width: auto; + } +} + +.field-value { + @media (max-width: 849px) { + width: 100%; + } + + .hashrate-label { + @media (max-width: 420px) { + display: none; + } + } +} + +.pie-chart { + width: 100%; + vertical-align: middle; + text-align: center; + + .chart-container { + width: 72px; + height: 100%; + margin-left: auto; + } + + @media (max-width: 850px) { + width: 150px; + } + @media (max-width: 420px) { + padding-left: 0; + } } \ No newline at end of file diff --git a/frontend/src/app/components/acceleration/active-acceleration-box/active-acceleration-box.component.ts b/frontend/src/app/components/acceleration/active-acceleration-box/active-acceleration-box.component.ts index b6719f906..f52c45041 100644 --- a/frontend/src/app/components/acceleration/active-acceleration-box/active-acceleration-box.component.ts +++ b/frontend/src/app/components/acceleration/active-acceleration-box/active-acceleration-box.component.ts @@ -83,7 +83,7 @@ export class ActiveAccelerationBox implements OnChanges { this.acceleratedByPercentage = ((totalAcceleratedHashrate / parseFloat(this.miningStats.lastEstimatedHashrate)) * 100).toFixed(1) + '%'; data.push(getDataItem( totalAcceleratedHashrate, - 'var(--tertiary)', + 'var(--mainnet-alt)', `${this.acceleratedByPercentage} accelerating`, ) as PieSeriesOption); const notAcceleratedByPercentage = ((1 - (totalAcceleratedHashrate / parseFloat(this.miningStats.lastEstimatedHashrate))) * 100).toFixed(1) + '%'; diff --git a/frontend/src/app/components/transaction/transaction.component.ts b/frontend/src/app/components/transaction/transaction.component.ts index a76720752..2b2ed8060 100644 --- a/frontend/src/app/components/transaction/transaction.component.ts +++ b/frontend/src/app/components/transaction/transaction.component.ts @@ -380,7 +380,12 @@ export class TransactionComponent implements OnInit, AfterViewInit, OnDestroy { this.txInBlockIndex = this.mempoolPosition.block; if (txPosition.cpfp !== undefined) { + if (txPosition.position.acceleratedBy) { + txPosition.cpfp.acceleratedBy = txPosition.position.acceleratedBy; + } this.setCpfpInfo(txPosition.cpfp); + } else if ((this.tx?.acceleration && txPosition.position.acceleratedBy)) { + this.tx.acceleratedBy = txPosition.position.acceleratedBy; } } } else {
Accelerated to + Accelerated to
@if (accelerationInfo?.acceleratedFeeRate && (!tx.effectiveFeePerVsize || accelerationInfo.acceleratedFeeRate >= tx.effectiveFeePerVsize)) { @@ -11,24 +11,30 @@ }
-
-
+
+
+ @if (tx && (tx.acceleratedBy || accelerationInfo) && miningStats) { +
+ } @else { +
+
+
+ }
Accelerated by - {{ acceleratedByPercentage }} of hashrate + Accelerated by + {{ acceleratedByPercentage }} of hashrate