Merge branch 'master' into projected-block-overview

frontend/src/app/components/difficulty/difficulty.component.scss

@@ -133,7 +133,7 @@
     text-align: center;
     flex-direction: column;
     justify-content: space-around;
-    padding: 22px 20px;
+    padding: 24px 20px;
   }
 }
 
@@ -148,3 +148,7 @@
   margin-right: -2px;
   font-size: 10px;
 }
+
+.symbol {
+  font-size: 13px;
+}

frontend/src/app/components/fees-box/fees-box.component.html

@@ -1,19 +1,33 @@
-<div class="fee-estimation-wrapper">
+<div class="fee-estimation-wrapper" *ngIf="(isLoadingWebSocket$ | async) === false && (recommendedFees$ | async) as recommendedFees; else loadingFees">
-  <div class="fee-estimation-container" *ngIf="(isLoadingWebSocket$ | async) === false && (recommendedFees$ | async) as recommendedFees; else loadingFees">
+  <div class="fee-progress-bar" [style.background]="gradient">
+    <span class="fee-label" i18n="fees-box.minimum">Minimum</span>
+    <span class="fee-label" i18n="fees-box.economy">Economy</span>
+    <span class="fee-label" i18n="fees-box.low">Low</span>
+    <span class="fee-label" i18n="fees-box.medium">Medium</span>
+    <span class="fee-label" i18n="fees-box.high">High</span>
+  </div>
+  <div class="fee-estimation-container">
+    <div class="item">
+      <div class="card-text" i18n-ngbTooltip="Transaction fee tooltip" ngbTooltip="Based on average native segwit transaction of 140 vBytes" placement="bottom">
+        <div class="fee-text">{{ recommendedFees.minimumFee }} <span i18n="shared.sat-vbyte|sat/vB">sat/vB</span></div> <span class="fiat"><app-fiat [value]="recommendedFees.minimumFee * 140" ></app-fiat></span>
+      </div>
+    </div>
+    <div class="item">
+      <div class="card-text" i18n-ngbTooltip="Transaction fee tooltip" ngbTooltip="Based on average native segwit transaction of 140 vBytes" placement="bottom">
+        <div class="fee-text">{{ recommendedFees.economyFee }} <span i18n="shared.sat-vbyte|sat/vB">sat/vB</span></div> <span class="fiat"><app-fiat [value]="recommendedFees.economyFee * 140" ></app-fiat></span>
+      </div>
+    </div>
     <div class="item">
-      <h5 class="card-title" i18n="fees-box.low-priority">Low priority</h5>
       <div class="card-text" i18n-ngbTooltip="Transaction fee tooltip" ngbTooltip="Based on average native segwit transaction of 140 vBytes" placement="bottom">
         <div class="fee-text">{{ recommendedFees.hourFee }} <span i18n="shared.sat-vbyte|sat/vB">sat/vB</span></div> <span class="fiat"><app-fiat [value]="recommendedFees.hourFee * 140" ></app-fiat></span>
       </div>
     </div>
     <div class="item">
-      <h5 class="card-title" i18n="fees-box.medium-priority">Medium priority</h5>
       <div class="card-text" i18n-ngbTooltip="Transaction fee tooltip" ngbTooltip="Based on average native segwit transaction of 140 vBytes" placement="bottom">
         <div class="fee-text">{{ recommendedFees.halfHourFee }} <span i18n="shared.sat-vbyte|sat/vB">sat/vB</span></div> <span class="fiat"><app-fiat [value]="recommendedFees.halfHourFee * 140" ></app-fiat></span>
       </div>
     </div>
     <div class="item">
-      <h5 class="card-title" i18n="fees-box.high-priority">High priority</h5>
       <div class="card-text" i18n-ngbTooltip="Transaction fee tooltip" ngbTooltip="Based on average native segwit transaction of 140 vBytes" placement="bottom">
         <div class="fee-text">{{ recommendedFees.fastestFee }} <span i18n="shared.sat-vbyte|sat/vB">sat/vB</span></div> <span class="fiat"><app-fiat [value]="recommendedFees.fastestFee * 140" ></app-fiat></span>
       </div>
@@ -22,23 +36,39 @@
 </div>
 
 <ng-template #loadingFees>
