diff --git a/common/pom.xml b/common/pom.xml
index 5c7fcb0428..9ed26c1949 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -5,7 +5,7 @@
parent
io.bisq
- 0.6.6
+ 0.6.7
4.0.0
diff --git a/common/src/main/java/io/bisq/common/app/Version.java b/common/src/main/java/io/bisq/common/app/Version.java
index 551efcdf06..150f186628 100644
--- a/common/src/main/java/io/bisq/common/app/Version.java
+++ b/common/src/main/java/io/bisq/common/app/Version.java
@@ -27,7 +27,7 @@ public class Version {
// VERSION = 0.5.0 introduces proto buffer for the P2P network and local DB and is a not backward compatible update
// Therefore all sub versions start again with 1
// We use semantic versioning with major, minor and patch
- public static final String VERSION = "0.6.6";
+ public static final String VERSION = "0.6.7";
public static int getMajorVersion(String version) {
return getSubVersion(version, 0);
diff --git a/consensus/pom.xml b/consensus/pom.xml
index 34af05fe64..176a27d0cb 100644
--- a/consensus/pom.xml
+++ b/consensus/pom.xml
@@ -5,7 +5,7 @@
parent
io.bisq
- 0.6.6
+ 0.6.7
4.0.0
diff --git a/core/pom.xml b/core/pom.xml
index 12792bc63d..cf11be9a01 100755
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -6,7 +6,7 @@
parent
io.bisq
- 0.6.6
+ 0.6.7
core
diff --git a/core/src/main/java/io/bisq/core/offer/OpenOfferManager.java b/core/src/main/java/io/bisq/core/offer/OpenOfferManager.java
index 4de1a1e759..a6d56e13f7 100644
--- a/core/src/main/java/io/bisq/core/offer/OpenOfferManager.java
+++ b/core/src/main/java/io/bisq/core/offer/OpenOfferManager.java
@@ -47,6 +47,7 @@ import io.bisq.network.p2p.*;
import io.bisq.network.p2p.peers.PeerManager;
import javafx.collections.ObservableList;
import org.bitcoinj.core.Coin;
+import org.jetbrains.annotations.NotNull;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -353,17 +354,26 @@ public class OpenOfferManager implements PeerManager.Listener, DecryptedDirectMe
public void removeOpenOffer(OpenOffer openOffer, ResultHandler resultHandler, ErrorMessageHandler errorMessageHandler) {
Offer offer = openOffer.getOffer();
- offerBookService.removeOffer(offer.getOfferPayload(),
- () -> {
- offer.setState(Offer.State.REMOVED);
- openOffer.setState(OpenOffer.State.CANCELED);
- openOffers.remove(openOffer);
- closedTradableManager.add(openOffer);
- log.debug("removeOpenOffer, offerId={}", offer.getId());
- btcWalletService.resetAddressEntriesForOpenOffer(offer.getId());
- resultHandler.handleResult();
- },
- errorMessageHandler);
+ if (openOffer.isDeactivated()) {
+ openOffer.setStorage(openOfferTradableListStorage);
+ onRemoved(openOffer, resultHandler, offer);
+ } else {
+ offerBookService.removeOffer(offer.getOfferPayload(),
+ () -> {
+ onRemoved(openOffer, resultHandler, offer);
+ },
+ errorMessageHandler);
+ }
+ }
+
+ private void onRemoved(@NotNull OpenOffer openOffer, ResultHandler resultHandler, Offer offer) {
+ offer.setState(Offer.State.REMOVED);
+ openOffer.setState(OpenOffer.State.CANCELED);
+ openOffers.remove(openOffer);
+ closedTradableManager.add(openOffer);
+ log.debug("removeOpenOffer, offerId={}", offer.getId());
+ btcWalletService.resetAddressEntriesForOpenOffer(offer.getId());
+ resultHandler.handleResult();
}
// Close openOffer after deposit published
diff --git a/gui/pom.xml b/gui/pom.xml
index 601d8a0909..aa00ce2533 100644
--- a/gui/pom.xml
+++ b/gui/pom.xml
@@ -22,7 +22,7 @@
parent
io.bisq
- 0.6.6
+ 0.6.7
4.0.0
diff --git a/gui/src/main/java/io/bisq/gui/main/portfolio/openoffer/OpenOffersView.java b/gui/src/main/java/io/bisq/gui/main/portfolio/openoffer/OpenOffersView.java
index 66fcb3b152..0030b6460a 100644
--- a/gui/src/main/java/io/bisq/gui/main/portfolio/openoffer/OpenOffersView.java
+++ b/gui/src/main/java/io/bisq/gui/main/portfolio/openoffer/OpenOffersView.java
@@ -171,6 +171,9 @@ public class OpenOffersView extends ActivatableViewAndModel {
log.debug("Remove offer was successful");
+
+ tableView.refresh();
+
String key = "WithdrawFundsAfterRemoveOfferInfo";
if (DontShowAgainLookup.showAgain(key))
//noinspection unchecked
diff --git a/monitor/pom.xml b/monitor/pom.xml
index ac68de577f..93761005b2 100644
--- a/monitor/pom.xml
+++ b/monitor/pom.xml
@@ -22,7 +22,7 @@
parent
io.bisq
- 0.6.6
+ 0.6.7
4.0.0
diff --git a/network/pom.xml b/network/pom.xml
index e4076b8308..151ce2c257 100644
--- a/network/pom.xml
+++ b/network/pom.xml
@@ -5,7 +5,7 @@
parent
io.bisq
- 0.6.6
+ 0.6.7
4.0.0
diff --git a/network/src/main/resources/PersistableNetworkPayloadMap_BTC_MAINNET b/network/src/main/resources/PersistableNetworkPayloadMap_BTC_MAINNET
index eefeb93c6c..5b32612ad0 100644
Binary files a/network/src/main/resources/PersistableNetworkPayloadMap_BTC_MAINNET and b/network/src/main/resources/PersistableNetworkPayloadMap_BTC_MAINNET differ
diff --git a/package/linux/32bitBuild.sh b/package/linux/32bitBuild.sh
index 59851f5cd6..6ae0c39986 100644
--- a/package/linux/32bitBuild.sh
+++ b/package/linux/32bitBuild.sh
@@ -6,7 +6,7 @@ mkdir -p gui/deploy
set -e
# Edit version
-version=0.6.6
+version=0.6.7
dir="/media/sf_vm_shared_ubuntu14_32bit"
diff --git a/package/linux/64bitBuild.sh b/package/linux/64bitBuild.sh
index d450b75510..93a90cf7e3 100644
--- a/package/linux/64bitBuild.sh
+++ b/package/linux/64bitBuild.sh
@@ -6,7 +6,7 @@ mkdir -p gui/deploy
set -e
# Edit version
-version=0.6.6
+version=0.6.7
dir="/media/sf_vm_shared_ubuntu"
diff --git a/package/linux/Dockerfile b/package/linux/Dockerfile
index 2a6dffc171..24fb1f65a9 100644
--- a/package/linux/Dockerfile
+++ b/package/linux/Dockerfile
@@ -8,7 +8,7 @@
# pull base image
FROM openjdk:8-jdk
-ENV version 0.6.6
+ENV version 0.6.7
RUN apt-get update && apt-get install -y --no-install-recommends openjfx && rm -rf /var/lib/apt/lists/* &&
apt-get install -y vim fakeroot
diff --git a/package/osx/create_app.sh b/package/osx/create_app.sh
index 5192c240f9..c567cbf386 100755
--- a/package/osx/create_app.sh
+++ b/package/osx/create_app.sh
@@ -5,7 +5,7 @@ mkdir -p gui/deploy
set -e
-version="0.6.6"
+version="0.6.7"
mvn clean package verify -DskipTests -Dmaven.javadoc.skip=true
diff --git a/package/osx/finalize.sh b/package/osx/finalize.sh
index 5e6e4fbf38..4d1e6a3240 100644
--- a/package/osx/finalize.sh
+++ b/package/osx/finalize.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-version="0.6.6"
+version="0.6.7"
target_dir="/Users/dev/Documents/__bisq/_releases/$version"
src_dir="/Users/dev/idea/exchange"
diff --git a/package/windows/32bitBuild.bat b/package/windows/32bitBuild.bat
index 5c1d165c3b..120c638c86 100644
--- a/package/windows/32bitBuild.bat
+++ b/package/windows/32bitBuild.bat
@@ -5,7 +5,7 @@
:: 32 bit build
:: Needs Inno Setup 5 or later (http://www.jrsoftware.org/isdl.php)
-SET version=0.6.6
+SET version=0.6.7
:: Private setup
SET outdir=\\VBOXSVR\vm_shared_windows_32bit
diff --git a/package/windows/64bitBuild.bat b/package/windows/64bitBuild.bat
index 50cbe54e2a..a79b8847ca 100644
--- a/package/windows/64bitBuild.bat
+++ b/package/windows/64bitBuild.bat
@@ -5,7 +5,7 @@
:: 64 bit build
:: Needs Inno Setup 5 or later (http://www.jrsoftware.org/isdl.php)
-SET version=0.6.6
+SET version=0.6.7
:: Private setup
SET outdir=\\VBOXSVR\vm_shared_windows
diff --git a/package/windows/Bisq.iss b/package/windows/Bisq.iss
index d0055b4986..c518b2dcc5 100755
--- a/package/windows/Bisq.iss
+++ b/package/windows/Bisq.iss
@@ -3,7 +3,7 @@
[Setup]
AppId={{bisq}}
AppName=Bisq
-AppVersion=0.6.6
+AppVersion=0.6.7
AppVerName=Bisq
AppPublisher=Bisq
AppComments=Bisq
diff --git a/pom.xml b/pom.xml
index f5f8b1fa35..9f3151c69d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
io.bisq
parent
pom
- 0.6.6
+ 0.6.7
Bisq - The decentralized exchange network
https://bisq.io
diff --git a/seednode/pom.xml b/seednode/pom.xml
index a00fca7a08..5b076e85e2 100644
--- a/seednode/pom.xml
+++ b/seednode/pom.xml
@@ -22,7 +22,7 @@
parent
io.bisq
- 0.6.6
+ 0.6.7
4.0.0
diff --git a/statistics/pom.xml b/statistics/pom.xml
index 827e513290..10628bdbdc 100644
--- a/statistics/pom.xml
+++ b/statistics/pom.xml
@@ -22,7 +22,7 @@
parent
io.bisq
- 0.6.6
+ 0.6.7
4.0.0