Skip to content

[pull] master from mempool:master #268

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 5 commits into from
Mar 19, 2026
Merged

[pull] master from mempool:master #268

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
029d589
minor routing fixes
mononaut Mar 16, 2026
7458980
fix(frontend): localize mining and acceleration chart legend and tool…
kayyrod21 Mar 17, 2026
0fb5c43
Potential fix for pull request finding
mononaut Mar 19, 2026
67bfa41
Merge pull request #6388 from mempool/mononaut/minor-routing-fixes
mononaut Mar 19, 2026
18c378f
Merge pull request #6395 from kayyrod21/fix/i18n-mining-charts-tooltips
natsoni Mar 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions frontend/src/app/app-routing.module.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import { AddressGroupComponent } from '@components/address-group/address-group.c
import { TrackerGuard } from '@app/route-guards';

const browserWindow = window as typeof window & { __env?: any };
// @ts-ignore
const browserWindowEnv = browserWindow.__env || {};

const testnetRoutes: Routes = browserWindowEnv.TESTNET_ENABLED ? [
Expand Down Expand Up @@ -313,7 +312,7 @@ const liquidTestnetRoutes: Routes = browserWindowEnv.LIQUID_TESTNET_ENABLED ? [
},
{
path: '**',
redirectTo: '/signet'
redirectTo: '/testnet'
},
]
},
Expand Down
27 changes: 15 additions & 12 deletions .../app/components/acceleration/acceleration-fees-graph/acceleration-fees-graph.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,9 @@ export class AccelerationFeesGraphComponent implements OnInit, OnChanges, OnDest
chartInstance: any = undefined;
daysAvailable: number = 0;

private readonly totalBidBoostLabel = $localize`:@@graphs.accelerationFees.totalBidBoost:Total bid boost`;
private readonly acceleratedLabel = $localize`:@@graphs.accelerationFees.accelerated:Accelerated`;

