machankura/mempool
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix merge conflict with 2013dc6d8b05d1bed4ec855ec97720e24aec4986

Browse Source
This commit is contained in:
nymkappa 2024-01-09 12:11:45 +01:00
parent ee721b3e1c
commit 0225455784
No known key found for this signature in database
GPG Key ID: E155910B16E8BD04
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
frontend/src/app/components/block/block-preview.component.ts
View File

@ -10,6 +10,7 @@ import { BlockExtended, TransactionStripped } from '../../interfaces/node-api.in
import { ApiService } from '../../services/api.service'; import { ApiService } from '../../services/api.service';
import { seoDescriptionNetwork } from '../../shared/common.utils'; import { seoDescriptionNetwork } from '../../shared/common.utils';
import { BlockOverviewGraphComponent } from '../../components/block-overview-graph/block-overview-graph.component'; import { BlockOverviewGraphComponent } from '../../components/block-overview-graph/block-overview-graph.component';
import { ServicesApiServices } from '../../services/services-api.service';
@Component({ @Component({
selector: 'app-block-preview', selector: 'app-block-preview',
@ -42,7 +43,8 @@ export class BlockPreviewComponent implements OnInit, OnDestroy {
public stateService: StateService, public stateService: StateService,
private seoService: SeoService, private seoService: SeoService,
private openGraphService: OpenGraphService, private openGraphService: OpenGraphService,
private apiService: ApiService private apiService: ApiService,
private servicesApiService: ServicesApiServices,
) { } ) { }
ngOnInit() { ngOnInit() {
@ -134,7 +136,7 @@ export class BlockPreviewComponent implements OnInit, OnDestroy {
return of(transactions); return of(transactions);
}) })
), ),
this.stateService.env.ACCELERATOR === true && block.height > 819500 ? this.apiService.getAccelerationHistory$({ blockHash: block.id }) : of([]) this.stateService.env.ACCELERATOR === true && block.height > 819500 ? this.servicesApiService.getAccelerationHistory$({ blockHash: block.id }) : of([])
]); ]);
} }
), ),

4
frontend/src/app/components/block/block.component.ts
View File

@ -16,6 +16,7 @@ import { detectWebGL } from '../../shared/graphs.utils';
import { seoDescriptionNetwork } from '../../shared/common.utils'; import { seoDescriptionNetwork } from '../../shared/common.utils';
import { PriceService, Price } from '../../services/price.service'; import { PriceService, Price } from '../../services/price.service';
import { CacheService } from '../../services/cache.service'; import { CacheService } from '../../services/cache.service';
import { ServicesApiServices } from '../../services/services-api.service';
@Component({ @Component({
selector: 'app-block', selector: 'app-block',
@ -103,6 +104,7 @@ export class BlockComponent implements OnInit, OnDestroy {
private apiService: ApiService, private apiService: ApiService,
private priceService: PriceService, private priceService: PriceService,
private cacheService: CacheService, private cacheService: CacheService,
private servicesApiService: ServicesApiServices,
) { ) {
this.webGlEnabled = detectWebGL(); this.webGlEnabled = detectWebGL();
} }
@ -329,7 +331,7 @@ export class BlockComponent implements OnInit, OnDestroy {
return of(null); return of(null);
}) })
), ),
this.stateService.env.ACCELERATOR === true && block.height > 819500 ? this.apiService.getAccelerationHistory$({ blockHash: block.id }) : of([]) this.stateService.env.ACCELERATOR === true && block.height > 819500 ? this.servicesApiService.getAccelerationHistory$({ blockHash: block.id }) : of([])
]); ]);
}) })
) )