use feeService.getFeeTextForDisplay

bisq-network · Nov 9, 2020 · f8462fd · f8462fd
1 parent 9f67cef
commit f8462fd
Showing 1 changed file with 10 additions and 13 deletions.
diff --git a/core/src/main/java/bisq/core/app/WalletAppSetup.java b/core/src/main/java/bisq/core/app/WalletAppSetup.java
@@ -117,29 +117,26 @@ void init(@Nullable Consumer<String> chainFileLockedExceptionHandler,
                 (downloadPercentage, chainHeight, feeUpdate, exception) -> {
                     String result;
                     if (exception == null) {
-                        //todo feeService.getFeeTextForDisplay()
-                        /*
-                        result = Res.get("mainView.footer.btcInfo",
-                                    Res.get("mainView.footer.btcInfo.synchronizedWith"),
-                                    getBtcNetworkAsString(),
-                                    feeService.getFeeTextForDisplay());
-                         */
                         double percentage = (double) downloadPercentage;
-                        long fees = feeService.getTxFeePerByte().longValue();
                         btcSyncProgress.set(percentage);
-                        int bestChainHeight = walletsSetup.getChain() != null ? walletsSetup.getChain().getBestChainHeight() : 0;
-                        String chainHeightAsString = bestChainHeight > 0 ? String.valueOf(bestChainHeight) : "";
+                        int bestChainHeight = walletsSetup.getChain() != null ?
+                                walletsSetup.getChain().getBestChainHeight() :
+                                0;
+                        String chainHeightAsString = bestChainHeight > 0 ?
+                                String.valueOf(bestChainHeight) :
+                                "";
                         if (percentage == 1) {
-                            String feeRate = Res.get("mainView.footer.btcFeeRate", fees);
                             String synchronizedWith = Res.get("mainView.footer.btcInfo.synchronizedWith",
                                     getBtcNetworkAsString(), chainHeightAsString);
-                            result = Res.get("mainView.footer.btcInfo", synchronizedWith, feeRate);
+                            result = Res.get("mainView.footer.btcInfo", synchronizedWith,
+                                    feeService.getFeeTextForDisplay());
                             getBtcSplashSyncIconId().set("image-connection-synced");
 
                             downloadCompleteHandler.run();
                         } else if (percentage > 0.0) {
                             String synchronizingWith = Res.get("mainView.footer.btcInfo.synchronizingWith",
-                                    getBtcNetworkAsString(), chainHeightAsString, FormattingUtils.formatToPercentWithSymbol(percentage));
+                                    getBtcNetworkAsString(), chainHeightAsString,
+                                    FormattingUtils.formatToPercentWithSymbol(percentage));
                             result = Res.get("mainView.footer.btcInfo", synchronizingWith, "");
                         } else {
                             result = Res.get("mainView.footer.btcInfo",