Merge branch 'master' into simon/configurable-main-module

# Conflicts:
#	frontend/src/app/components/blockchain/blockchain.component.ts

frontend/src/app/components/blockchain/blockchain.component.html

@@ -1,8 +1,8 @@
 <div class="text-center" class="blockchain-wrapper">
   <div class="position-container {{ network }}">
     <span>
-      <app-mempool-blocks [isLoading$]="isLoading$"></app-mempool-blocks>
-      <app-blockchain-blocks [isLoading$]="isLoading$"></app-blockchain-blocks>
+      <app-mempool-blocks></app-mempool-blocks>
+      <app-blockchain-blocks></app-blockchain-blocks>
       <div id="divider"></div>
     </span>
   </div>

frontend/src/app/components/blockchain/blockchain.component.ts

@@ -1,6 +1,5 @@
 import { Component, OnInit, ChangeDetectionStrategy } from '@angular/core';
 import { StateService } from 'src/app/services/state.service';
-import { Observable } from 'rxjs';
 
 @Component({
   selector: 'app-blockchain',
@@ -9,7 +8,6 @@ import { Observable } from 'rxjs';
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class BlockchainComponent implements OnInit {
-  isLoading$: Observable<boolean>;
   network: string;
 
   constructor(
@@ -17,7 +15,6 @@ export class BlockchainComponent implements OnInit {
   ) {}
 
   ngOnInit() {
-    this.isLoading$ = this.stateService.isLoadingWebSocket$;
     this.network = this.stateService.network;
   }
 }