Merge 1427dfd into merged_master (Elements PR #855)

ElementsProject · Nov 26, 2020 · c18b580 · c18b580
2 parents 39be0fc + 1427dfd
commit c18b580
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/src/qt/guiconstants.h b/src/qt/guiconstants.h
@@ -45,15 +45,10 @@ static const int TOOLTIP_WRAP_THRESHOLD = 80;
 #define QAPP_ORG_NAME "Bitcoin"
 #define QAPP_ORG_DOMAIN "bitcoin.org"
 
-#if LIQUID
-#define QAPP_APP_NAME_DEFAULT "Liquid-Qt"
-#define QAPP_APP_NAME_TESTNET "Liquid-Qt-testnet"
-#define QAPP_APP_NAME_REGTEST "Liquid-Qt-regtest"
-#else
 #define QAPP_APP_NAME_DEFAULT "Elements-Qt"
 #define QAPP_APP_NAME_TESTNET "Elements-Qt-testnet"
 #define QAPP_APP_NAME_REGTEST "Elements-Qt-regtest"
-#endif
+#define QAPP_APP_NAME_LIQUID "Elements-Qt (Liquid)"
 
 /* One gigabyte (GB) in bytes */
 static constexpr uint64_t GB_BYTES{1000000000};

diff --git a/src/qt/networkstyle.cpp b/src/qt/networkstyle.cpp
@@ -19,7 +19,7 @@ static const struct {
 } network_styles[] = {
     {"main", QAPP_APP_NAME_DEFAULT, 0, 0},
     {"test", QAPP_APP_NAME_TESTNET, 70, 30},
-    {"liquidv1", "Liquid-Qt-liquidv1", 0, 0},
+    {"liquidv1", QAPP_APP_NAME_LIQUID, 0, 0},
     {"regtest", QAPP_APP_NAME_REGTEST, 160, 30}
 };
 static const unsigned network_styles_count = sizeof(network_styles)/sizeof(*network_styles);