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

Bugfix and inprovments for arrow navigation.

Browse Source
This commit is contained in:
softsimon 2020-03-22 23:45:16 +07:00
parent 78e41fc3d3
commit bd641271a9
No known key found for this signature in database
GPG Key ID: 488D7DCFB5A430D7
4 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,11 +1,10 @@
import { Component, OnInit, OnDestroy } from '@angular/core';
import { ActivatedRoute, ParamMap } from '@angular/router';
import { ElectrsApiService } from '../../services/electrs-api.service';
import { switchMap, tap, debounceTime } from 'rxjs/operators';
import { switchMap, tap, debounceTime, catchError } from 'rxjs/operators';
import { Block, Transaction, Vout } from '../../interfaces/electrs.interface';
import { of, Observable } from 'rxjs';
import { of, empty } from 'rxjs';
import { StateService } from '../../services/state.service';
import { WebsocketService } from 'src/app/services/websocket.service';
@Component({
selector: 'app-block',
@ -28,12 +27,9 @@ export class BlockComponent implements OnInit, OnDestroy {
private route: ActivatedRoute,
private electrsApiService: ElectrsApiService,
private stateService: StateService,
private websocketService: WebsocketService,
) { }
ngOnInit() {
this.websocketService.want(['blocks', 'stats', 'mempool-blocks']);
this.route.paramMap
.pipe(
switchMap((params: ParamMap) => {
@ -68,8 +64,14 @@ export class BlockComponent implements OnInit, OnDestroy {
this.isLoadingTransactions = true;
this.transactions = null;
}),
debounceTime(250),
switchMap((block) => this.electrsApiService.getBlockTransactions$(block.id))
debounceTime(300),
switchMap((block) => this.electrsApiService.getBlockTransactions$(block.id)
.pipe(
catchError((err) => {
console.log(err);
return of([]);
}))
),
)
.subscribe((transactions: Transaction[]) => {
if (this.fees === undefined) {

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

@ -3,7 +3,6 @@ import { StateService } from 'src/app/services/state.service';
import { ActivatedRoute, ParamMap } from '@angular/router';
import { switchMap, map } from 'rxjs/operators';
import { MempoolBlock } from 'src/app/interfaces/websocket.interface';
import { WebsocketService } from 'src/app/services/websocket.service';
@Component({
selector: 'app-mempool-block',
@ -17,12 +16,9 @@ export class MempoolBlockComponent implements OnInit, OnDestroy {
constructor(
private route: ActivatedRoute,
private stateService: StateService,
private websocketService: WebsocketService,
) { }
ngOnInit(): void {
this.websocketService.want(['blocks', 'stats', 'mempool-blocks']);
this.route.paramMap.pipe(
switchMap((params: ParamMap) => {
this.mempoolBlockIndex = parseInt(params.get('id'), 10) || 0;

2
frontend/src/app/components/mempool-blocks/mempool-blocks.component.ts
View File

@ -3,6 +3,7 @@ import { Subscription } from 'rxjs';
import { MempoolBlock } from 'src/app/interfaces/websocket.interface';
import { StateService } from 'src/app/services/state.service';
import { Router } from '@angular/router';
import { take } from 'rxjs/operators';
@Component({
selector: 'app-mempool-blocks',
@ -69,6 +70,7 @@ export class MempoolBlocksComponent implements OnInit, OnDestroy {
this.router.navigate(['/mempool-block/', this.markIndex - 1]);
} else {
this.stateService.blocks$
.pipe(take(8))
.subscribe((block) => {
if (this.stateService.latestBlockHeight === block.height) {
this.router.navigate(['/block/', block.id], { state: { data: { block } }});

2
frontend/src/app/components/transaction/transaction.component.ts
View File

@ -38,8 +38,6 @@ export class TransactionComponent implements OnInit, OnDestroy {
) { }
ngOnInit() {
this.websocketService.want(['blocks', 'stats', 'mempool-blocks']);
this.route.paramMap.pipe(
switchMap((params: ParamMap) => {
this.txId = params.get('id') || '';