Merge branch 'master' into nymkappa/mega-branch
This commit is contained in:
commit
eeebfde33c
@ -17,6 +17,7 @@
|
|||||||
bottom: 0;
|
bottom: 0;
|
||||||
left: 0;
|
left: 0;
|
||||||
right: 0;
|
right: 0;
|
||||||
|
min-height: 30px;
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
justify-content: center;
|
justify-content: center;
|
||||||
|
@ -58,13 +58,15 @@ export class AccelerateFeeGraphComponent implements OnInit, OnChanges {
|
|||||||
fee: option.fee,
|
fee: option.fee,
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
bars.push({
|
if (this.estimate.nextBlockFee > this.estimate.txSummary.effectiveFee) {
|
||||||
rate: this.estimate.targetFeeRate,
|
bars.push({
|
||||||
style: this.getStyle(this.estimate.targetFeeRate, maxRate, baseHeight),
|
rate: this.estimate.targetFeeRate,
|
||||||
class: 'target',
|
style: this.getStyle(this.estimate.targetFeeRate, maxRate, baseHeight),
|
||||||
label: 'next block',
|
class: 'target',
|
||||||
fee: this.estimate.nextBlockFee - this.estimate.txSummary.effectiveFee
|
label: 'next block',
|
||||||
});
|
fee: this.estimate.nextBlockFee - this.estimate.txSummary.effectiveFee
|
||||||
|
});
|
||||||
|
}
|
||||||
bars.push({
|
bars.push({
|
||||||
rate: baseRate,
|
rate: baseRate,
|
||||||
style: this.getStyle(baseRate, maxRate, 0),
|
style: this.getStyle(baseRate, maxRate, 0),
|
||||||
|
Loading…
x
Reference in New Issue
Block a user