diff --git a/core/src/main/resources/i18n/displayStrings.properties b/core/src/main/resources/i18n/displayStrings.properties
index 7c8ab0d6f6..9d500aefe5 100644
--- a/core/src/main/resources/i18n/displayStrings.properties
+++ b/core/src/main/resources/i18n/displayStrings.properties
@@ -237,6 +237,7 @@ shared.pending=Pending
shared.me=Me
shared.maker=Maker
shared.taker=Taker
+shared.none=None
####################################################################
diff --git a/desktop/src/main/java/haveno/desktop/main/settings/network/NetworkSettingsView.fxml b/desktop/src/main/java/haveno/desktop/main/settings/network/NetworkSettingsView.fxml
index 1f3e8840d7..bbfb4c6e05 100644
--- a/desktop/src/main/java/haveno/desktop/main/settings/network/NetworkSettingsView.fxml
+++ b/desktop/src/main/java/haveno/desktop/main/settings/network/NetworkSettingsView.fxml
@@ -91,7 +91,7 @@
-
+
@@ -159,7 +159,10 @@
-
+
+
+
diff --git a/desktop/src/main/java/haveno/desktop/main/settings/network/NetworkSettingsView.java b/desktop/src/main/java/haveno/desktop/main/settings/network/NetworkSettingsView.java
index 0773217cd1..a767d032bc 100644
--- a/desktop/src/main/java/haveno/desktop/main/settings/network/NetworkSettingsView.java
+++ b/desktop/src/main/java/haveno/desktop/main/settings/network/NetworkSettingsView.java
@@ -75,7 +75,7 @@ public class NetworkSettingsView extends ActivatableView {
@FXML
InputTextField xmrNodesInputTextField;
@FXML
- TextField onionAddress, sentDataTextField, receivedDataTextField, chainHeightTextField;
+ TextField onionAddress, sentDataTextField, receivedDataTextField, chainHeightTextField, minVersionForTrading;
@FXML
Label p2PPeersLabel, moneroConnectionsLabel;
@FXML
@@ -176,6 +176,7 @@ public class NetworkSettingsView extends ActivatableView {
sentDataTextField.setPromptText(Res.get("settings.net.sentDataLabel"));
receivedDataTextField.setPromptText(Res.get("settings.net.receivedDataLabel"));
chainHeightTextField.setPromptText(Res.get("settings.net.chainHeightLabel"));
+ minVersionForTrading.setPromptText(Res.get("filterWindow.disableTradeBelowVersion"));
roundTripTimeColumn.setGraphic(new AutoTooltipLabel(Res.get("settings.net.roundTripTimeColumn")));
sentBytesColumn.setGraphic(new AutoTooltipLabel(Res.get("settings.net.sentBytesColumn")));
receivedBytesColumn.setGraphic(new AutoTooltipLabel(Res.get("settings.net.receivedBytesColumn")));
@@ -275,7 +276,7 @@ public class NetworkSettingsView extends ActivatableView {
showShutDownPopup();
}
};
- filterPropertyListener = (observable, oldValue, newValue) -> applyPreventPublicXmrNetwork();
+ filterPropertyListener = (observable, oldValue, newValue) -> applyFilter();
// disable radio buttons if no nodes available
if (xmrNodes.getProvidedXmrNodes().isEmpty()) {
@@ -298,7 +299,7 @@ public class NetworkSettingsView extends ActivatableView {
moneroPeersToggleGroup.selectedToggleProperty().addListener(moneroPeersToggleGroupListener);
if (filterManager.getFilter() != null)
- applyPreventPublicXmrNetwork();
+ applyFilter();
filterManager.filterProperty().addListener(filterPropertyListener);
@@ -492,7 +493,9 @@ public class NetworkSettingsView extends ActivatableView {
}
- private void applyPreventPublicXmrNetwork() {
+ private void applyFilter() {
+
+ // prevent public xmr network
final boolean preventPublicXmrNetwork = isPreventPublicXmrNetwork();
usePublicNodesRadio.setDisable(isPublicNodesDisabled());
if (preventPublicXmrNetwork && selectedMoneroNodesOption == XmrNodes.MoneroNodesOption.PUBLIC) {
@@ -501,6 +504,10 @@ public class NetworkSettingsView extends ActivatableView {
selectMoneroPeersToggle();
onMoneroPeersToggleSelected(false);
}
+
+ // set min version for trading
+ String minVersion = filterManager.getDisableTradeBelowVersion();
+ minVersionForTrading.textProperty().setValue(minVersion == null ? Res.get("shared.none") : minVersion);
}
private boolean isPublicNodesDisabled() {