diff --git a/core/src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersDataModel.java b/core/src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersDataModel.java index afd467db94..2a0fd06e1d 100644 --- a/core/src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersDataModel.java +++ b/core/src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersDataModel.java @@ -65,8 +65,8 @@ class OffersDataModel implements Activatable, DataModel { tradeManager.getOpenOfferTrades().removeListener(tradesListChangeListener); } - void cancelOpenOffer(Offer offer, ResultHandler resultHandler, ErrorMessageHandler errorMessageHandler) { - tradeManager.cancelOpenOffer(offer, resultHandler, errorMessageHandler); + void onCancelOpenOffer(Offer offer, ResultHandler resultHandler, ErrorMessageHandler errorMessageHandler) { + tradeManager.onCancelOpenOffer(offer, resultHandler, errorMessageHandler); } diff --git a/core/src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersView.java b/core/src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersView.java index a38621bb31..ff9572a615 100644 --- a/core/src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersView.java +++ b/core/src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersView.java @@ -19,7 +19,11 @@ package io.bitsquare.gui.main.portfolio.offer; import io.bitsquare.common.viewfx.view.ActivatableViewAndModel; import io.bitsquare.common.viewfx.view.FxmlView; +import io.bitsquare.gui.Navigation; import io.bitsquare.gui.components.Popups; +import io.bitsquare.gui.main.MainView; +import io.bitsquare.gui.main.funds.FundsView; +import io.bitsquare.gui.main.funds.withdrawal.WithdrawalView; import io.bitsquare.offer.Offer; import io.bitsquare.util.Utilities; @@ -38,10 +42,12 @@ public class OffersView extends ActivatableViewAndModel table; @FXML TableColumn priceColumn, amountColumn, volumeColumn, directionColumn, dateColumn, offerIdColumn, removeItemColumn; + private Navigation navigation; @Inject - public OffersView(OffersViewModel model) { + public OffersView(OffersViewModel model, Navigation navigation) { super(model); + this.navigation = navigation; } @Override @@ -63,8 +69,18 @@ public class OffersView extends ActivatableViewAndModel { + log.debug("Remove offer was successful"); + Popups.openInfoPopup("You can withdraw the funds you paid in from the funds screens."); + navigation.navigateTo(MainView.class, FundsView.class, WithdrawalView.class); + }, + (message) -> { + log.error(message); + Popups.openWarningPopup("Remove offer failed", message); + }); + } private void openOfferDetails(OfferListItem item) { @@ -233,7 +249,7 @@ public class OffersView extends ActivatableViewAndModel cancelOpenOffer(item.getOffer())); + button.setOnAction(event -> onCancelOpenOffer(item.getOffer())); setGraphic(button); } else { diff --git a/core/src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersViewModel.java b/core/src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersViewModel.java index 4e2b950fcb..1c57389e8c 100644 --- a/core/src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersViewModel.java +++ b/core/src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersViewModel.java @@ -17,9 +17,10 @@ package io.bitsquare.gui.main.portfolio.offer; +import io.bitsquare.common.handlers.ErrorMessageHandler; +import io.bitsquare.common.handlers.ResultHandler; import io.bitsquare.common.viewfx.model.ActivatableWithDataModel; import io.bitsquare.common.viewfx.model.ViewModel; -import io.bitsquare.gui.components.Popups; import io.bitsquare.gui.util.BSFormatter; import io.bitsquare.offer.Offer; @@ -44,16 +45,8 @@ class OffersViewModel extends ActivatableWithDataModel implemen } - void cancelOpenOffer(Offer offer) { - dataModel.cancelOpenOffer(offer, - () -> { - // visual feedback? - log.debug("Remove offer was successful"); - }, - (message) -> { - log.error(message); - Popups.openWarningPopup("Remove offer failed", message); - }); + void onCancelOpenOffer(Offer offer, ResultHandler resultHandler, ErrorMessageHandler errorMessageHandler) { + dataModel.onCancelOpenOffer(offer, resultHandler, errorMessageHandler); } public ObservableList getList() { diff --git a/core/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookDataModel.java b/core/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookDataModel.java index a5b0f55fe8..706f368dd0 100644 --- a/core/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookDataModel.java +++ b/core/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookDataModel.java @@ -112,8 +112,8 @@ class OfferBookDataModel implements Activatable, DataModel { btcCode.unbind(); } - void cancelOpenOffer(Offer offer, ResultHandler resultHandler, ErrorMessageHandler errorMessageHandler) { - tradeManager.cancelOpenOffer(offer, resultHandler, errorMessageHandler); + void onCancelOpenOffer(Offer offer, ResultHandler resultHandler, ErrorMessageHandler errorMessageHandler) { + tradeManager.onCancelOpenOffer(offer, resultHandler, errorMessageHandler); } void calculateVolume() { diff --git a/core/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookView.java b/core/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookView.java index 34fd689cf4..82ebd0c87b 100644 --- a/core/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookView.java +++ b/core/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookView.java @@ -28,6 +28,8 @@ import io.bitsquare.gui.main.account.AccountView; import io.bitsquare.gui.main.account.content.restrictions.RestrictionsView; import io.bitsquare.gui.main.account.settings.AccountSettingsView; import io.bitsquare.gui.main.account.setup.AccountSetupWizard; +import io.bitsquare.gui.main.funds.FundsView; +import io.bitsquare.gui.main.funds.withdrawal.WithdrawalView; import io.bitsquare.gui.main.trade.TradeView; import io.bitsquare.gui.util.ImageUtil; import io.bitsquare.gui.util.validation.OptionalBtcValidator; @@ -235,6 +237,20 @@ public class OfferBookView extends ActivatableViewAndModel { + log.debug("Remove offer was successful"); + Popups.openInfoPopup("You can withdraw the funds you paid in from the funds screens."); + navigation.navigateTo(MainView.class, FundsView.class, WithdrawalView.class); + }, + (message) -> { + log.error(message); + Popups.openWarningPopup("Remove offer failed", message); + }); + + } + private void openRestrictionsWarning(String restrictionsInfo) { overlayManager.blurContent(); List actions = new ArrayList<>(); @@ -469,7 +485,7 @@ public class OfferBookView extends ActivatableViewAndModel model.cancelOpenOffer(item.getOffer())); + button.setOnAction(event -> onCancelOpenOffer(item.getOffer())); } else { if (offer.getDirection() == Offer.Direction.SELL) diff --git a/core/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookViewModel.java b/core/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookViewModel.java index 8224bd7281..c11b0fccae 100644 --- a/core/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookViewModel.java +++ b/core/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookViewModel.java @@ -17,9 +17,10 @@ package io.bitsquare.gui.main.trade.offerbook; +import io.bitsquare.common.handlers.ErrorMessageHandler; +import io.bitsquare.common.handlers.ResultHandler; import io.bitsquare.common.viewfx.model.ActivatableWithDataModel; import io.bitsquare.common.viewfx.model.ViewModel; -import io.bitsquare.gui.components.Popups; import io.bitsquare.gui.util.BSFormatter; import io.bitsquare.gui.util.validation.InputValidator; import io.bitsquare.gui.util.validation.OptionalBtcValidator; @@ -101,17 +102,8 @@ class OfferBookViewModel extends ActivatableWithDataModel im (newValue))); } - void cancelOpenOffer(Offer offer) { - dataModel.cancelOpenOffer(offer, - () -> { - // visual feedback? - log.debug("Remove offer was successful"); - }, - (message) -> { - log.error(message); - Popups.openWarningPopup("Remove offer failed", message); - } - ); + void onCancelOpenOffer(Offer offer, ResultHandler resultHandler, ErrorMessageHandler errorMessageHandler) { + dataModel.onCancelOpenOffer(offer, resultHandler, errorMessageHandler); } boolean isTradable(Offer offer) { diff --git a/core/src/main/java/io/bitsquare/trade/TradeManager.java b/core/src/main/java/io/bitsquare/trade/TradeManager.java index fc990245d9..0d25e90436 100644 --- a/core/src/main/java/io/bitsquare/trade/TradeManager.java +++ b/core/src/main/java/io/bitsquare/trade/TradeManager.java @@ -313,7 +313,7 @@ public class TradeManager { }); } - public void cancelOpenOffer(Offer offer, ResultHandler resultHandler, ErrorMessageHandler errorMessageHandler) { + public void onCancelOpenOffer(Offer offer, ResultHandler resultHandler, ErrorMessageHandler errorMessageHandler) { removeOpenOffer(offer, resultHandler, errorMessageHandler, true); }