Merge branch 'master' into regtest-1

2022-03-09 17:55:09 +01:00
parent 8d42b38234 fd1514177f
commit 2cd24624b9
14 changed files with 358 additions and 102 deletions
--- a/backend/src/api/bitcoin/bitcoin-api.ts
+++ b/backend/src/api/bitcoin/bitcoin-api.ts
@@ -218,7 +218,7 @@ class BitcoinApi implements AbstractBitcoinApi {
    if (map[outputType]) {
      return map[outputType];
    } else {
-      return '';
+      return 'unknown';
    }
  }