mirrors/mempool
1
0
Fork 0
mirror of https://github.com/mempool/mempool.git synced 2025-01-19 05:34:03 +01:00
Code Issues Projects Releases Wiki Activity

Fix merge conflicts

Browse Source
This commit is contained in:
Mononaut 2023-07-13 11:03:44 +09:00
parent 886a099a2f
commit 1e69ea2f1d
No known key found for this signature in database
GPG Key ID: A3F058E41374C04E
3 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
frontend/src/app/components/blocks-list/blocks-list.component.ts
View File

@ -82,12 +82,12 @@ export class BlocksList implements OnInit {
),
this.stateService.blocks$
.pipe(
switchMap((block) => {
if (block[0].height <= this.lastBlockHeight) {
switchMap((blocks) => {
if (blocks[0].height <= this.lastBlockHeight) {
return [null]; // Return an empty stream so the last pipe is not executed
}
this.lastBlockHeight = block[0].height;
return [block];
this.lastBlockHeight = blocks[0].height;
return blocks;
})
)
])

15
frontend/src/app/dashboard/dashboard.component.ts
View File

@ -135,23 +135,16 @@ export class DashboardComponent implements OnInit, OnDestroy {
tap((blocks) => {
this.latestBlockHeight = blocks[0].height;
}),
scan((acc, [block]) => {
if (acc.find((b) => b.height == block.height)) {
return acc;
}
acc.unshift(block);
acc = acc.slice(0, 6);
switchMap((blocks) => {
if (this.stateService.env.MINING_DASHBOARD === true) {
for (const block of acc) {
for (const block of blocks) {
// @ts-ignore: Need to add an extra field for the template
block.extras.pool.logo = `/resources/mining-pools/` +
block.extras.pool.name.toLowerCase().replace(' ', '').replace('.', '') + '.svg';
}
}
return acc;
}, []),
return of(blocks.slice(0, 6));
})
);
this.transactions$ = this.stateService.transactions$

2
frontend/src/app/services/state.service.ts
View File

@ -201,7 +201,7 @@ export class StateService {
this.networkChanged$.subscribe((network) => {
this.transactions$ = new ReplaySubject<TransactionStripped>(6);
this.blocksSubject$ = new BehaviorSubject<BlockExtended[]>([]);
this.blocksSubject$.next([]);
});
this.blockVSize = this.env.BLOCK_WEIGHT_UNITS / 4;