+  <div class="fee-progress-bar" [style.background]="gradient">
+    <span class="fee-label" i18n="fees-box.minimum">Minimum</span>
+    <span class="fee-label" i18n="fees-box.economy">Economy</span>
+    <span class="fee-label" i18n="fees-box.low">Low</span>
+    <span class="fee-label" i18n="fees-box.medium">Medium</span>
+    <span class="fee-label" i18n="fees-box.high">High</span>
+  </div>
   <div class="fee-estimation-container loading-container">
     <div class="item">
-      <h5 class="card-title" i18n="fees-box.low-priority">Low priority</h5>
       <div class="card-text">
         <div class="skeleton-loader"></div>
         <div class="skeleton-loader"></div>
       </div>
     </div>
     <div class="item">
-      <h5 class="card-title" i18n="fees-box.medium-priority">Medium priority</h5>
       <div class="card-text">
         <div class="skeleton-loader"></div>
         <div class="skeleton-loader"></div>
       </div>
     </div>
     <div class="item">
-      <h5 class="card-title" i18n="fees-box.high-priority">High priority</h5>
+      <div class="card-text">
+        <div class="skeleton-loader"></div>
+        <div class="skeleton-loader"></div>
+      </div>
+    </div>
+    <div class="item">
+      <div class="card-text">
+        <div class="skeleton-loader"></div>
+        <div class="skeleton-loader"></div>
+      </div>
+    </div>
+    <div class="item">
       <div class="card-text">
         <div class="skeleton-loader"></div>
         <div class="skeleton-loader"></div>

frontend/src/app/components/fees-box/fees-box.component.scss

@@ -1,7 +1,7 @@
 .card-title {
   color: #4a68b9;
   font-size: 10px;
-  margin-bottom: 4px;  
+  margin-bottom: 4px;
   font-size: 1rem;
 }
 
@@ -21,28 +21,22 @@
 .fee-estimation-container {
   display: flex;
   justify-content: space-between;
-  @media (min-width: 376px) {
+  flex-direction: row;
-    flex-direction: row;
-  }  
   .item {
-    max-width: 150px;
+    width: 100px;
     margin: 0;
     width: -webkit-fill-available;
-    @media (min-width: 376px) {
+    &:first-child {
-      margin: 0 auto 0px;
+      @media (767px < width < 992px), (width < 576px) {
-    }    
+        display: none
-    &:first-child{
+      }
-      display: none;
-      @media (min-width: 485px) {
-        display: block;
-      }    
-      @media (min-width: 768px) {
-        display: none;
-      }    
-      @media (min-width: 992px) {
-        display: block;
-      }    
     }
+    &:nth-child(2) {
+      @media (767px < width < 992px), (width < 576px) {
+        display: none
+      }
+    }
+    margin: 0 auto 0px;
     &:last-child {
       margin-bottom: 0;
     }
@@ -55,18 +49,17 @@
       border-bottom: 1px solid #ffffff1c;
       width: fit-content;
       margin: auto;
-      line-height: 1.45;
+      font-size: 20px;
-      padding: 0px 2px;
     }
     .fiat {
       display: block;
-      font-size: 14px !important;
+      font-size: 13px !important;
     }
   }
 }
 
 .loading-container{
-  min-height: 76px;
+  height: 50px;
 }
 
 .card-text {
@@ -74,12 +67,40 @@
     width: 100%;
     display: block;
     &:first-child {
-      max-width: 90px;
+      max-width: 70px;
-      margin: 15px auto 3px;
+      margin: 10px auto 3px;
     }
     &:last-child {
       margin: 10px auto 3px;
       max-width: 55px;
     }
   }
+}
+
+.fee-progress-bar {
+  width: 100%;
+  height: 22px;
+  margin-bottom: 12px;
+  border-radius: 0px 10px 10px 0px;
+  display: flex;
+  flex-direction: row;
+  transition: background-color 1s;
+}
+
+.fee-label {
+  font-size: 14px;
+  width: 20%;
+  @media (767px < width < 992px), (width < 576px) {
+    width: 33%;
+  }
+  &:first-child {
+    @media (767px < width < 992px), (width < 576px) {
+      display: none
+    }
+  }
+  &:nth-child(2) {
+    @media (767px < width < 992px), (width < 576px) {
+      display: none
+    }
+  }
 }

frontend/src/app/components/fees-box/fees-box.component.ts

@@ -1,14 +1,9 @@
 import { Component, OnInit, ChangeDetectionStrategy } from '@angular/core';
 import { StateService } from 'src/app/services/state.service';
