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

Bigfix: Don't chime when switching networks.

Browse Source 
fixes #84
This commit is contained in:
softsimon 2020-06-11 00:11:15 +07:00
parent 36e46249b5
commit 43dac03ec0
No known key found for this signature in database
GPG Key ID: 488D7DCFB5A430D7
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
frontend/src/app/components/blockchain-blocks/blockchain-blocks.component.ts
View File

@ -4,7 +4,6 @@ import { Block } from 'src/app/interfaces/electrs.interface';
import { StateService } from 'src/app/services/state.service'; import { StateService } from 'src/app/services/state.service';
import { Router } from '@angular/router'; import { Router } from '@angular/router';
import { AudioService } from 'src/app/services/audio.service'; import { AudioService } from 'src/app/services/audio.service';
import { KEEP_BLOCKS_AMOUNT } from 'src/app/app.constants';
@Component({ @Component({
selector: 'app-blockchain-blocks', selector: 'app-blockchain-blocks',
@ -40,15 +39,14 @@ export class BlockchainBlocksComponent implements OnInit, OnDestroy {
this.stateService.networkChanged$.subscribe((network) => this.network = network); this.stateService.networkChanged$.subscribe((network) => this.network = network);
this.blocksSubscription = this.stateService.blocks$ this.blocksSubscription = this.stateService.blocks$
.subscribe(([block, txConfirmed]) => { .subscribe(([block, txConfirmed, refilling]) => {
const currentBlocksAmount = this.blocks.length;
if (this.blocks.some((b) => b.height === block.height)) { if (this.blocks.some((b) => b.height === block.height)) {
return; return;
} }
this.blocks.unshift(block); this.blocks.unshift(block);
this.blocks = this.blocks.slice(0, 8); this.blocks = this.blocks.slice(0, 8);
if (currentBlocksAmount === KEEP_BLOCKS_AMOUNT) { if (!refilling) {
setTimeout(() => this.audioService.playSound('bright-harmony')); setTimeout(() => this.audioService.playSound('bright-harmony'));
block.stage = block.matchRate >= 80 ? 1 : 2; block.stage = block.matchRate >= 80 ? 1 : 2;
} }

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

@ -20,7 +20,7 @@ export class StateService {
latestBlockHeight = 0; latestBlockHeight = 0;
networkChanged$ = new ReplaySubject<string>(1); networkChanged$ = new ReplaySubject<string>(1);
blocks$ = new ReplaySubject<[Block, boolean]>(KEEP_BLOCKS_AMOUNT); blocks$ = new ReplaySubject<[Block, boolean, boolean]>(KEEP_BLOCKS_AMOUNT);
conversions$ = new ReplaySubject<any>(1); conversions$ = new ReplaySubject<any>(1);
mempoolStats$ = new ReplaySubject<MemPoolState>(1); mempoolStats$ = new ReplaySubject<MemPoolState>(1);
mempoolBlocks$ = new ReplaySubject<MempoolBlock[]>(1); mempoolBlocks$ = new ReplaySubject<MempoolBlock[]>(1);

4
frontend/src/app/services/websocket.service.ts
View File

@ -64,7 +64,7 @@ export class WebsocketService {
blocks.forEach((block: Block) => { blocks.forEach((block: Block) => {
if (block.height > this.stateService.latestBlockHeight) { if (block.height > this.stateService.latestBlockHeight) {
this.stateService.latestBlockHeight = block.height; this.stateService.latestBlockHeight = block.height;
this.stateService.blocks$.next([block, false]); this.stateService.blocks$.next([block, false, true]);
} }
}); });
} }
@ -76,7 +76,7 @@ export class WebsocketService {
if (response.block) { if (response.block) {
if (response.block.height > this.stateService.latestBlockHeight) { if (response.block.height > this.stateService.latestBlockHeight) {
this.stateService.latestBlockHeight = response.block.height; this.stateService.latestBlockHeight = response.block.height;
this.stateService.blocks$.next([response.block, !!response.txConfirmed]); this.stateService.blocks$.next([response.block, !!response.txConfirmed, false]);
} }
if (response.txConfirmed) { if (response.txConfirmed) {