Merge branch 'master' into nymkappa/mega-branch

This commit is contained in:
nymkappa
2024-01-15 10:01:38 +01:00
80 changed files with 2793 additions and 1040 deletions

View File

@@ -13,7 +13,7 @@ export class AudioService {
} catch (e) {}
}
public playSound(name: 'magic' | 'chime' | 'cha-ching' | 'bright-harmony') {
public playSound(name: 'magic' | 'chime' | 'cha-ching' | 'bright-harmony' | 'wind-chimes-harp-ascend' | 'ascend-chime-cartoon') {
if (this.isPlaying || !this.audio) {
return;
}

View File

@@ -183,14 +183,18 @@ export class WebsocketService {
}
startTrackMempoolBlock(block: number) {
this.websocketSubject.next({ 'track-mempool-block': block });
this.isTrackingMempoolBlock = true
this.trackingMempoolBlock = block
// skip duplicate tracking requests
if (this.trackingMempoolBlock !== block) {
this.websocketSubject.next({ 'track-mempool-block': block });
this.isTrackingMempoolBlock = true;
this.trackingMempoolBlock = block;
}
}
stopTrackMempoolBlock() {
this.websocketSubject.next({ 'track-mempool-block': -1 });
this.isTrackingMempoolBlock = false
this.isTrackingMempoolBlock = false;
this.trackingMempoolBlock = null;
}
startTrackRbf(mode: 'all' | 'fullRbf') {