From f92104f4e2b466208745bbeb6c9002d0ae516299 Mon Sep 17 00:00:00 2001
From: Manfred Karrer <mk@nucleo.io>
Date: Tue, 18 Nov 2014 20:19:30 +0100
Subject: [PATCH] Close trade after withdrawal #283

---
 .../gui/main/portfolio/pending/PendingTradesModel.java     | 2 ++
 .../gui/main/portfolio/pending/PendingTradesPM.java        | 7 +------
 src/main/java/io/bitsquare/trade/TradeManager.java         | 6 ++++--
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesModel.java b/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesModel.java
index ce9e30d84d..9210c11fec 100644
--- a/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesModel.java
+++ b/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesModel.java
@@ -224,6 +224,8 @@ class PendingTradesModel extends UIModel {
             log.error(e.getMessage());
         }
 
+        tradeManager.closeTrade(getTrade());
+
 /*
         Action response = Popups.openConfirmPopup(
                 "Withdrawal request", "Confirm your request",
diff --git a/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesPM.java b/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesPM.java
index a49b8f01d0..7193c37105 100644
--- a/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesPM.java
+++ b/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesPM.java
@@ -19,7 +19,6 @@ package io.bitsquare.gui.main.portfolio.pending;
 
 import io.bitsquare.btc.WalletService;
 import io.bitsquare.gui.PresentationModel;
-import io.bitsquare.gui.components.Popups;
 import io.bitsquare.gui.util.BSFormatter;
 import io.bitsquare.gui.util.validation.BtcAddressValidator;
 import io.bitsquare.locale.BSResources;
@@ -134,11 +133,7 @@ public class PendingTradesPM extends PresentationModel<PendingTradesModel> {
     }
 
     void withdraw(String withdrawToAddress) {
-        // TODO address validation
-        if (withdrawToAddress != null && withdrawToAddress.length() > 0)
-            model.withdraw(withdrawToAddress);
-        else
-            Popups.openWarningPopup("Please fill in a withdrawal address where you want to send your bitcoins.");
+        model.withdraw(withdrawToAddress);
     }
 
     void withdrawAddressFocusOut(String text) {
diff --git a/src/main/java/io/bitsquare/trade/TradeManager.java b/src/main/java/io/bitsquare/trade/TradeManager.java
index 6e99c8bead..9a00d53857 100644
--- a/src/main/java/io/bitsquare/trade/TradeManager.java
+++ b/src/main/java/io/bitsquare/trade/TradeManager.java
@@ -278,7 +278,8 @@ public class TradeManager {
                         public void onPayoutTxPublished(Transaction payoutTx) {
                             trade.setPayoutTx(payoutTx);
                             trade.setState(Trade.State.COMPLETED);
-                            closeTrade(trade);
+                            // We close the trade when the user has withdrawn his trade funds (see #283)
+                            //closeTrade(trade);
 
                             log.debug("trading onPayoutTxPublishedMessage");
                         }
@@ -355,7 +356,8 @@ public class TradeManager {
             public void onPayoutTxPublished(Trade trade, Transaction payoutTx) {
                 trade.setPayoutTx(payoutTx);
                 trade.setState(Trade.State.COMPLETED);
-                closeTrade(trade);
+                // We close the trade when the user has withdrawn his trade funds (see #283)
+                //closeTrade(trade);
             }
 
             @Override