From 90658fb4fe256db2cf75f4679f9a99ff20fe7f72 Mon Sep 17 00:00:00 2001 From: Christoph Atteneder Date: Wed, 5 Feb 2020 11:34:05 +0100 Subject: [PATCH 1/2] Add additional information for a local Bitcoin Core v0.19+ --- core/src/main/resources/i18n/displayStrings.properties | 1 + desktop/src/main/java/bisq/desktop/main/MainViewModel.java | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/core/src/main/resources/i18n/displayStrings.properties b/core/src/main/resources/i18n/displayStrings.properties index 3811db6013..770d80f45c 100644 --- a/core/src/main/resources/i18n/displayStrings.properties +++ b/core/src/main/resources/i18n/displayStrings.properties @@ -2661,6 +2661,7 @@ popup.securityRecommendation.msg=We would like to remind you to consider using p popup.bitcoinLocalhostNode.msg=Bisq detected a locally running Bitcoin Core node (at localhost).\n\ Please make sure that this node is fully synced before you start Bisq and that it is not running in pruned mode. +popup.bitcoinLocalhostNode.additionalRequirements=\n\nStarting with Bitcoin Core v0.19 you have to manually enable bloom filters by setting peerbloomfilters=1 in your configuration file. popup.shutDownInProgress.headline=Shut down in progress popup.shutDownInProgress.msg=Shutting down application can take a few seconds.\nPlease don't interrupt this process. diff --git a/desktop/src/main/java/bisq/desktop/main/MainViewModel.java b/desktop/src/main/java/bisq/desktop/main/MainViewModel.java index b1ed7cbcff..25586aa284 100644 --- a/desktop/src/main/java/bisq/desktop/main/MainViewModel.java +++ b/desktop/src/main/java/bisq/desktop/main/MainViewModel.java @@ -44,7 +44,6 @@ import bisq.core.app.BisqSetup; import bisq.core.btc.nodes.LocalBitcoinNode; import bisq.core.btc.setup.WalletsSetup; import bisq.core.btc.wallet.BtcWalletService; -import bisq.common.config.Config; import bisq.core.locale.CryptoCurrency; import bisq.core.locale.CurrencyUtil; import bisq.core.locale.Res; @@ -67,6 +66,7 @@ import bisq.network.p2p.P2PService; import bisq.common.Timer; import bisq.common.UserThread; import bisq.common.app.DevEnv; +import bisq.common.config.Config; import bisq.common.storage.CorruptedDatabaseFilesHandler; import com.google.inject.Inject; @@ -352,7 +352,8 @@ public class MainViewModel implements ViewModel, BisqSetup.BisqSetupListener { .show()); bisqSetup.setDisplayLocalhostHandler(key -> { if (!DevEnv.isDevMode()) { - Overlay popup = new Popup().backgroundInfo(Res.get("popup.bitcoinLocalhostNode.msg")) + Overlay popup = new Popup().backgroundInfo(Res.get("popup.bitcoinLocalhostNode.msg") + + Res.get("popup.bitcoinLocalhostNode.additionalRequirements")) .dontShowAgainId(key); popup.setDisplayOrderPriority(5); popupQueue.add(popup); From 040b8d53de03d301567077099cca5061eaf657c6 Mon Sep 17 00:00:00 2001 From: Christoph Atteneder Date: Wed, 5 Feb 2020 12:03:28 +0100 Subject: [PATCH 2/2] Improve wording Co-Authored-By: wiz --- core/src/main/resources/i18n/displayStrings.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/resources/i18n/displayStrings.properties b/core/src/main/resources/i18n/displayStrings.properties index 770d80f45c..0f3f1278df 100644 --- a/core/src/main/resources/i18n/displayStrings.properties +++ b/core/src/main/resources/i18n/displayStrings.properties @@ -2661,7 +2661,7 @@ popup.securityRecommendation.msg=We would like to remind you to consider using p popup.bitcoinLocalhostNode.msg=Bisq detected a locally running Bitcoin Core node (at localhost).\n\ Please make sure that this node is fully synced before you start Bisq and that it is not running in pruned mode. -popup.bitcoinLocalhostNode.additionalRequirements=\n\nStarting with Bitcoin Core v0.19 you have to manually enable bloom filters by setting peerbloomfilters=1 in your configuration file. +popup.bitcoinLocalhostNode.additionalRequirements=\n\nStarting with Bitcoin Core v0.19 you have to manually enable bloom filters by setting peerbloomfilters=1 in your bitcoin.conf configuration file. popup.shutDownInProgress.headline=Shut down in progress popup.shutDownInProgress.msg=Shutting down application can take a few seconds.\nPlease don't interrupt this process.