From 18319bcb5205ba6c5c7eed83c975e48a91dec945 Mon Sep 17 00:00:00 2001
From: Manfred Karrer <mk@nucleo.io>
Date: Mon, 18 Jan 2016 23:33:24 +0100
Subject: [PATCH] UI improvements

---
 .../portfolio/pendingtrades/steps/CompletedView.java   |  5 ++++-
 .../io/bitsquare/gui/popups/SelectDepositTxPopup.java  | 10 +++++++---
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/CompletedView.java b/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/CompletedView.java
index bea996c7ea..a20f9ab58a 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/CompletedView.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/CompletedView.java
@@ -110,7 +110,10 @@ public class CompletedView extends TradeStepDetailsView {
         withdrawAmountTextField = addLabelTextField(gridPane, gridRow, "Amount to withdraw:", "", Layout.FIRST_ROW_AND_GROUP_DISTANCE).second;
         withdrawAddressTextField = addLabelInputTextField(gridPane, ++gridRow, "Withdraw to address:").second;
         withdrawButton = addButtonAfterGroup(gridPane, ++gridRow, "Withdraw to external wallet");
-        withdrawButton.setOnAction(e -> model.onWithdrawRequest(withdrawAddressTextField.getText()));
+        withdrawButton.setOnAction(e -> {
+            model.onWithdrawRequest(withdrawAddressTextField.getText());
+            withdrawButton.setDisable(true);
+        });
 
         if (BitsquareApp.DEV_MODE)
             withdrawAddressTextField.setText("mwajQdfYnve1knXnmv7JdeiVpeogTsck6S");
diff --git a/gui/src/main/java/io/bitsquare/gui/popups/SelectDepositTxPopup.java b/gui/src/main/java/io/bitsquare/gui/popups/SelectDepositTxPopup.java
index 56a8b9c494..8638b2c893 100644
--- a/gui/src/main/java/io/bitsquare/gui/popups/SelectDepositTxPopup.java
+++ b/gui/src/main/java/io/bitsquare/gui/popups/SelectDepositTxPopup.java
@@ -19,8 +19,10 @@ package io.bitsquare.gui.popups;
 
 import io.bitsquare.common.util.Tuple2;
 import javafx.collections.FXCollections;
+import javafx.geometry.Insets;
 import javafx.scene.control.ComboBox;
 import javafx.scene.control.Label;
+import javafx.scene.layout.GridPane;
 import javafx.util.StringConverter;
 import org.bitcoinj.core.Transaction;
 import org.slf4j.Logger;
@@ -77,15 +79,17 @@ public class SelectDepositTxPopup extends Popup {
     ///////////////////////////////////////////////////////////////////////////////////////////
 
     private void addContent() {
-        addMultilineLabel(gridPane, ++rowIndex,
+        Label label = addMultilineLabel(gridPane, ++rowIndex,
                 "The deposit transaction was not stored in the trade.\n" +
                         "Please select one of the existing MultiSig transactions from your wallet which was the " +
                         "deposit transaction used in the failed trade.",
                 10);
 
-        Tuple2<Label, ComboBox> tuple = addLabelComboBox(gridPane, ++rowIndex);
+        GridPane.setMargin(label, new Insets(0, 0, 10, 0));
+
+        Tuple2<Label, ComboBox> tuple = addLabelComboBox(gridPane, ++rowIndex, "Select deposit transaction");
         transactionsComboBox = tuple.second;
-        transactionsComboBox.setPromptText("Select deposit transaction");
+        transactionsComboBox.setPromptText("Select");
         transactionsComboBox.setConverter(new StringConverter<Transaction>() {
             @Override
             public String toString(Transaction transaction) {