From 0093eab26963880c22b58d3b86874e2de719760e Mon Sep 17 00:00:00 2001
From: nymkappa <vialjoris@hotmail.com>
Date: Mon, 11 Jul 2022 08:41:28 +0200
Subject: [PATCH 1/2] Liquid always uses esplora (regression of #2039)

---
 backend/src/api/blocks.ts | 9 ++++-----
 backend/src/api/common.ts | 2 +-
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/backend/src/api/blocks.ts b/backend/src/api/blocks.ts
index 62f3efa88..89b3d767f 100644
--- a/backend/src/api/blocks.ts
+++ b/backend/src/api/blocks.ts
@@ -527,13 +527,12 @@ class Blocks {
       }
     }
 
-    let block = await bitcoinClient.getBlock(hash);
-
     // Not Bitcoin network, return the block as it
     if (['mainnet', 'testnet', 'signet'].includes(config.MEMPOOL.NETWORK) === false) {
-      return block;
+      return await bitcoinApi.$getBlock(hash);
     }
 
+    let block = await bitcoinClient.getBlock(hash);
     block = prepareBlock(block);
 
     // Bitcoin network, add our custom data on top
@@ -547,8 +546,8 @@ class Blocks {
     return blockExtended;
   }
 
-  public async $getStrippedBlockTransactions(hash: string, skipMemoryCache: boolean = false,
-    skipDBLookup: boolean = false): Promise<TransactionStripped[]>
+  public async $getStrippedBlockTransactions(hash: string, skipMemoryCache = false,
+    skipDBLookup = false): Promise<TransactionStripped[]>
   {
     if (skipMemoryCache === false) {
       // Check the memory cache
diff --git a/backend/src/api/common.ts b/backend/src/api/common.ts
index 1dc9f66ea..fe6b858e0 100644
--- a/backend/src/api/common.ts
+++ b/backend/src/api/common.ts
@@ -172,7 +172,7 @@ export class Common {
 
   static indexingEnabled(): boolean {
     return (
-      ['mainnet', 'testnet', 'signet', 'regtest'].includes(config.MEMPOOL.NETWORK) &&
+      ['mainnet', 'testnet', 'signet'].includes(config.MEMPOOL.NETWORK) &&
       config.DATABASE.ENABLED === true &&
       config.MEMPOOL.INDEXING_BLOCKS_AMOUNT !== 0
     );

From f2e703e9281145a4ce409684e39837a73ff9071a Mon Sep 17 00:00:00 2001
From: nymkappa <vialjoris@hotmail.com>
Date: Mon, 11 Jul 2022 09:36:42 +0200
Subject: [PATCH 2/2] Fix graphs button layout

---
 frontend/src/app/components/graphs/graphs.component.html | 6 +++---
 frontend/src/app/components/graphs/graphs.component.ts   | 6 ++++++
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/frontend/src/app/components/graphs/graphs.component.html b/frontend/src/app/components/graphs/graphs.component.html
index 8914adf0a..6f93676f6 100644
--- a/frontend/src/app/components/graphs/graphs.component.html
+++ b/frontend/src/app/components/graphs/graphs.component.html
@@ -1,10 +1,10 @@
 <div *ngIf="stateService.env.MINING_DASHBOARD || stateService.env.LIGHTNING" class="mb-3 d-flex menu"
   style="padding: 0px 35px;">
 
-  <a routerLinkActive="active" class="btn btn-primary w-50 mr-1"
+  <a routerLinkActive="active" class="btn btn-primary mr-1" [class]="padding"
     [routerLink]="['/graphs/mempool' | relativeUrl]">Mempool</a>
 
-  <div ngbDropdown class="w-50" *ngIf="stateService.env.MINING_DASHBOARD">
+  <div ngbDropdown class="mr-1" [class]="padding" *ngIf="stateService.env.MINING_DASHBOARD">
     <button class="btn btn-primary w-100" id="dropdownBasic1" ngbDropdownToggle i18n="mining">Mining</button>
     <div ngbDropdownMenu aria-labelledby="dropdownBasic1">
       <a class="dropdown-item" routerLinkActive="active" [routerLink]="['/graphs/mining/pools' | relativeUrl]"
@@ -27,7 +27,7 @@
     </div>
   </div>
 
-  <div ngbDropdown class="w-50" *ngIf="stateService.env.LIGHTNING">
+  <div ngbDropdown [class]="padding" *ngIf="stateService.env.LIGHTNING">
     <button class="btn btn-primary w-100" id="dropdownBasic1" ngbDropdownToggle i18n="lightning">Lightning</button>
     <div ngbDropdownMenu aria-labelledby="dropdownBasic1">
       <a class="dropdown-item" routerLinkActive="active" [routerLink]="['/graphs/lightning/nodes-networks' | relativeUrl]"
diff --git a/frontend/src/app/components/graphs/graphs.component.ts b/frontend/src/app/components/graphs/graphs.component.ts
index e172d2206..1d3a4e2ae 100644
--- a/frontend/src/app/components/graphs/graphs.component.ts
+++ b/frontend/src/app/components/graphs/graphs.component.ts
@@ -8,6 +8,8 @@ import { WebsocketService } from "src/app/services/websocket.service";
   styleUrls: ['./graphs.component.scss'],
 })
 export class GraphsComponent implements OnInit {
+  padding = 'w-50';
+
   constructor(
     public stateService: StateService,
     private websocketService: WebsocketService
@@ -15,5 +17,9 @@ export class GraphsComponent implements OnInit {
 
   ngOnInit(): void {
     this.websocketService.want(['blocks']);
+
+    if (this.stateService.env.MINING_DASHBOARD === true && this.stateService.env.LIGHTNING === true) {
+      this.padding = 'w-33';
+    }
   }
 }