Merge branch 'master' into regtest-1

2022-02-17 16:05:22 +01:00
parent 9c992a61c5 5ab4c0e611
commit 243055ceae
39 changed files with 1292 additions and 297 deletions
--- a/frontend/src/app/services/state.service.ts
+++ b/frontend/src/app/services/state.service.ts
@@ -37,6 +37,7 @@ export interface Env {
  MEMPOOL_WEBSITE_URL: string;
  LIQUID_WEBSITE_URL: string;
  BISQ_WEBSITE_URL: string;
+  MINING_DASHBOARD: boolean;
 }

 const defaultEnv: Env = {
@@ -61,6 +62,7 @@ const defaultEnv: Env = {
  'MEMPOOL_WEBSITE_URL': 'https://mempool.space',
  'LIQUID_WEBSITE_URL': 'https://liquid.network',
  'BISQ_WEBSITE_URL': 'https://bisq.markets',
+  'MINING_DASHBOARD': true
 };

@Injectable({