Fix merge conflicts

This commit is contained in:
Mononaut committed 2023-07-13 11:06:02 +09:00
1 parent 886a099a2f
commit 1e69ea2f1d
3 files changed
+9 -16

No files matched your search

@@ -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$