Merge pull request #4984 from chimp1984/improve-localnode-popup-text

Improve popup text in case a local node is detected

core/src/main/resources/i18n/displayStrings.properties

@@ -2863,9 +2863,11 @@ popup.privateNotification.headline=Important private notification!
 popup.securityRecommendation.headline=Important security recommendation
 popup.securityRecommendation.msg=We would like to remind you to consider using password protection for your wallet if you have not already enabled that.\n\nIt is also highly recommended to write down the wallet seed words. Those seed words are like a master password for recovering your Bitcoin wallet.\nAt the \"Wallet Seed\" section you find more information.\n\nAdditionally you should backup the complete application data folder at the \"Backup\" section.
 
-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\nFor a well configured node, the requirements are for the node to have pruning disabled and bloom filters enabled.
+popup.bitcoinLocalhostNode.msg=Bisq detected a Bitcoin Core node running on this machine (at localhost).\n\n\
+  Please ensure:\n\
+  - the node is fully synced before starting Bisq\n\
+  - pruning is disabled ('prune=0' in bitcoin.conf)\n\
+  - bloom filters are enabled ('peerbloomfilters=1' in bitcoin.conf)
 
 popup.shutDownInProgress.headline=Shut down in progress
 popup.shutDownInProgress.msg=Shutting down application can take a few seconds.\nPlease don't interrupt this process.

desktop/src/main/java/bisq/desktop/main/MainViewModel.java

@@ -365,8 +365,7 @@ private void setupHandlers() {
                         .show());
         bisqSetup.setDisplayLocalhostHandler(key -> {
             if (!DevEnv.isDevMode()) {
-                Popup popup = new Popup().backgroundInfo(Res.get("popup.bitcoinLocalhostNode.msg") +
-                        Res.get("popup.bitcoinLocalhostNode.additionalRequirements"))
+                Popup popup = new Popup().backgroundInfo(Res.get("popup.bitcoinLocalhostNode.msg"))
                         .dontShowAgainId(key);
                 popup.setDisplayOrderPriority(5);
                 popupQueue.add(popup);