-
+
Remaining
@@ -222,7 +226,8 @@
- {{ epochData.change | absolute | number: '1.2-2' }} %
+ {{ epochData.change | absolute | number: '1.2-2' }}
+ %
Previous:
@@ -233,7 +238,8 @@
- {{ epochData.previousRetarget | absolute | number: '1.2-2' }} %
+ {{ epochData.previousRetarget | absolute | number: '1.2-2' }} %
+
Current Period
diff --git a/frontend/src/app/dashboard/dashboard.component.scss b/frontend/src/app/dashboard/dashboard.component.scss
index 812a7c9d2..37a37d529 100644
--- a/frontend/src/app/dashboard/dashboard.component.scss
+++ b/frontend/src/app/dashboard/dashboard.component.scss
@@ -31,7 +31,7 @@
width: 100%;
background-color: #2d3348;
height: 1.1rem;
- max-width: 130px;
+ max-width: 180px;
}
.bg-warning {
@@ -117,6 +117,15 @@
margin: 0px auto 0px;
}
}
+ .skeleton-loader {
+ width: 100%;
+ max-width: 100px;
+ display: block;
+ margin: 18px auto 0;
+ }
+ .skeleton-loader-big {
+ max-width: 180px;
+ }
}
.latest-transactions {
@@ -160,6 +169,13 @@
text-align: right;
}
}
+.skeleton-loader-transactions {
+ max-width: 250px;
+ position: relative;
+ top: 2px;
+ margin-bottom: -3px;
+ height: 18px;
+}
.lastest-blocks-table {
width: 100%;
@@ -219,6 +235,7 @@
.small-bar {
height: 8px;
top: -4px;
+ max-width: 120px;
}
.difficulty-adjustment-container {
@@ -233,7 +250,7 @@
.item {
padding: 0 5px;
width: 100%;
- &:nth-child(1){
+ &:nth-child(1) {
display: none;
@media (min-width: 485px) {
display: table-cell;
@@ -283,26 +300,26 @@
margin-bottom: 0;
}
}
-}
-
-.loading-container{
- min-height: 76px;
-}
-
-.card-text {
- .skeleton-loader {
- width: 100%;
- display: block;
- margin: 7px auto;
- &:first-child {
- max-width: 80px;
- }
- &:last-child {
- max-width: 110px;
+ .card-text {
+ .skeleton-loader {
+ width: 100%;
+ display: block;
+ &:first-child {
+ margin: 14px auto 0;
+ max-width: 80px;
+ }
+ &:last-child {
+ margin: 10px auto 0;
+ max-width: 120px;
+ }
}
}
}
+.loading-container {
+ min-height: 76px;
+}
+
.main-title {
position: relative;
color: #ffffff91;
@@ -313,6 +330,7 @@
text-align: center;
padding-bottom: 3px;
}
+
.card-wrapper {
.card {
height: auto !important;
diff --git a/frontend/src/app/dashboard/dashboard.component.ts b/frontend/src/app/dashboard/dashboard.component.ts
index 9e28e96ed..f6424cc62 100644
--- a/frontend/src/app/dashboard/dashboard.component.ts
+++ b/frontend/src/app/dashboard/dashboard.component.ts
@@ -62,6 +62,7 @@ export class DashboardComponent implements OnInit {
mempoolTransactionsWeightPerSecondData: any;
mempoolStats$: Observable;
transactionsWeightPerSecondOptions: any;
+ isLoadingWebSocket$: Observable;
constructor(
@Inject(LOCALE_ID) private locale: string,
@@ -73,6 +74,8 @@ export class DashboardComponent implements OnInit {
) { }
ngOnInit(): void {
+
+ this.isLoadingWebSocket$ = this.stateService.isLoadingWebSocket$;
this.seoService.resetTitle();
this.websocketService.want(['blocks', 'stats', 'mempool-blocks', 'live-2h-chart']);
this.network$ = merge(of(''), this.stateService.networkChanged$);
@@ -113,7 +116,7 @@ export class DashboardComponent implements OnInit {
};
})
);
-
+
this.difficultyEpoch$ = timer(0, 1000)
.pipe(
switchMap(() => combineLatest([
@@ -141,13 +144,13 @@ export class DashboardComponent implements OnInit {
let colorAdjustments = '#dc3545';
if (difficultyChange >= 0) {
- colorAdjustments = '#299435';
+ colorAdjustments = '#3bcc49';
}
let colorPreviousAdjustments = '#dc3545';
if(previousRetarget){
if (previousRetarget >= 0) {
- colorPreviousAdjustments = '#299435';
+ colorPreviousAdjustments = '#3bcc49';
}
if (previousRetarget === 0) {
colorPreviousAdjustments = '#ffffff66';