From 40f7eaf7baacc208ba01ce45ac3aa1eb3468a91f Mon Sep 17 00:00:00 2001
From: softsimon <softsimon@protonmail.com>
Date: Thu, 16 Jul 2020 00:33:53 +0700
Subject: [PATCH] Watch dir instead of json file. Adding divider to network
 dropdown.

---
 backend/mempool-config.sample.json                            | 2 +-
 backend/src/api/bisq.ts                                       | 2 +-
 .../src/app/components/master-page/master-page.component.html | 1 +
 .../src/app/components/master-page/master-page.component.scss | 4 ++++
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/backend/mempool-config.sample.json b/backend/mempool-config.sample.json
index 4f2944ef7..6900c0c15 100644
--- a/backend/mempool-config.sample.json
+++ b/backend/mempool-config.sample.json
@@ -14,7 +14,7 @@
   "TX_PER_SECOND_SPAN_SECONDS": 150,
   "ELECTRS_API_URL": "https://www.blockstream.info/testnet/api",
   "BISQ_ENABLED": false,
-  "BSQ_BLOCKS_DATA_PATH": "/bisq/data/all/blocks.json",
+  "BSQ_BLOCKS_DATA_PATH": "/bisq/data/all/",
   "SSL": false,
   "SSL_CERT_FILE_PATH": "/etc/letsencrypt/live/mysite/fullchain.pem",
   "SSL_KEY_FILE_PATH": "/etc/letsencrypt/live/mysite/privkey.pem"
diff --git a/backend/src/api/bisq.ts b/backend/src/api/bisq.ts
index d412e685c..7792a567b 100644
--- a/backend/src/api/bisq.ts
+++ b/backend/src/api/bisq.ts
@@ -196,7 +196,7 @@ class Bisq {
 
   private loadData(): Promise<string> {
     return new Promise((resolve, reject) => {
-      fs.readFile(config.BSQ_BLOCKS_DATA_PATH, 'utf8', (err, data) => {
+      fs.readFile(config.BSQ_BLOCKS_DATA_PATH + '/blocks.json', 'utf8', (err, data) => {
         if (err) {
           reject(err);
         }
diff --git a/frontend/src/app/components/master-page/master-page.component.html b/frontend/src/app/components/master-page/master-page.component.html
index af53e7ab0..2c08b617a 100644
--- a/frontend/src/app/components/master-page/master-page.component.html
+++ b/frontend/src/app/components/master-page/master-page.component.html
@@ -17,6 +17,7 @@
     <div class="dropdown-menu" [class.d-block]="!networkDropdownHidden">
       <a class="dropdown-item mainnet" routerLink="/"><img src="./resources/bitcoin-logo.png" style="width: 35.5px;"> Mainnet</a>
       <a *ngIf="env.TESTNET_ENABLED" class="dropdown-item testnet" [class.active]="network === 'testnet'" routerLink="/testnet"><img src="./resources/testnet-logo.png" style="width: 35.5px;"> Testnet</a>
+      <div *ngIf="env.LIQUID_ENABLED || env.BISQ_ENABLED" class="dropdown-divider"></div>
       <a *ngIf="env.LIQUID_ENABLED" class="dropdown-item liquid" [class.active]="network === 'liquid'" routerLink="/liquid"><img src="./resources/liquid-logo.png" style="width: 35.5px;"> Liquid</a>
       <a *ngIf="env.BISQ_ENABLED" class="dropdown-item mainnet" [class.active]="network === 'bisq'" routerLink="/bisq"><img src="./resources/bisq-logo.png" style="width: 35.5px;"> Bisq</a>
     </div>
diff --git a/frontend/src/app/components/master-page/master-page.component.scss b/frontend/src/app/components/master-page/master-page.component.scss
index 45f8ec6e1..8e3700b7c 100644
--- a/frontend/src/app/components/master-page/master-page.component.scss
+++ b/frontend/src/app/components/master-page/master-page.component.scss
@@ -47,3 +47,7 @@ nav {
 .testnet.active {
   background-color: #1d486f;
 }
+
+.dropdown-divider {
+  border-top: 1px solid #121420;
+}