From 831c001fb46cb3308279b429f54c764dee3282ce Mon Sep 17 00:00:00 2001
From: Manfred Karrer <mk@nucleo.io>
Date: Tue, 17 Mar 2015 16:41:51 +0100
Subject: [PATCH] Fix display bug in pending trades

---
 bootstrap/src/main/resources/logback.xml                    | 2 +-
 .../gui/main/portfolio/pending/PendingTradesView.fxml       | 2 +-
 .../gui/main/portfolio/pending/PendingTradesView.java       | 6 +++---
 core/src/main/java/io/bitsquare/trade/Trade.java            | 4 ++--
 core/src/main/resources/logback.xml                         | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/bootstrap/src/main/resources/logback.xml b/bootstrap/src/main/resources/logback.xml
index 98b15f84c3..e577bdbaac 100644
--- a/bootstrap/src/main/resources/logback.xml
+++ b/bootstrap/src/main/resources/logback.xml
@@ -24,7 +24,7 @@
     </appender>
 
     <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>bootstrapNode.log</file>
+        <file>.bitsquare/bootstrapNode.log</file>
         <append>false</append>
         <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
             <fileNamePattern>bootstrapNode_%i.log</fileNamePattern>
diff --git a/core/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesView.fxml b/core/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesView.fxml
index 0f45be25d2..bff2fcf70f 100644
--- a/core/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesView.fxml
+++ b/core/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesView.fxml
@@ -166,7 +166,7 @@
             <InfoDisplay fx:id="paymentsInfoDisplay" onAction="#onOpenPaymentsHelp" rowIndex="10" gridPane="$gridPane"
                          managed="false" visible="false"/>
 
-            <Button fx:id="paymentsButton" text="Payment started" onAction="#onPaymentStarted" GridPane.rowIndex="11"
+            <Button fx:id="paymentStartedButton" text="Payment started" onAction="#onPaymentStarted" GridPane.rowIndex="11"
                     GridPane.columnIndex="1" defaultButton="true" managed="false" visible="false">
                 <GridPane.margin>
                     <Insets top="15" bottom="40"/>
diff --git a/core/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesView.java b/core/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesView.java
index 2e26f3f071..104053402a 100644
--- a/core/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesView.java
+++ b/core/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesView.java
@@ -66,7 +66,7 @@ public class PendingTradesView extends ActivatableViewAndModel<AnchorPane, Pendi
     @FXML TableView<PendingTradesListItem> table;
     @FXML InputTextField withdrawAddressTextField;
     @FXML InfoDisplay infoDisplay, paymentsInfoDisplay, summaryInfoDisplay;
-    @FXML Button confirmPaymentReceiptButton, paymentsButton, withdrawButton;
+    @FXML Button confirmPaymentReceiptButton, paymentStartedButton, withdrawButton;
     @FXML TitledGroupBg titledGroupBg, paymentsGroupBg, summaryGroupBg, withdrawGroupBg;
     @FXML TextFieldWithCopyIcon fiatAmountTextField, holderNameTextField, secondaryIdTextField, primaryIdTextField;
     @FXML TextField statusTextField, paymentMethodTextField, btcTradeAmountTextField, fiatTradeAmountTextField,
@@ -427,7 +427,7 @@ public class PendingTradesView extends ActivatableViewAndModel<AnchorPane, Pendi
 
         paymentMethodTextField.setVisible(visible);
         paymentsInfoDisplay.setVisible(visible);
-        paymentsButton.setVisible(visible);
+        paymentStartedButton.setVisible(visible);
         fiatAmountTextField.setVisible(visible);
         holderNameTextField.setVisible(visible);
 
@@ -446,7 +446,7 @@ public class PendingTradesView extends ActivatableViewAndModel<AnchorPane, Pendi
 
         paymentMethodTextField.setManaged(visible);
         paymentsInfoDisplay.setManaged(visible);
-        paymentsButton.setManaged(visible);
+        paymentStartedButton.setManaged(visible);
         fiatAmountTextField.setManaged(visible);
         holderNameTextField.setManaged(visible);
 
diff --git a/core/src/main/java/io/bitsquare/trade/Trade.java b/core/src/main/java/io/bitsquare/trade/Trade.java
index 8e384e44af..db414ba5c6 100644
--- a/core/src/main/java/io/bitsquare/trade/Trade.java
+++ b/core/src/main/java/io/bitsquare/trade/Trade.java
@@ -186,14 +186,14 @@ public class Trade implements Serializable {
     // When serialized those transient properties are not instantiated, so we need to instantiate them at first access
     public ObjectProperty<Coin> tradeAmountProperty() {
         if (_tradeAmount == null)
-            _tradeAmount = new SimpleObjectProperty<>();
+            _tradeAmount = new SimpleObjectProperty<>(tradeAmount);
 
         return _tradeAmount;
     }
 
     public ObjectProperty<Fiat> tradeVolumeProperty() {
         if (_tradeVolume == null)
-            _tradeVolume = new SimpleObjectProperty<>();
+            _tradeVolume = new SimpleObjectProperty<>(getTradeVolume());
 
         return _tradeVolume;
     }
diff --git a/core/src/main/resources/logback.xml b/core/src/main/resources/logback.xml
index 1d7ac58300..4b5eee23bc 100644
--- a/core/src/main/resources/logback.xml
+++ b/core/src/main/resources/logback.xml
@@ -7,7 +7,7 @@
     </appender>
 
     <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>.bitsquare_logs/bitsquare.log</file>
+        <file>.bitsquare/bitsquare.log</file>
         <append>false</append>
         <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
             <fileNamePattern>.bitsquare_logs/bitsquare_%i.log</fileNamePattern>