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

Merge branch 'master' into simon/ignore-existing-mining-pools

Browse Source
This commit is contained in:
softsimon 2023-05-14 13:19:22 -05:00 committed by GitHub
commit e41ce16bbb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
frontend/src/app/components/clock-face/clock-face.component.ts
View File

@ -26,7 +26,6 @@ export class ClockFaceComponent implements OnInit, OnChanges, OnDestroy {
constructor(
public stateService: StateService,
private websocketService: WebsocketService,
private cd: ChangeDetectorRef
) {
this.updateTime();

2
frontend/src/app/components/clock/clock.component.html
View File

@ -40,7 +40,7 @@
</div>
<div class="stats top right">
<p class="label" i18n="clock.priority-rate|priority fee rate">priority rate</p>
<p *ngIf="recommendedFees$ | async as recommendedFees;" i18n="shared.sat-vbyte|sat/vB">{{ recommendedFees.fastestFee + 300 }} sat/vB</p>
<p *ngIf="recommendedFees$ | async as recommendedFees;" i18n="shared.sat-vbyte|sat/vB">{{ recommendedFees.fastestFee }} sat/vB</p>
</div>
<div *ngIf="mode !== 'mempool' && block" class="stats bottom left">
<p [innerHTML]="block.size | bytes: 2"></p>

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

@ -52,7 +52,7 @@ export class ClockComponent implements OnInit {
ngOnInit(): void {
this.resizeCanvas();
this.websocketService.want(['blocks']);
this.websocketService.want(['blocks', 'stats', 'mempool-blocks']);
this.blocksSubscription = this.stateService.blocks$
.subscribe(([block]) => {

6
frontend/src/app/shared/components/global-footer/global-footer.component.html
View File

@ -2,8 +2,8 @@
<div class="container-fluid">
<div class="row main">
<div class="offset-lg-1 col-lg-4 col align-self-center branding">
<h5 i18n="about.about-the-project">The Mempool Open Source Project</h5>
<p i18="@@7deec1c1520f06170e1f8e8ddfbe4532312f638f">Explore the full Bitcoin ecosystem</p>
<h5><ng-container i18n="about.about-the-project">The Mempool Open Source Project</ng-container><ng-template [ngIf]="locale.substr(0, 2) === 'en'"> &trade;</ng-template></h5>
<p><ng-container i18n="@@7deec1c1520f06170e1f8e8ddfbe4532312f638f">Explore the full Bitcoin ecosystem</ng-container><ng-template [ngIf]="locale.substr(0, 2) === 'en'"> &trade;</ng-template></p>
<div class="selector">
<app-language-selector></app-language-selector>
</div>
@ -16,7 +16,7 @@
</ng-template>
<p class="cta-secondary"><a [routerLink]="['/tx/push' | relativeUrl]" i18n="shared.broadcast-transaction|Broadcast Transaction">Broadcast Transaction</a></p>
<p *ngIf="officialMempoolSpace && env.LIGHTNING" class="cta-secondary"><a [routerLink]="['/lightning/group/the-mempool-open-source-project' | relativeUrl]" i18n="footer.connect-to-our-nodes">Connect to our Nodes</a></p>
<p><a [routerLink]="['/about' | relativeUrl]">About the Project</a></p>
<p><a [routerLink]="['/about' | relativeUrl]">About The Mempool Open Source Project™</a></p>
</div>
<div class="col-lg-6 col-md-10 offset-md-1 links outer">
<div class="row">

3
frontend/src/app/shared/components/global-footer/global-footer.component.ts
View File

@ -1,4 +1,4 @@
import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core';
import { ChangeDetectionStrategy, Component, OnInit, Inject, LOCALE_ID } from '@angular/core';
import { Observable, merge, of, Subject } from 'rxjs';
import { tap, takeUntil } from 'rxjs/operators';
import { Env, StateService } from '../../../services/state.service';
@ -28,6 +28,7 @@ export class GlobalFooterComponent implements OnInit {
public stateService: StateService,
private languageService: LanguageService,
private navigationService: NavigationService,
@Inject(LOCALE_ID) public locale: string,
) {}
ngOnInit(): void {