diff --git a/build.gradle b/build.gradle
index 20ca924031..aec0e7c89f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -610,7 +610,7 @@ configure(project(':desktop')) {
apply plugin: 'com.github.johnrengelman.shadow'
apply from: 'package/package.gradle'
- version = '1.0.19-SNAPSHOT'
+ version = '1.1.0-SNAPSHOT'
jar.manifest.attributes(
"Implementation-Title": project.name,
diff --git a/common/src/main/java/haveno/common/app/Version.java b/common/src/main/java/haveno/common/app/Version.java
index 3dc04889b8..c0dd9352ff 100644
--- a/common/src/main/java/haveno/common/app/Version.java
+++ b/common/src/main/java/haveno/common/app/Version.java
@@ -28,7 +28,7 @@ import static com.google.common.base.Preconditions.checkArgument;
public class Version {
// The application versions
// We use semantic versioning with major, minor and patch
- public static final String VERSION = "1.0.19";
+ public static final String VERSION = "1.1.0";
/**
* Holds a list of the tagged resource files for optimizing the getData requests.
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/package/linux/exchange.haveno.Haveno.metainfo.xml b/desktop/package/linux/exchange.haveno.Haveno.metainfo.xml
index fc5f50c2b5..9227c587a6 100644
--- a/desktop/package/linux/exchange.haveno.Haveno.metainfo.xml
+++ b/desktop/package/linux/exchange.haveno.Haveno.metainfo.xml
@@ -60,6 +60,6 @@
-
+
diff --git a/desktop/package/macosx/Info.plist b/desktop/package/macosx/Info.plist
index a24f430c12..fd0a765320 100644
--- a/desktop/package/macosx/Info.plist
+++ b/desktop/package/macosx/Info.plist
@@ -5,10 +5,10 @@
CFBundleVersion
- 1.0.19
+ 1.1.0
CFBundleShortVersionString
- 1.0.19
+ 1.1.0
CFBundleExecutable
Haveno
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() {
diff --git a/seednode/src/main/java/haveno/seednode/SeedNodeMain.java b/seednode/src/main/java/haveno/seednode/SeedNodeMain.java
index 35d4bbbe17..1e9c4c5061 100644
--- a/seednode/src/main/java/haveno/seednode/SeedNodeMain.java
+++ b/seednode/src/main/java/haveno/seednode/SeedNodeMain.java
@@ -41,7 +41,7 @@ import lombok.extern.slf4j.Slf4j;
@Slf4j
public class SeedNodeMain extends ExecutableForAppWithP2p {
private static final long CHECK_CONNECTION_LOSS_SEC = 30;
- private static final String VERSION = "1.0.19";
+ private static final String VERSION = "1.1.0";
private SeedNode seedNode;
private Timer checkConnectionLossTime;