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,6 +58,7 @@ export class AccelerateFeeGraphComponent implements OnInit, OnChanges { | |||||||
|         fee: option.fee, |         fee: option.fee, | ||||||
|       } |       } | ||||||
|     }); |     }); | ||||||
|  |     if (this.estimate.nextBlockFee > this.estimate.txSummary.effectiveFee) { | ||||||
|       bars.push({ |       bars.push({ | ||||||
|         rate: this.estimate.targetFeeRate, |         rate: this.estimate.targetFeeRate, | ||||||
|         style: this.getStyle(this.estimate.targetFeeRate, maxRate, baseHeight), |         style: this.getStyle(this.estimate.targetFeeRate, maxRate, baseHeight), | ||||||
| @ -65,6 +66,7 @@ export class AccelerateFeeGraphComponent implements OnInit, OnChanges { | |||||||
|         label: 'next block', |         label: 'next block', | ||||||
|         fee: this.estimate.nextBlockFee - this.estimate.txSummary.effectiveFee |         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