mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-02-24 07:07:43 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #4651 from ripcurlx/keep-offer-when-canceling

Browse source 
Only remove offer locally when necessary
This commit is contained in:
sqrrm 2020-10-15 10:35:46 +02:00 • committed by GitHub
commit 101c172ccf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
desktop/src/main/java/bisq/desktop/main/offer/takeoffer/TakeOfferDataModel.java
View file

@ -267,14 +267,16 @@ class TakeOfferDataModel extends OfferDataModel {
priceFeedService.setCurrencyCode(offer.getCurrencyCode());
}
public void onClose() {
public void onClose(boolean removeOffer) {
// We do not wait until the offer got removed by a network remove message but remove it
// directly from the offer book. The broadcast gets now bundled and has 2 sec. delay so the
// removal from the network is a bit slower as it has been before. To avoid that the taker gets
// confused to see the same offer still in the offerbook we remove it manually. This removal has
// only local effect. Other trader might see the offer for a few seconds
// still (but cannot take it).
if (removeOffer) {
offerBook.removeOffer(checkNotNull(offer), tradeManager);
}
btcWalletService.resetAddressEntriesForOpenOffer(offer.getId());
}

12
desktop/src/main/java/bisq/desktop/main/offer/takeoffer/TakeOfferView.java
View file

@ -388,7 +388,7 @@ public class TakeOfferView extends ActivatableViewAndModel<AnchorPane, TakeOffer
if (offer.getPrice() == null)
new Popup().warning(Res.get("takeOffer.noPriceFeedAvailable"))
.onClose(this::close)
.onClose(() -> close(false))
.show();
}
@ -595,7 +595,11 @@ public class TakeOfferView extends ActivatableViewAndModel<AnchorPane, TakeOffer
///////////////////////////////////////////////////////////////////////////////////////////
private void close() {
model.dataModel.onClose();
close(true);
}
private void close(boolean removeOffer) {
model.dataModel.onClose(removeOffer);
if (closeHandler != null)
closeHandler.close();
}
@ -893,7 +897,7 @@ public class TakeOfferView extends ActivatableViewAndModel<AnchorPane, TakeOffer
cancelButton1.setDefaultButton(false);
cancelButton1.setOnAction(e -> {
model.dataModel.swapTradeToSavings();
close();
close(false);
});
}
@ -1040,7 +1044,7 @@ public class TakeOfferView extends ActivatableViewAndModel<AnchorPane, TakeOffer
})
.show();
} else {
close();
close(false);
model.dataModel.swapTradeToSavings();
}
});