From cd5d4ad8ac7bf24df6924231af66b7c0f9af868a Mon Sep 17 00:00:00 2001 From: Manfred Karrer Date: Fri, 17 Oct 2014 17:53:09 +0200 Subject: [PATCH] Prevent security deposit popup displaying more then once --- .../gui/main/trade/createoffer/CreateOfferViewCB.java | 11 +---------- .../gui/main/trade/takeoffer/TakeOfferModel.java | 5 +++++ .../gui/main/trade/takeoffer/TakeOfferPM.java | 4 ++++ .../gui/main/trade/takeoffer/TakeOfferViewCB.java | 4 +++- src/main/java/io/bitsquare/trade/TradeManager.java | 3 ++- 5 files changed, 15 insertions(+), 12 deletions(-) diff --git a/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferViewCB.java b/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferViewCB.java index 292a431528..2ac2690d70 100644 --- a/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferViewCB.java +++ b/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferViewCB.java @@ -201,18 +201,9 @@ public class CreateOfferViewCB extends CachedViewCB { "\nIt will be refunded to you after the trade has successfully completed.", actions); - /* - Popups.openInfo("To ensure that both traders are behaving fair you need to put in a security deposit to an " + - "offer. That will be refunded to you after the trade has successful completed. In case of a " + - "dispute and the arbitrator will take the security deposit from the dishonest trader as his payment " + - "for the dispute resolution. The security deposit will be included in the deposit transaction at the " + - "moment when a trader accept your offer. As long as your offer is not taken by another trader, " + - "the security deposit will not leave your trading wallet, and will be refunded when you cancel your " + - "offer."); - */ + presentationModel.securityDepositInfoDisplayed(); } - presentationModel.securityDepositInfoDisplayed(); priceAmountPane.setInactive(); diff --git a/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferModel.java b/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferModel.java index bdc6145004..395517ad2a 100644 --- a/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferModel.java +++ b/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferModel.java @@ -238,6 +238,11 @@ class TakeOfferModel extends UIModel { return true; } + void securityDepositInfoDisplayed() { + persistence.write("displaySecurityDepositInfo", false); + } + + /////////////////////////////////////////////////////////////////////////////////////////// // Setter /////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferPM.java b/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferPM.java index 76ab575f89..462041bd72 100644 --- a/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferPM.java +++ b/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferPM.java @@ -192,7 +192,11 @@ class TakeOfferPM extends PresentationModel { model.takeOffer(); } + void securityDepositInfoDisplayed() { + model.securityDepositInfoDisplayed(); + } + /////////////////////////////////////////////////////////////////////////////////////////// // UI events /////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferViewCB.java b/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferViewCB.java index 1e5934c3d1..d263d8cccc 100644 --- a/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferViewCB.java +++ b/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferViewCB.java @@ -216,8 +216,10 @@ public class TakeOfferViewCB extends CachedViewCB { "another trader. " + "\nIt will be refunded to you after the trade has successfully completed.", actions); + + presentationModel.securityDepositInfoDisplayed(); } - + priceAmountPane.setInactive(); showPaymentInfoScreenButton.setVisible(false); diff --git a/src/main/java/io/bitsquare/trade/TradeManager.java b/src/main/java/io/bitsquare/trade/TradeManager.java index a8cc7d950b..2027cc23c2 100644 --- a/src/main/java/io/bitsquare/trade/TradeManager.java +++ b/src/main/java/io/bitsquare/trade/TradeManager.java @@ -414,7 +414,8 @@ public class TradeManager { // Routes the incoming messages to the responsible protocol private void onIncomingTradeMessage(TradeMessage tradeMessage, PeerAddress sender) { // log.trace("processTradingMessage TradeId " + tradeMessage.getTradeId()); - log.trace("processTradingMessage instance " + tradeMessage.getClass().getSimpleName()); + log.trace("onIncomingTradeMessage instance " + tradeMessage.getClass().getSimpleName()); + log.trace("onIncomingTradeMessage sender " + sender); String tradeId = tradeMessage.getTradeId();