From 7dc08b045905d4ce47e37549f615846daeb301c3 Mon Sep 17 00:00:00 2001
From: Manfred Karrer <mk@nucleo.io>
Date: Thu, 31 Dec 2015 12:57:27 +0100
Subject: [PATCH] fix ui bug with not updated offer direction

---
 core/src/main/java/io/bitsquare/payment/PaymentMethod.java   | 2 +-
 .../trade/protocol/trade/tasks/seller/SignPayoutTx.java      | 5 +++--
 gui/src/main/java/io/bitsquare/app/BitsquareApp.java         | 4 ----
 .../main/portfolio/pendingtrades/PendingTradesDataModel.java | 2 ++
 .../gui/main/portfolio/pendingtrades/PendingTradesView.java  | 4 ++--
 5 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/core/src/main/java/io/bitsquare/payment/PaymentMethod.java b/core/src/main/java/io/bitsquare/payment/PaymentMethod.java
index e065ab6b82..72e5022adf 100644
--- a/core/src/main/java/io/bitsquare/payment/PaymentMethod.java
+++ b/core/src/main/java/io/bitsquare/payment/PaymentMethod.java
@@ -59,7 +59,7 @@ public class PaymentMethod implements Serializable, Comparable {
     public static PaymentMethod BLOCK_CHAINS;
 
     public static final List<PaymentMethod> ALL_VALUES = new ArrayList<>(Arrays.asList(
-            OK_PAY = new PaymentMethod(OK_PAY_ID, HOUR, DAY), // tx instant so min. wait time 
+            OK_PAY = new PaymentMethod(OK_PAY_ID, 0, DAY), // tx instant so min. wait time 
             PERFECT_MONEY = new PaymentMethod(PERFECT_MONEY_ID, 0, DAY),
             SEPA = new PaymentMethod(SEPA_ID, 0, 8 * DAY), // sepa takes 1-3 business days. We use 8 days to include safety for holidays
             SWISH = new PaymentMethod(SWISH_ID, 0, DAY),
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/SignPayoutTx.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/SignPayoutTx.java
index fbcf05479d..221717864b 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/SignPayoutTx.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/SignPayoutTx.java
@@ -43,8 +43,9 @@ public class SignPayoutTx extends TradeTask {
             Coin buyerPayoutAmount = sellerPayoutAmount.add(trade.getTradeAmount());
 
             // We use the sellers LastBlockSeenHeight, which might be different to the buyers one.
-            // If lock time is 0 we set lockTimeAsBlockHeight to -1 to mark it as "not set". 
-            // In the tradewallet we apply the locktime only if it is set, otherwise we use the default sequence number
+            // If lock time is 0 we set lockTimeAsBlockHeight to 0 to mark it as "not set". 
+            // In the tradewallet we apply the locktime only if it is set, otherwise we use the default values for 
+            // transaction locktime and sequence number
             long lockTime = trade.getOffer().getPaymentMethod().getLockTime();
             long lockTimeAsBlockHeight = 0;
             if (lockTime > 0)
diff --git a/gui/src/main/java/io/bitsquare/app/BitsquareApp.java b/gui/src/main/java/io/bitsquare/app/BitsquareApp.java
index 5a7a889770..fd90f735b8 100644
--- a/gui/src/main/java/io/bitsquare/app/BitsquareApp.java
+++ b/gui/src/main/java/io/bitsquare/app/BitsquareApp.java
@@ -82,10 +82,6 @@ public class BitsquareApp extends Application {
     private Injector injector;
     private boolean popupOpened;
 
-    public static Stage getPrimaryStage() {
-        return primaryStage;
-    }
-
     private static Stage primaryStage;
     private Scene scene;
     private final List<String> corruptedDatabaseFiles = new ArrayList<>();
diff --git a/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/PendingTradesDataModel.java b/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/PendingTradesDataModel.java
index 4f7faf7dfe..fe2078b856 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/PendingTradesDataModel.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/PendingTradesDataModel.java
@@ -262,6 +262,8 @@ public class PendingTradesDataModel extends ActivatableDataModel {
     }
 
     public Offer.Direction getDirection(Offer offer) {
+        // gets called earlier than onSelectTrade event handler
+        isOfferer = tradeManager.isMyOffer(offer);
         return isOfferer ? offer.getDirection() : offer.getMirroredDirection();
     }
 
diff --git a/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/PendingTradesView.java b/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/PendingTradesView.java
index 4943552045..955664e76a 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/PendingTradesView.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/PendingTradesView.java
@@ -76,11 +76,11 @@ public class PendingTradesView extends ActivatableViewAndModel<VBox, PendingTrad
     @Override
     public void initialize() {
         setTradeIdColumnCellFactory();
-        setDirectionColumnCellFactory();
+        setDateColumnCellFactory();
         setAmountColumnCellFactory();
         setPriceColumnCellFactory();
         setVolumeColumnCellFactory();
-        setDateColumnCellFactory();
+        setDirectionColumnCellFactory();
 
         table.setColumnResizePolicy(TableView.CONSTRAINED_RESIZE_POLICY);
         table.setPlaceholder(new Label("No pending trades available"));