Merge pull request #5840 from mempool/mononaut/0402

more misc changes
This commit is contained in:
wiz 2025-04-01 18:03:27 +09:00 committed by GitHub
commit 3c08b5c72b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 27 additions and 5 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 && isA1()" #container>
<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 #positionContainer class="position-container" [ngClass]="network ? network : ''" [style]="positionStyle">
<span>
<div class="blocks-wrapper">

View File

@ -21,11 +21,12 @@
user-select: none; /* Standard */
transition: transform 2s;
&.flipped {
transform: rotate(180deg);
}
&.ready-to-flip {
transition: transform 2s;
}
}
.position-container {

View File

@ -29,7 +29,8 @@ export class BlockchainComponent implements OnInit, OnDestroy, OnChanges {
connected: boolean = true;
blockDisplayMode: 'size' | 'fees';
flipped: boolean = false;
flipped: boolean = true;
readyToFlip: boolean = false;
dividerOffset: number | null = null;
mempoolOffset: number | null = null;
@ -42,7 +43,22 @@ export class BlockchainComponent implements OnInit, OnDestroy, OnChanges {
public stateService: StateService,
public StorageService: StorageService,
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 {
this.onResize();
@ -94,6 +110,7 @@ export class BlockchainComponent implements OnInit, OnDestroy, OnChanges {
toggleBlockDisplayMode(): void {
if (this.isA1()) {
this.flipped = !this.flipped;
this.StorageService.setValue('ap-flipped', this.flipped ? 'true' : 'false');
} else {
if (this.blockDisplayMode === 'size') this.blockDisplayMode = 'fees';
else this.blockDisplayMode = 'size';

View File

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