Merge branch 'master' into knorrium/node22

This commit is contained in:
Felipe Knorr Kuhn 2025-04-01 23:44:17 -07:00 committed by GitHub
commit f1228a6c28
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 7 additions and 47 deletions

View File

@ -1,4 +1,4 @@
<div class="text-center" class="blockchain-wrapper" [class.time-ltr]="timeLtr" [class.ltr-transition]="ltrTransitionEnabled" [class.flipped]="flipped" [class.ready-to-flip]="readyToFlip" #container> <div class="text-center" class="blockchain-wrapper" [class.time-ltr]="timeLtr" [class.ltr-transition]="ltrTransitionEnabled" #container>
<div #positionContainer class="position-container" [ngClass]="network ? network : ''" [style]="positionStyle"> <div #positionContainer class="position-container" [ngClass]="network ? network : ''" [style]="positionStyle">
<span> <span>
<div class="blocks-wrapper"> <div class="blocks-wrapper">
@ -10,7 +10,7 @@
</ng-container> </ng-container>
</div> </div>
<div id="divider" [hidden]="pageIndex > 0"> <div id="divider" [hidden]="pageIndex > 0">
<button class="block-display-toggle" (click)="toggleBlockDisplayMode()"><fa-icon [icon]="['fas', isA1() ? 'arrows-rotate' : 'exchange-alt']" [fixedWidth]="true"></fa-icon></button> <button class="block-display-toggle" (click)="toggleBlockDisplayMode()"><fa-icon [icon]="['fas', 'exchange-alt']" [fixedWidth]="true"></fa-icon></button>
<button class="time-toggle" (click)="toggleTimeDirection()"><fa-icon [icon]="['fas', 'exchange-alt']" [fixedWidth]="true"></fa-icon></button> <button class="time-toggle" (click)="toggleTimeDirection()"><fa-icon [icon]="['fas', 'exchange-alt']" [fixedWidth]="true"></fa-icon></button>
</div> </div>
</span> </span>

View File

@ -19,14 +19,6 @@
-moz-user-select: none; /* Firefox */ -moz-user-select: none; /* Firefox */
-ms-user-select: none; /* IE10+/Edge */ -ms-user-select: none; /* IE10+/Edge */
user-select: none; /* Standard */ user-select: none; /* Standard */
&.flipped {
transform: rotate(180deg);
}
&.ready-to-flip {
transition: transform 2s;
}
} }
.position-container { .position-container {

View File

@ -29,9 +29,6 @@ export class BlockchainComponent implements OnInit, OnDestroy, OnChanges {
connected: boolean = true; connected: boolean = true;
blockDisplayMode: 'size' | 'fees'; blockDisplayMode: 'size' | 'fees';
flipped: boolean = true;
readyToFlip: boolean = false;
dividerOffset: number | null = null; dividerOffset: number | null = null;
mempoolOffset: number | null = null; mempoolOffset: number | null = null;
positionStyle = { positionStyle = {
@ -43,22 +40,7 @@ export class BlockchainComponent implements OnInit, OnDestroy, OnChanges {
public stateService: StateService, public stateService: StateService,
public StorageService: StorageService, public StorageService: StorageService,
private cd: ChangeDetectorRef, private cd: ChangeDetectorRef,
) { ) {}
if (this.StorageService.getValue('ap-flipped') !== null) {
this.flipped = false;
} else {
this.flipped = this.stateService.apFlipped;
if (this.flipped) {
setTimeout(() => {
this.flipped = false;
this.stateService.apFlipped = false;
}, 5000);
}
setTimeout(() => {
this.readyToFlip = true;
}, 500);
}
}
ngOnInit(): void { ngOnInit(): void {
this.onResize(); this.onResize();
@ -108,15 +90,10 @@ export class BlockchainComponent implements OnInit, OnDestroy, OnChanges {
} }
toggleBlockDisplayMode(): void { toggleBlockDisplayMode(): void {
if (this.isA1()) { if (this.blockDisplayMode === 'size') this.blockDisplayMode = 'fees';
this.flipped = !this.flipped; else this.blockDisplayMode = 'size';
this.StorageService.setValue('ap-flipped', this.flipped ? 'true' : 'false'); this.StorageService.setValue('block-display-mode-preference', this.blockDisplayMode);
} else { this.stateService.blockDisplayMode$.next(this.blockDisplayMode);
if (this.blockDisplayMode === 'size') this.blockDisplayMode = 'fees';
else this.blockDisplayMode = 'size';
this.StorageService.setValue('block-display-mode-preference', this.blockDisplayMode);
this.stateService.blockDisplayMode$.next(this.blockDisplayMode);
}
} }
onMempoolWidthChange(width): void { onMempoolWidthChange(width): void {
@ -149,11 +126,6 @@ export class BlockchainComponent implements OnInit, OnDestroy, OnChanges {
} }
} }
isA1(): boolean {
const now = new Date();
return now.getMonth() === 3 && now.getDate() === 1;
}
onResize(): void { onResize(): void {
const width = this.containerWidth || window.innerWidth; const width = this.containerWidth || window.innerWidth;
if (width >= 768) { if (width >= 768) {

View File

@ -147,8 +147,6 @@ export class StateService {
mempoolSequence: number; mempoolSequence: number;
mempoolBlockState: { block: number, transactions: { [txid: string]: TransactionStripped} }; mempoolBlockState: { block: number, transactions: { [txid: string]: TransactionStripped} };
apFlipped = false;
backend$ = new BehaviorSubject<'esplora' | 'electrum' | 'none'>('esplora'); backend$ = new BehaviorSubject<'esplora' | 'electrum' | 'none'>('esplora');
networkChanged$ = new ReplaySubject<string>(1); networkChanged$ = new ReplaySubject<string>(1);
lightningChanged$ = new ReplaySubject<boolean>(1); lightningChanged$ = new ReplaySubject<boolean>(1);
@ -256,8 +254,6 @@ export class StateService {
} }
}); });
this.apFlipped = true;
this.liveMempoolBlockTransactions$ = this.mempoolBlockUpdate$.pipe(scan((acc: { block: number, transactions: { [txid: string]: TransactionStripped } }, change: MempoolBlockUpdate): { block: number, transactions: { [txid: string]: TransactionStripped } } => { this.liveMempoolBlockTransactions$ = this.mempoolBlockUpdate$.pipe(scan((acc: { block: number, transactions: { [txid: string]: TransactionStripped } }, change: MempoolBlockUpdate): { block: number, transactions: { [txid: string]: TransactionStripped } } => {
if (isMempoolState(change)) { if (isMempoolState(change)) {
const txMap = {}; const txMap = {};