mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-02-22 22:45:21 +01:00
Code Issues Projects Releases Packages Wiki Activity

Remove default fee rate from Bisq startup screen

Browse source 
The display of fee rate on the startup screen is misleading because
at startup a fee has not been received from the mempool fee service
and instead the default value of 50 sats is shown.

This change causes the fee rate not to be displayed until a response
has been received from the service.

Fixes #4765
This commit is contained in:
jmacxx 2020-11-08 08:19:56 -06:00
parent 468ecdc2f5
commit 8484398dee
No known key found for this signature in database
GPG key ID: 155297BABFE94A1B
3 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
core/src/main/java/bisq/core/app/WalletAppSetup.java
View file

@ -117,24 +117,23 @@ public class WalletAppSetup {
String result;
if (exception == null) {
double percentage = (double) downloadPercentage;
long fees = feeService.getTxFeePerByte().longValue();
btcSyncProgress.set(percentage);
if (percentage == 1) {
String feeRate = Res.get("mainView.footer.btcFeeRate", fees);
result = Res.get("mainView.footer.btcInfo",
Res.get("mainView.footer.btcInfo.synchronizedWith"),
getBtcNetworkAsString() + " / " + feeRate);
getBtcNetworkAsString(),
feeService.getFeeTextForDisplay());
getBtcSplashSyncIconId().set("image-connection-synced");
downloadCompleteHandler.run();
} else if (percentage > 0.0) {
result = Res.get("mainView.footer.btcInfo",
Res.get("mainView.footer.btcInfo.synchronizingWith"),
getBtcNetworkAsString() + ": " + FormattingUtils.formatToPercentWithSymbol(percentage));
getBtcNetworkAsString() + ": " + FormattingUtils.formatToPercentWithSymbol(percentage), "");
} else {
result = Res.get("mainView.footer.btcInfo",
Res.get("mainView.footer.btcInfo.connectingTo"),
getBtcNetworkAsString());
getBtcNetworkAsString(), "");
}
} else {
result = Res.get("mainView.footer.btcInfo",

8
core/src/main/java/bisq/core/provider/fee/FeeService.java
View file

@ -20,6 +20,7 @@ package bisq.core.provider.fee;
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;
@ -190,4 +191,11 @@ public class FeeService {
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", txFeePerByte);
return "";
}
}

4
core/src/main/resources/i18n/displayStrings.properties
View file

@ -252,8 +252,8 @@ mainView.balance.locked.short=Locked
mainView.footer.usingTor=(using Tor)
mainView.footer.localhostBitcoinNode=(localhost)
mainView.footer.btcInfo={0} {1}
mainView.footer.btcFeeRate=Current fee rate: {0} sat/vB
mainView.footer.btcInfo={0} {1} {2}
mainView.footer.btcFeeRate=/ Current 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