From 7bb34fe090a395779c8d62f305e9d1bd62b3758e Mon Sep 17 00:00:00 2001 From: nymkappa <1612910616@pm.me> Date: Thu, 11 May 2023 14:30:57 +0200 Subject: [PATCH 1/6] [mempool graph] show horizontal guide line --- .../mempool-graph/mempool-graph.component.ts | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/frontend/src/app/components/mempool-graph/mempool-graph.component.ts b/frontend/src/app/components/mempool-graph/mempool-graph.component.ts index cc53f425d..416b8f538 100644 --- a/frontend/src/app/components/mempool-graph/mempool-graph.component.ts +++ b/frontend/src/app/components/mempool-graph/mempool-graph.component.ts @@ -181,7 +181,7 @@ export class MempoolGraphComponent implements OnInit, OnChanges { alwaysShowContent: false, position: (pos, params, el, elRect, size) => { const positions = { top: (this.template === 'advanced') ? 0 : -30 }; - positions[['left', 'right'][+(pos[0] < size.viewSize[0] / 2)]] = 60; + positions[['left', 'right'][+(pos[0] < size.viewSize[0] / 2)]] = 100; return positions; }, extraCssText: `width: ${(this.template === 'advanced') ? '275px' : '200px'}; @@ -189,10 +189,19 @@ export class MempoolGraphComponent implements OnInit, OnChanges { border: none; box-shadow: none;`, axisPointer: { - type: 'line', + type: 'cross', + label: { + formatter: (params: any) => { + if (params.axisDimension === 'y') { + return this.vbytesPipe.transform(params.value, 2, 'vB', 'MvB', true) + } else { + return formatterXAxis(this.locale, this.windowPreference, params.value); + } + } + } }, formatter: (params: any) => { - const axisValueLabel: string = formatterXAxis(this.locale, this.windowPreference, params[0].axisValue); + const axisValueLabel: string = formatterXAxis(this.locale, this.windowPreference, params[0].axisValue); const { totalValue, totalValueArray } = this.getTotalValues(params); const itemFormatted = []; let totalParcial = 0; From a3ca79e995873e79911f3689c79d4f4a33276e2a Mon Sep 17 00:00:00 2001 From: softsimon Date: Fri, 12 May 2023 10:53:42 -0500 Subject: [PATCH 2/6] Temporarily hide sign in --- .../components/global-footer/global-footer.component.html | 6 ++++-- 1 file changed, 4 insertions(+), 2 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 1d07d9ef2..043921b8a 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 @@ -10,8 +10,10 @@
- -

Sign In

+ + +

Sign In

+

Broadcast Transaction

Connect to our Nodes

About the Project

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 3/6] 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 @@
-
The Mempool Open Source Project
-

Explore the full Bitcoin ecosystem

+
The Mempool Open Source Project ™
+

Explore the full Bitcoin ecosystem ™

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 4/6] 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 @@

Broadcast Transaction

Connect to our Nodes

-

About the Project

+

About The Mempool Open Source Project™

From 6a5afd7f95adb9688608c7da815cd46507d6236f Mon Sep 17 00:00:00 2001 From: Mononaut Date: Fri, 12 May 2023 21:08:12 -0600 Subject: [PATCH 5/6] 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 Date: Sat, 13 May 2023 09:26:21 -0600 Subject: [PATCH 6/6] 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 @@

priority rate

-

{{ recommendedFees.fastestFee + 300 }} sat/vB

+

{{ recommendedFees.fastestFee }} sat/vB