Merge branch 'master' into mononaut/db-stats-overflow
This commit is contained in:
		
						commit
						ac3ffc68f9
					
				@ -72,7 +72,7 @@ export const chartColors = [
 | 
			
		||||
];
 | 
			
		||||
 | 
			
		||||
export const poolsColor = {
 | 
			
		||||
  'unknown': '#9C9C9C',
 | 
			
		||||
  'unknown': '#FDD835',
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
export const feeLevels = [1, 2, 3, 4, 5, 6, 8, 10, 12, 15, 20, 30, 40, 50, 60, 70, 80, 90, 100, 125, 150, 175, 200,
 | 
			
		||||
 | 
			
		||||
@ -173,7 +173,7 @@ export class HashrateChartPoolsComponent implements OnInit {
 | 
			
		||||
    this.chartOptions = {
 | 
			
		||||
      title: title,
 | 
			
		||||
      animation: false,
 | 
			
		||||
      color: chartColors,
 | 
			
		||||
      color: chartColors.filter(color => color !== '#FDD835'),
 | 
			
		||||
      grid: {
 | 
			
		||||
        right: this.right,
 | 
			
		||||
        left: this.left,
 | 
			
		||||
 | 
			
		||||
@ -4,7 +4,6 @@ import { ActivatedRoute, Router } from '@angular/router';
 | 
			
		||||
import { EChartsOption, PieSeriesOption } from 'echarts';
 | 
			
		||||
import { concat, Observable } from 'rxjs';
 | 
			
		||||
import { map, share, startWith, switchMap, tap } from 'rxjs/operators';
 | 
			
		||||
import { SinglePoolStats } from '../../interfaces/node-api.interface';
 | 
			
		||||
import { SeoService } from '../../services/seo.service';
 | 
			
		||||
import { StorageService } from '../..//services/storage.service';
 | 
			
		||||
import { MiningService, MiningStats } from '../../services/mining.service';
 | 
			
		||||
@ -220,7 +219,7 @@ export class PoolRankingComponent implements OnInit {
 | 
			
		||||
 | 
			
		||||
    this.chartOptions = {
 | 
			
		||||
      animation: false,
 | 
			
		||||
      color: chartColors,
 | 
			
		||||
      color: chartColors.filter(color => color !== '#FDD835'),
 | 
			
		||||
      tooltip: {
 | 
			
		||||
        trigger: 'item',
 | 
			
		||||
        textStyle: {
 | 
			
		||||
 | 
			
		||||
@ -93,6 +93,10 @@ export class PriceService {
 | 
			
		||||
   * @param blockTimestamp 
 | 
			
		||||
   */
 | 
			
		||||
  getPriceForTimestamp(blockTimestamp: number): Price | null {
 | 
			
		||||
    if (!blockTimestamp) {
 | 
			
		||||
      return undefined;
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    const priceTimestamps = Object.keys(this.historicalPrice.prices);
 | 
			
		||||
    priceTimestamps.push(Number.MAX_SAFE_INTEGER.toString());
 | 
			
		||||
    priceTimestamps.sort().reverse();
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user