From ee1e75f978cee0f43e9103d790b8dee639585277 Mon Sep 17 00:00:00 2001
From: hunicus <93150691+hunicus@users.noreply.github.com>
Date: Fri, 12 May 2023 12:55:51 -0400
Subject: [PATCH 1/4] Add trademark symbol to trademarks in footer

---
 .../components/global-footer/global-footer.component.html     | 4 ++--
 .../components/global-footer/global-footer.component.ts       | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/frontend/src/app/shared/components/global-footer/global-footer.component.html b/frontend/src/app/shared/components/global-footer/global-footer.component.html
index 043921b8a..cf4356987 100644
--- a/frontend/src/app/shared/components/global-footer/global-footer.component.html
+++ b/frontend/src/app/shared/components/global-footer/global-footer.component.html
@@ -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>
diff --git a/frontend/src/app/shared/components/global-footer/global-footer.component.ts b/frontend/src/app/shared/components/global-footer/global-footer.component.ts
index c1a26ac68..d4f1946ea 100644
--- a/frontend/src/app/shared/components/global-footer/global-footer.component.ts
+++ b/frontend/src/app/shared/components/global-footer/global-footer.component.ts
@@ -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 {

From 0ddd9b2487d6dd94306f3d518503f57c9a187dfe Mon Sep 17 00:00:00 2001
From: hunicus <93150691+hunicus@users.noreply.github.com>
Date: Fri, 12 May 2023 15:54:35 -0400
Subject: [PATCH 2/4] Turn generic project text into trademark

---
 .../components/global-footer/global-footer.component.html       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/app/shared/components/global-footer/global-footer.component.html b/frontend/src/app/shared/components/global-footer/global-footer.component.html
index cf4356987..0bac1f9ff 100644
--- a/frontend/src/app/shared/components/global-footer/global-footer.component.html
+++ b/frontend/src/app/shared/components/global-footer/global-footer.component.html
@@ -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">

From 6a5afd7f95adb9688608c7da815cd46507d6236f Mon Sep 17 00:00:00 2001
From: Mononaut <github@monospace.live>
Date: Fri, 12 May 2023 21:08:12 -0600
Subject: [PATCH 3/4] Add missing clock websocket subscriptions

---
 frontend/src/app/components/clock-face/clock-face.component.ts | 1 -
 frontend/src/app/components/clock/clock.component.ts           | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/frontend/src/app/components/clock-face/clock-face.component.ts b/frontend/src/app/components/clock-face/clock-face.component.ts
index 01e439e8e..c2c946b74 100644
--- a/frontend/src/app/components/clock-face/clock-face.component.ts
+++ b/frontend/src/app/components/clock-face/clock-face.component.ts
@@ -26,7 +26,6 @@ export class ClockFaceComponent implements OnInit, OnChanges, OnDestroy {
 
   constructor(
     public stateService: StateService,
-    private websocketService: WebsocketService,
     private cd: ChangeDetectorRef
   ) {
     this.updateTime();
diff --git a/frontend/src/app/components/clock/clock.component.ts b/frontend/src/app/components/clock/clock.component.ts
index dea2de4c8..285f91ff8 100644
--- a/frontend/src/app/components/clock/clock.component.ts
+++ b/frontend/src/app/components/clock/clock.component.ts
@@ -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]) => {

From ea52d40a10d0454f569a3de7cabb5a527a30685e Mon Sep 17 00:00:00 2001
From: Mononaut <github@monospace.live>
Date: Sat, 13 May 2023 09:26:21 -0600
Subject: [PATCH 4/4] Remove clock fee debugging adjustment

---
 frontend/src/app/components/clock/clock.component.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/app/components/clock/clock.component.html b/frontend/src/app/components/clock/clock.component.html
index 914450a79..b869ef005 100644
--- a/frontend/src/app/components/clock/clock.component.html
+++ b/frontend/src/app/components/clock/clock.component.html
@@ -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>