Improve block % and fee display

bisq-network · Nov 26, 2020 · d60a2dd · d60a2dd
1 parent 99a076d
commit d60a2dd
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 15 deletions.
diff --git a/core/src/main/java/bisq/core/app/WalletAppSetup.java b/core/src/main/java/bisq/core/app/WalletAppSetup.java
@@ -118,7 +118,6 @@ void init(@Nullable Consumer<String> chainFileLockedExceptionHandler,
                     String result;
                     if (exception == null) {
                         double percentage = (double) downloadPercentage;
-                        String fees = feeService.getFeeTextForDisplay();
                         btcSyncProgress.set(percentage);
                         int bestChainHeight = walletsSetup.getChain() != null ?
                                 walletsSetup.getChain().getBestChainHeight() :
@@ -129,10 +128,11 @@ void init(@Nullable Consumer<String> chainFileLockedExceptionHandler,
                         if (percentage == 1) {
                             String synchronizedWith = Res.get("mainView.footer.btcInfo.synchronizedWith",
                                     getBtcNetworkAsString(), chainHeightAsString);
-                            result = Res.get("mainView.footer.btcInfo", synchronizedWith,
-                                    feeService.getFeeTextForDisplay());
+                            String info = feeService.isFeeAvailable() ?
+                                    Res.get("mainView.footer.btcFeeRate", feeService.getTxFeePerVbyte().value) :
+                                    "";
+                            result = Res.get("mainView.footer.btcInfo", synchronizedWith, info);
                             getBtcSplashSyncIconId().set("image-connection-synced");
-
                             downloadCompleteHandler.run();
                         } else if (percentage > 0.0) {
                             String synchronizingWith = Res.get("mainView.footer.btcInfo.synchronizingWith",

diff --git a/core/src/main/java/bisq/core/provider/fee/FeeService.java b/core/src/main/java/bisq/core/provider/fee/FeeService.java
@@ -20,7 +20,6 @@
 import bisq.core.dao.governance.param.Param;
 import bisq.core.dao.governance.period.PeriodService;
 import bisq.core.dao.state.DaoStateService;
-import bisq.core.locale.Res;
 
 import bisq.common.UserThread;
 import bisq.common.config.Config;
@@ -192,10 +191,7 @@ public ReadOnlyIntegerProperty feeUpdateCounterProperty() {
         return feeUpdateCounter;
     }
 
-    public String getFeeTextForDisplay() {
-        // only show the fee rate if it has been initialized from the service (see feeUpdateCounter)
-        if (feeUpdateCounter.get() > 0)
-            return Res.get("mainView.footer.btcFeeRate", txFeePerVbyte);
-        return "";
+    public boolean isFeeAvailable() {
+        return feeUpdateCounter.get() > 0;
     }
 }
diff --git a/core/src/main/resources/i18n/displayStrings.properties b/core/src/main/resources/i18n/displayStrings.properties
@@ -250,14 +250,14 @@ mainView.balance.locked=Locked in trades
 mainView.balance.reserved.short=Reserved
 mainView.balance.locked.short=Locked
 
-mainView.footer.usingTor=(using Tor)
+mainView.footer.usingTor=(via Tor)
 mainView.footer.localhostBitcoinNode=(localhost)
-mainView.footer.btcInfo={0} {1} {2}
-mainView.footer.btcFeeRate=/ Current fee rate: {0} sat/vB
+mainView.footer.btcInfo={0} {1}
+mainView.footer.btcFeeRate=/ Fee rate: {0} sat/vB
 mainView.footer.btcInfo.initializing=Connecting to Bitcoin network
 mainView.footer.bsqInfo.synchronizing=/ Synchronizing DAO
-mainView.footer.btcInfo.synchronizingWith=Synchronizing with {0} at block: {1} ({2})
-mainView.footer.btcInfo.synchronizedWith=Synced with {0} at block {1} /
+mainView.footer.btcInfo.synchronizingWith=Synchronizing with {0} at block: {1} / {2}
+mainView.footer.btcInfo.synchronizedWith=Synced with {0} at block {1}
 mainView.footer.btcInfo.connectingTo=Connecting to
 mainView.footer.btcInfo.connectionFailed=Connection failed to
 mainView.footer.p2pInfo=Bitcoin network peers: {0} / Bisq network peers: {1}