constructor(
@Inject(LOCALE_ID) public locale: string,
private seoService: SeoService,
Expand Down Expand Up @@ -182,14 +185,14 @@ export class AccelerationFeesGraphComponent implements OnInit, OnChanges, OnDest
let tooltip = `<b style="color: white; margin-left: 2px">${formatterXAxis(this.locale, this.timespan, parseInt(ticks[0].axisValue, 10))}</b><br>`;

for (const tick of ticks) {
if (tick.seriesName === 'Total bid boost') {
if (tick.seriesName === this.totalBidBoostLabel) {
if (tick.data[1] > 10_000_000) {
tooltip += `${tick.marker} ${tick.seriesName}: ${formatNumber(tick.data[1] / 100_000_000, this.locale, '1.0-8')} BTC<br>`;
tooltip += `${tick.marker} ${this.totalBidBoostLabel}: ${formatNumber(tick.data[1] / 100_000_000, this.locale, '1.0-8')} BTC<br>`;
} else {
tooltip += `${tick.marker} ${tick.seriesName}: ${formatNumber(tick.data[1], this.locale, '1.0-0')} sats<br>`;
tooltip += `${tick.marker} ${this.totalBidBoostLabel}: ${formatNumber(tick.data[1], this.locale, '1.0-0')} sats<br>`;
}
} else if (tick && tick.seriesName === 'Accelerated') {
tooltip += `${tick.marker} ${tick.seriesName}: ${formatNumber(tick.data[1], this.locale, '1.0-0')}<br>`;
} else if (tick && tick.seriesName === this.acceleratedLabel) {
tooltip += `${tick.marker} ${this.acceleratedLabel}: ${formatNumber(tick.data[1], this.locale, '1.0-0')}<br>`;
}
}
tooltip += `<small>` + $localize`Around block: ${ticks[0].data[2]}` + `</small>`;
Expand Down Expand Up @@ -219,7 +222,7 @@ export class AccelerationFeesGraphComponent implements OnInit, OnChanges, OnDest
legend: {
data: [
{
name: 'Total bid boost',
name: this.totalBidBoostLabel,
inactiveColor: 'rgb(110, 112, 121)',
textStyle: {
color: 'white',
Expand All @@ -230,7 +233,7 @@ export class AccelerationFeesGraphComponent implements OnInit, OnChanges, OnDest
icon: 'roundRect',
},
{
name: 'Accelerated',
name: this.acceleratedLabel,
inactiveColor: 'rgb(110, 112, 121)',
textStyle: {
color: 'white',
Expand All @@ -239,14 +242,14 @@ export class AccelerationFeesGraphComponent implements OnInit, OnChanges, OnDest
},
],
selected: {
'Total bid boost': true,
[this.totalBidBoostLabel]: true,
},
show: !this.widget,
},
yAxis: data.length === 0 ? undefined : [
{
type: 'value',
name: 'Total bid boost',
name: this.totalBidBoostLabel,
position: 'right',
nameTextStyle: {
align: 'right',
Expand All @@ -267,7 +270,7 @@ export class AccelerationFeesGraphComponent implements OnInit, OnChanges, OnDest
},
{
type: 'value',
name: 'Accelerated',
name: this.acceleratedLabel,
position: 'left',
axisLabel: {
color: 'rgb(110, 112, 121)',
Expand All @@ -288,7 +291,7 @@ export class AccelerationFeesGraphComponent implements OnInit, OnChanges, OnDest
],
series: data.length === 0 ? undefined : [
{
name: 'Total bid boost',
name: this.totalBidBoostLabel,
data: data.map(h => {
return [h.timestamp * 1000, h.sumBidBoost, h.avgHeight];
}),
Expand All @@ -300,7 +303,7 @@ export class AccelerationFeesGraphComponent implements OnInit, OnChanges, OnDest
smooth: true,
},
{
name: 'Accelerated',
name: this.acceleratedLabel,
yAxisIndex: 1,
data: data.map(h => {
return [h.timestamp * 1000, h.count, h.avgHeight];
Expand Down
17 changes: 10 additions & 7 deletions frontend/src/app/components/block-fees-graph/block-fees-graph.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,9 @@ export class BlockFeesGraphComponent implements OnInit {
}

prepareChartOptions(data) {
const feesBtcLabel = $localize`:@@graphs.blockFees.feesBtc:Fees BTC`;
const feesFiatLabel = $localize`:@@graphs.blockFees.feesFiat:Fees ${this.currency}:currency:`;

let title: object;
if (data.blockFees.length === 0) {
title = {
Expand Down Expand Up @@ -165,13 +168,13 @@ export class BlockFeesGraphComponent implements OnInit {

for (const tick of data) {
if (tick.seriesIndex === 0) {
tooltip += `${tick.marker} ${tick.seriesName}: ${formatNumber(tick.data[1], this.locale, '1.3-3')} BTC<br>`;
tooltip += `${tick.marker} ${feesBtcLabel}: ${formatNumber(tick.data[1], this.locale, '1.3-3')} BTC<br>`;
} else if (tick.seriesIndex === 1) {
tooltip += `${tick.marker} ${tick.seriesName}: ${this.fiatCurrencyPipe.transform(tick.data[1], null, this.currency) }<br>`;
tooltip += `${tick.marker} ${feesFiatLabel}: ${this.fiatCurrencyPipe.transform(tick.data[1], null, this.currency) }<br>`;
}
}

tooltip += `<small>* On average around block ${data[0].data[2]}</small>`;
tooltip += `<small>` + $localize`:@@graphs.blockFees.avgBlock:* On average around block ${data[0].data[2]}:block:` + `</small>`;
return tooltip;
}.bind(this)
},
Expand All @@ -186,15 +189,15 @@ export class BlockFeesGraphComponent implements OnInit {
legend: data.blockFees.length === 0 ? undefined : {
data: [
{
name: 'Fees BTC',
name: feesBtcLabel,
inactiveColor: 'rgb(110, 112, 121)',
textStyle: {
color: 'white',
},
icon: 'roundRect',
},
{
name: 'Fees ' + this.currency,
name: feesFiatLabel,
inactiveColor: 'rgb(110, 112, 121)',
textStyle: {
color: 'white',
Expand Down Expand Up @@ -239,7 +242,7 @@ export class BlockFeesGraphComponent implements OnInit {
legendHoverLink: false,
zlevel: 0,
yAxisIndex: 0,
name: 'Fees BTC',
name: feesBtcLabel,
data: data.blockFees,
type: 'line',
smooth: 0.25,
Expand All @@ -253,7 +256,7 @@ export class BlockFeesGraphComponent implements OnInit {
legendHoverLink: false,
zlevel: 1,
yAxisIndex: 1,
name: 'Fees ' + this.currency,
name: feesFiatLabel,
data: data.blockFeesFiat,
type: 'line',
smooth: 0.25,
Expand Down
63 changes: 35 additions & 28 deletions frontend/src/app/components/block-fees-subsidy-graph/block-fees-subsidy-graph.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,13 @@ export class BlockFeesSubsidyGraphComponent implements OnInit {
zoomTimeSpan = '';
legend: { mode: 'normal' | 'fiat' | 'percentage', subsidy: boolean, fees: boolean } = { mode: 'normal', subsidy: true, fees: true };

private readonly subsidyLabel = $localize`:@@graphs.blockFeesSubsidy.subsidy:Subsidy`;
private readonly feesLabel = $localize`:@@graphs.blockFeesSubsidy.fees:Fees`;
private readonly subsidyUsdLabel = $localize`:@@graphs.blockFeesSubsidy.subsidyUsd:Subsidy (USD)`;
private readonly feesUsdLabel = $localize`:@@graphs.blockFeesSubsidy.feesUsd:Fees (USD)`;
private readonly subsidyPercentLabel = $localize`:@@graphs.blockFeesSubsidy.subsidyPercent:Subsidy (%)`;
private readonly feesPercentLabel = $localize`:@@graphs.blockFeesSubsidy.feesPercent:Fees (%)`;

constructor(
@Inject(LOCALE_ID) public locale: string,
private seoService: SeoService,
Expand Down Expand Up @@ -235,47 +242,47 @@ export class BlockFeesSubsidyGraphComponent implements OnInit {
legend: this.data.blockFees.length === 0 ? undefined : {
data: [
{
name: 'Subsidy',
name: this.subsidyLabel,
inactiveColor: 'var(--grey)',
textStyle: {
color: 'white',
},
icon: 'roundRect',
},
{
name: 'Fees',
name: this.feesLabel,
inactiveColor: 'var(--grey)',
textStyle: {
color: 'white',
},
icon: 'roundRect',
},
{
name: 'Subsidy (USD)',
name: this.subsidyUsdLabel,
inactiveColor: 'var(--grey)',
textStyle: {
color: 'white',
},
icon: 'roundRect',
},
{
name: 'Fees (USD)',
name: this.feesUsdLabel,
inactiveColor: 'var(--grey)',
textStyle: {
color: 'white',
},
icon: 'roundRect',
},
{
name: 'Subsidy (%)',
name: this.subsidyPercentLabel,
inactiveColor: 'var(--grey)',
textStyle: {
color: 'white',
},
icon: 'roundRect',
},
{
name: 'Fees (%)',
name: this.feesPercentLabel,
inactiveColor: 'var(--grey)',
textStyle: {
color: 'white',
Expand All @@ -284,12 +291,12 @@ export class BlockFeesSubsidyGraphComponent implements OnInit {
},
],
selected: {
'Subsidy (USD)': this.displayMode === 'fiat' && this.legend.subsidy,
'Fees (USD)': this.displayMode === 'fiat' && this.legend.fees,
'Subsidy': this.displayMode === 'normal' && this.legend.subsidy,
'Fees': this.displayMode === 'normal' && this.legend.fees,
'Subsidy (%)': this.displayMode === 'percentage' && this.legend.subsidy,
'Fees (%)': this.displayMode === 'percentage' && this.legend.fees,
[this.subsidyUsdLabel]: this.displayMode === 'fiat' && this.legend.subsidy,
[this.feesUsdLabel]: this.displayMode === 'fiat' && this.legend.fees,
[this.subsidyLabel]: this.displayMode === 'normal' && this.legend.subsidy,
[this.feesLabel]: this.displayMode === 'normal' && this.legend.fees,
[this.subsidyPercentLabel]: this.displayMode === 'percentage' && this.legend.subsidy,
[this.feesPercentLabel]: this.displayMode === 'percentage' && this.legend.fees,
},
},
yAxis: this.data.blockFees.length === 0 ? undefined : [
Expand Down Expand Up @@ -331,47 +338,47 @@ export class BlockFeesSubsidyGraphComponent implements OnInit {
],
series: this.data.blockFees.length === 0 ? undefined : [
{
name: 'Subsidy',
name: this.subsidyLabel,
yAxisIndex: 0,
type: 'bar',
barWidth: '90%',
stack: 'total',
data: this.data.blockSubsidy,
},
{
name: 'Fees',
name: this.feesLabel,
yAxisIndex: 0,
type: 'bar',
barWidth: '90%',
stack: 'total',
data: this.data.blockFees,
},
{
name: 'Subsidy (USD)',
name: this.subsidyUsdLabel,
yAxisIndex: 1,
type: 'bar',
barWidth: '90%',
stack: 'total',
data: this.data.blockSubsidyFiat,
},
{
name: 'Fees (USD)',
name: this.feesUsdLabel,
yAxisIndex: 1,
type: 'bar',
barWidth: '90%',
stack: 'total',
data: this.data.blockFeesFiat,
},
{
name: 'Subsidy (%)',
name: this.subsidyPercentLabel,
yAxisIndex: 0,
type: 'bar',
barWidth: '90%',
stack: 'total',
data: this.data.blockSubsidyPercent,
},
{
name: 'Fees (%)',
name: this.feesPercentLabel,
yAxisIndex: 0,
type: 'bar',
barWidth: '90%',
Expand Down Expand Up @@ -413,9 +420,9 @@ export class BlockFeesSubsidyGraphComponent implements OnInit {
}

let mode: 'normal' | 'fiat' | 'percentage';
if (params.name.includes('USD')) {
if (params.name === this.subsidyUsdLabel || params.name === this.feesUsdLabel) {
mode = 'fiat';
} else if (params.name.includes('%')) {
} else if (params.name === this.subsidyPercentLabel || params.name === this.feesPercentLabel) {
mode = 'percentage';
} else {
mode = 'normal';
Expand All @@ -424,8 +431,8 @@ export class BlockFeesSubsidyGraphComponent implements OnInit {
const switchingMode = params.selected[params.name];

this.legend.mode = mode;
this.legend.fees = switchingMode || params.selected['Fees'] || params.selected['Fees (%)'] || params.selected['Fees (USD)'];
this.legend.subsidy = switchingMode || params.selected['Subsidy'] || params.selected['Subsidy (%)'] || params.selected['Subsidy (USD)'];
this.legend.fees = switchingMode || params.selected[this.feesLabel] || params.selected[this.feesPercentLabel] || params.selected[this.feesUsdLabel];
this.legend.subsidy = switchingMode || params.selected[this.subsidyLabel] || params.selected[this.subsidyPercentLabel] || params.selected[this.subsidyUsdLabel];
this.storageService.setValue('fees_subsidy_legend', JSON.stringify(this.legend));

if (this.displayMode === mode) {
Expand All @@ -434,12 +441,12 @@ export class BlockFeesSubsidyGraphComponent implements OnInit {

if (switchingMode) {
this.displayMode = mode;
this.chartInstance.dispatchAction({ type: this.displayMode === 'normal' ? 'legendSelect' : 'legendUnSelect', name: 'Subsidy' });
this.chartInstance.dispatchAction({ type: this.displayMode === 'normal' ? 'legendSelect' : 'legendUnSelect', name: 'Fees' });
this.chartInstance.dispatchAction({ type: this.displayMode === 'fiat' ? 'legendSelect' : 'legendUnSelect', name: 'Subsidy (USD)' });
this.chartInstance.dispatchAction({ type: this.displayMode === 'fiat' ? 'legendSelect' : 'legendUnSelect', name: 'Fees (USD)' });
this.chartInstance.dispatchAction({ type: this.displayMode === 'percentage' ? 'legendSelect' : 'legendUnSelect', name: 'Subsidy (%)' });
this.chartInstance.dispatchAction({ type: this.displayMode === 'percentage' ? 'legendSelect' : 'legendUnSelect', name: 'Fees (%)' });
this.chartInstance.dispatchAction({ type: this.displayMode === 'normal' ? 'legendSelect' : 'legendUnSelect', name: this.subsidyLabel });
this.chartInstance.dispatchAction({ type: this.displayMode === 'normal' ? 'legendSelect' : 'legendUnSelect', name: this.feesLabel });
this.chartInstance.dispatchAction({ type: this.displayMode === 'fiat' ? 'legendSelect' : 'legendUnSelect', name: this.subsidyUsdLabel });
this.chartInstance.dispatchAction({ type: this.displayMode === 'fiat' ? 'legendSelect' : 'legendUnSelect', name: this.feesUsdLabel });
this.chartInstance.dispatchAction({ type: this.displayMode === 'percentage' ? 'legendSelect' : 'legendUnSelect', name: this.subsidyPercentLabel });
this.chartInstance.dispatchAction({ type: this.displayMode === 'percentage' ? 'legendSelect' : 'legendUnSelect', name: this.feesPercentLabel });
}
});

Expand Down
5 changes: 4 additions & 1 deletion frontend/src/app/services/state.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { ReplaySubject, BehaviorSubject, Subject, fromEvent, Observable } from '
import { Transaction } from '@interfaces/electrs.interface';
import { AccelerationDelta, HealthCheckHost, IBackendInfo, MempoolBlock, MempoolBlockUpdate, MempoolInfo, Recommendedfees, ReplacedTransaction, ReplacementInfo, StratumJob, isMempoolState } from '@interfaces/websocket.interface';
import { Acceleration, AccelerationPosition, BlockExtended, CpfpInfo, DifficultyAdjustment, MempoolPosition, OptimizedMempoolStats, RbfTree, TransactionStripped } from '@interfaces/node-api.interface';
import { Router, NavigationStart } from '@angular/router';
import { Router, NavigationStart, NavigationEnd } from '@angular/router';
import { isPlatformBrowser } from '@angular/common';
import { filter, map, scan, share, shareReplay } from 'rxjs/operators';
import { StorageService } from '@app/services/storage.service';
Expand Down Expand Up @@ -264,6 +264,9 @@ export class StateService {
if (event instanceof NavigationStart) {
this.setNetworkBasedonUrl(event.url);
this.setLightningBasedonUrl(event.url);
} else if (event instanceof NavigationEnd) {
this.setNetworkBasedonUrl(event.urlAfterRedirects);
this.setLightningBasedonUrl(event.urlAfterRedirects);
}
});

Expand Down
Loading