-import { map, filter, tap } from 'rxjs/operators';
+import { Observable } from 'rxjs';
-import { merge, Observable } from 'rxjs';
+import { Recommendedfees } from 'src/app/interfaces/websocket.interface';
-import { MempoolBlock, Recommendedfees } from 'src/app/interfaces/websocket.interface';
+import { feeLevels, mempoolFeeColors } from 'src/app/app.constants';
-
+import { tap } from 'rxjs/operators';
-interface FeeEstimations {
-  fastestFee: number;
-  halfHourFee: number;
-  hourFee: number;
-}
 
 @Component({
   selector: 'app-fees-box',
@@ -19,16 +14,28 @@ interface FeeEstimations {
 export class FeesBoxComponent implements OnInit {
   isLoadingWebSocket$: Observable<boolean>;
   recommendedFees$: Observable<Recommendedfees>;
-  defaultFee: number;
+  gradient = 'linear-gradient(to right, #2e324e, #2e324e)';
 
   constructor(
-    private stateService: StateService,
+    private stateService: StateService
   ) { }
 
   ngOnInit(): void {
-    this.defaultFee = this.stateService.network === 'liquid' || this.stateService.network === 'liquidtestnet' ? 0.1 : 1;
-
     this.isLoadingWebSocket$ = this.stateService.isLoadingWebSocket$;
-    this.recommendedFees$ = this.stateService.recommendedFees$;
+    this.recommendedFees$ = this.stateService.recommendedFees$
+      .pipe(
+        tap((fees) => {
+          let feeLevelIndex = feeLevels.slice().reverse().findIndex((feeLvl) => fees.minimumFee >= feeLvl);
+          feeLevelIndex = feeLevelIndex >= 0 ? feeLevels.length - feeLevelIndex : feeLevelIndex;
+          const startColor = '#' + (mempoolFeeColors[feeLevelIndex - 1] || mempoolFeeColors[mempoolFeeColors.length - 1]);
+
+          feeLevelIndex = feeLevels.slice().reverse().findIndex((feeLvl) => fees.fastestFee >= feeLvl);
+          feeLevelIndex = feeLevelIndex >= 0 ? feeLevels.length - feeLevelIndex : feeLevelIndex;
+          const endColor = '#' + (mempoolFeeColors[feeLevelIndex - 1] || mempoolFeeColors[mempoolFeeColors.length - 1]);
+
+          this.gradient = `linear-gradient(to right, ${startColor}, ${endColor})`;
+        }
+      )
+    );
   }
 }

frontend/src/app/components/mempool-blocks/mempool-blocks.component.ts

@@ -238,7 +238,6 @@ export class MempoolBlocksComponent implements OnInit, OnDestroy {
       gradientColors.push(mempoolFeeColors[feeLevelIndex - 1] || mempoolFeeColors[mempoolFeeColors.length - 1]);
     });
 
-
     gradientColors.forEach((color, i, gc) => {
       backgroundGradients.push(`
         #${i === 0 ? color : gc[i - 1]} ${ i === 0 ? emptyBackgroundSpacePercentage : ((i / gradientColors.length) * 100) * usedBlockSpace / 100 + emptyBackgroundSpacePercentage }%,

frontend/src/app/components/mining-dashboard/mining-dashboard.component.scss

@@ -64,7 +64,7 @@
 }
 
 .more-padding {
-  padding: 18px;
+  padding: 24px 20px !important;
 }
 
 .card-wrapper {

frontend/src/app/dashboard/dashboard.component.html

@@ -5,7 +5,7 @@
       <div class="col card-wrapper" *ngIf="(network$ | async) !== 'liquid' && (network$ | async) !== 'liquidtestnet'">
         <div class="main-title" i18n="fees-box.transaction-fees">Transaction Fees</div>
         <div class="card">
-          <div class="card-body">
+          <div class="card-body less-padding">
             <app-fees-box class="d-block"></app-fees-box>
           </div>
         </div>
@@ -33,7 +33,7 @@
         <div class="col card-wrapper">
           <div class="main-title" i18n="fees-box.transaction-fees">Transaction Fees</div>
           <div class="card">
-            <div class="card-body">
+            <div class="card-body less-padding">
               <app-fees-box class="d-block"></app-fees-box>
             </div>
           </div>

frontend/src/app/dashboard/dashboard.component.scss

@@ -269,6 +269,9 @@
     justify-content: space-around;
     padding: 22px 20px;
   }
+  .less-padding {
+    padding: 20px 20px;
+  }
 }
 
 .retarget-sign {