|
-
+
diff --git a/frontend/src/app/components/difficulty/difficulty.component.html b/frontend/src/app/components/difficulty/difficulty.component.html
index 8011c7e6f..d1de5f076 100644
--- a/frontend/src/app/components/difficulty/difficulty.component.html
+++ b/frontend/src/app/components/difficulty/difficulty.component.html
@@ -1,7 +1,15 @@
- Difficulty Adjustment
+Difficulty Adjustment
+Halving Countdown
-
+
+
+
+
+
+
+
+
+
+ {{ ((210000 - epochData.blocksUntilHalving) / 2100).toFixed(2) }}%
+
+
+
+
+
+
+ {{ epochData.blocksUntilHalving | number }}
+
+
+ Blocks remaining
+ Block remaining
+
+
+
+
+ {{ epochData.timeUntilHalving | date }}
+
+
+
+
+
+
+
+
+
+
diff --git a/frontend/src/app/components/difficulty/difficulty.component.scss b/frontend/src/app/components/difficulty/difficulty.component.scss
index 1da1591d0..3b591dc2d 100644
--- a/frontend/src/app/components/difficulty/difficulty.component.scss
+++ b/frontend/src/app/components/difficulty/difficulty.component.scss
@@ -168,7 +168,7 @@
white-space: nowrap;
}
-.epoch-progress {
+.epoch-progress, .halving-progress {
width: 100%;
height: 22px;
margin-bottom: 12px;
@@ -212,4 +212,43 @@
}
.blocks-behind {
color: #D81B60;
+}
+
+.halving-progress {
+ position: relative;
+ .background, .remaining {
+ position: absolute;
+ top: 0;
+ bottom: 0;
+ height: 100%;
+ }
+ .background {
+ background: linear-gradient(to right, #105fb0, #9339f4);
+ left: 0;
+ right: 0;
+ }
+ .remaining {
+ background: #2d3348;
+ right: 0;
+ }
+ .label {
+ position: relative;
+ margin: auto;
+ }
+}
+
+.widget-toggler {
+ font-size: 12px;
+ position: absolute;
+ top: -20px;
+ right: 3px;
+ text-align: right;
+}
+
+.toggler-option {
+ text-decoration: none;
+}
+
+.inactive {
+ color: #ffffff66;
}
\ No newline at end of file
diff --git a/frontend/src/app/components/difficulty/difficulty.component.ts b/frontend/src/app/components/difficulty/difficulty.component.ts
index d37667312..13f61dc5e 100644
--- a/frontend/src/app/components/difficulty/difficulty.component.ts
+++ b/frontend/src/app/components/difficulty/difficulty.component.ts
@@ -51,6 +51,10 @@ export class DifficultyComponent implements OnInit {
isLoadingWebSocket$: Observable ;
difficultyEpoch$: Observable;
+ mode: 'difficulty' | 'halving' = 'difficulty';
+ userSelectedMode: boolean = false;
+
+ now: number = Date.now();
epochStart: number;
currentHeight: number;
currentIndex: number;
@@ -101,6 +105,11 @@ export class DifficultyComponent implements OnInit {
const timeUntilHalving = new Date().getTime() + (blocksUntilHalving * 600000);
const newEpochStart = Math.floor(this.stateService.latestBlockHeight / EPOCH_BLOCK_LENGTH) * EPOCH_BLOCK_LENGTH;
const newExpectedHeight = Math.floor(newEpochStart + da.expectedBlocks);
+ this.now = new Date().getTime();
+
+ if (blocksUntilHalving < da.remainingBlocks && !this.userSelectedMode) {
+ this.mode = 'halving';
+ }
if (newEpochStart !== this.epochStart || newExpectedHeight !== this.expectedHeight || this.currentHeight !== this.stateService.latestBlockHeight) {
this.epochStart = newEpochStart;
@@ -194,6 +203,12 @@ export class DifficultyComponent implements OnInit {
return shapes;
}
+ setMode(mode: 'difficulty' | 'halving'): boolean {
+ this.mode = mode;
+ this.userSelectedMode = true;
+ return false;
+ }
+
@HostListener('pointerdown', ['$event'])
onPointerDown(event): void {
if (this.epochSvgElement?.nativeElement?.contains(event.target)) {
diff --git a/frontend/src/app/components/pool/pool.component.scss b/frontend/src/app/components/pool/pool.component.scss
index 92fdc2ef3..8bd6763e5 100644
--- a/frontend/src/app/components/pool/pool.component.scss
+++ b/frontend/src/app/components/pool/pool.component.scss
@@ -32,6 +32,7 @@
}
.chart {
+ margin-top: 10px;
margin-bottom: 20px;
@media (max-width: 768px) {
margin-bottom: 10px;
diff --git a/frontend/src/app/components/pool/pool.component.ts b/frontend/src/app/components/pool/pool.component.ts
index 27a705054..8274bf441 100644
--- a/frontend/src/app/components/pool/pool.component.ts
+++ b/frontend/src/app/components/pool/pool.component.ts
@@ -65,7 +65,9 @@ export class PoolComponent implements OnInit {
.pipe(
switchMap((data) => {
this.isLoading = false;
- this.prepareChartOptions(data.map(val => [val.timestamp * 1000, val.avgHashrate]));
+ const hashrate = data.map(val => [val.timestamp * 1000, val.avgHashrate]);
+ const share = data.map(val => [val.timestamp * 1000, val.share * 100]);
+ this.prepareChartOptions(hashrate, share);
return [slug];
}),
catchError(() => {
@@ -130,9 +132,9 @@ export class PoolComponent implements OnInit {
);
}
- prepareChartOptions(data) {
+ prepareChartOptions(hashrate, share) {
let title: object;
- if (data.length <= 1) {
+ if (hashrate.length <= 1) {
title = {
textStyle: {
color: 'grey',
@@ -177,26 +179,57 @@ export class PoolComponent implements OnInit {
},
borderColor: '#000',
formatter: function (ticks: any[]) {
- let hashratePowerOfTen: any = selectPowerOfTen(1);
- let hashrate = ticks[0].data[1];
-
- hashratePowerOfTen = selectPowerOfTen(ticks[0].data[1], 10);
- hashrate = ticks[0].data[1] / hashratePowerOfTen.divider;
+ let hashrateString = '';
+ let dominanceString = '';
+ for (const tick of ticks) {
+ if (tick.seriesIndex === 0) {
+ let hashratePowerOfTen = selectPowerOfTen(tick.data[1], 10);
+ let hashrateData = tick.data[1] / hashratePowerOfTen.divider;
+ hashrateString = `${tick.marker} ${tick.seriesName}: ${formatNumber(hashrateData, this.locale, '1.0-0')} ${hashratePowerOfTen.unit}H/s
`;
+ } else if (tick.seriesIndex === 1) {
+ dominanceString = `${tick.marker} ${tick.seriesName}: ${formatNumber(tick.data[1], this.locale, '1.0-2')}%`;
+ }
+ }
+
return `
${ticks[0].axisValueLabel}
- ${ticks[0].marker} ${ticks[0].seriesName}: ${formatNumber(hashrate, this.locale, '1.0-0')} ${hashratePowerOfTen.unit}H/s
+ ${hashrateString}
+ ${dominanceString}
`;
}.bind(this)
},
- xAxis: data.length <= 1 ? undefined : {
+ xAxis: hashrate.length <= 1 ? undefined : {
type: 'time',
splitNumber: (this.isMobile()) ? 5 : 10,
axisLabel: {
hideOverlap: true,
}
},
- yAxis: data.length <= 1 ? undefined : [
+ legend: {
+ data: [
+ {
+ name: $localize`:mining.hashrate:Hashrate`,
+ inactiveColor: 'rgb(110, 112, 121)',
+ textStyle: {
+ color: 'white',
+ },
+ icon: 'roundRect',
+ itemStyle: {
+ color: '#FFB300',
+ },
+ },
+ {
+ name: $localize`:mining.pool-dominance:Pool Dominance`,
+ inactiveColor: 'rgb(110, 112, 121)',
+ textStyle: {
+ color: 'white',
+ },
+ icon: 'roundRect',
+ },
+ ],
+ },
+ yAxis: hashrate.length <= 1 ? undefined : [
{
min: (value) => {
return value.min * 0.9;
@@ -214,21 +247,45 @@ export class PoolComponent implements OnInit {
show: false,
}
},
- ],
- series: data.length <= 1 ? undefined : [
{
- zlevel: 0,
- name: 'Hashrate',
+ type: 'value',
+ axisLabel: {
+ color: 'rgb(110, 112, 121)',
+ formatter: (val) => {
+ return `${val}%`
+ }
+ },
+ splitLine: {
+ show: false,
+ }
+ }
+ ],
+ series: hashrate.length <= 1 ? undefined : [
+ {
+ zlevel: 1,
+ name: $localize`:mining.hashrate:Hashrate`,
showSymbol: false,
symbol: 'none',
- data: data,
+ data: hashrate,
type: 'line',
lineStyle: {
width: 2,
},
},
+ {
+ zlevel: 0,
+ name: $localize`:mining.pool-dominance:Pool Dominance`,
+ showSymbol: false,
+ symbol: 'none',
+ data: share,
+ type: 'line',
+ yAxisIndex: 1,
+ lineStyle: {
+ width: 2,
+ },
+ }
],
- dataZoom: data.length <= 1 ? undefined : [{
+ dataZoom: hashrate.length <= 1 ? undefined : [{
type: 'inside',
realtime: true,
zoomLock: true,
diff --git a/frontend/src/app/components/transaction/transaction.component.html b/frontend/src/app/components/transaction/transaction.component.html
index 1e204f6be..0963014bd 100644
--- a/frontend/src/app/components/transaction/transaction.component.html
+++ b/frontend/src/app/components/transaction/transaction.component.html
@@ -74,8 +74,7 @@
Audit |
- Coinbase
- Accelerated
+ Coinbase
Expected in Block
Seen in Mempool
Not seen in Mempool
@@ -517,9 +516,9 @@
-
- {{ error.error }}
-
+
+ Error loading transaction data.
+
diff --git a/frontend/src/app/lightning/channel/channel-preview.component.html b/frontend/src/app/lightning/channel/channel-preview.component.html
index e59361e42..108fe2e95 100644
--- a/frontend/src/app/lightning/channel/channel-preview.component.html
+++ b/frontend/src/app/lightning/channel/channel-preview.component.html
@@ -66,9 +66,7 @@
-
+
Error loading data.
-
- {{ error.status }}: {{ error.error }}
-
+
+ ({{ error | httpErrorMsg }})
+ | |