Merge branch 'master' into simon/bisq-dashboard

# Conflicts: # frontend/package-lock.json # frontend/src/app/components/master-page/master-page.component.html
2021-04-23 15:35:35 +04:00
parent 04ec5e9564 6ccac1df79
commit b8fe7b621c
32 changed files with 358 additions and 64 deletions
--- a/backend/src/api/websocket-handler.ts
+++ b/backend/src/api/websocket-handler.ts
@@ -167,8 +167,7 @@ class WebsocketHandler {
      'conversions': fiatConversion.getConversionRates(),
      'mempool-blocks': mempoolBlocks.getMempoolBlocks(),
      'transactions': memPool.getLatestTransactions(),
-      'git-commit': backendInfo.gitCommitHash,
-      'hostname': backendInfo.hostname,
+      'backendInfo': backendInfo.getBackendInfo(),
      'loadingIndicators': loadingIndicators.getLoadingIndicators(),
      ...this.extraInitProperties
    };