Add cancel button to SelectDepositTxPopup

ivilata · Jan 18, 2016 · 276e02e · 276e02e
1 parent 2e363a3
commit 276e02e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
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
@@ -221,9 +221,12 @@ private void tryOpenDispute(boolean isSupportTicket) {
                 if (candidates.size() == 1)
                     doOpenDispute(isSupportTicket, candidates.get(0));
                 else if (candidates.size() > 1)
-                    new SelectDepositTxPopup().transactions(candidates).onSelect(transaction -> {
-                        doOpenDispute(isSupportTicket, transaction);
-                    }).show();
+                    new SelectDepositTxPopup().transactions(candidates)
+                            .onSelect(transaction -> {
+                                doOpenDispute(isSupportTicket, transaction);
+                            })
+                            .closeButtonText("Cancel")
+                            .show();
                 else
                     log.error("Trade.depositTx is null and we did not find any MultiSig transaction.");
             }

diff --git a/gui/src/main/java/io/bitsquare/gui/popups/SelectDepositTxPopup.java b/gui/src/main/java/io/bitsquare/gui/popups/SelectDepositTxPopup.java
@@ -19,7 +19,6 @@
 
 import io.bitsquare.common.util.Tuple2;
 import javafx.collections.FXCollections;
-import javafx.scene.control.Button;
 import javafx.scene.control.ComboBox;
 import javafx.scene.control.Label;
 import javafx.util.StringConverter;
@@ -37,7 +36,6 @@
 
 public class SelectDepositTxPopup extends Popup {
     private static final Logger log = LoggerFactory.getLogger(SelectDepositTxPopup.class);
-    private Button emptyWalletButton;
     private ComboBox<Transaction> transactionsComboBox;
     private List<Transaction> transaction;
     private Optional<Consumer<Transaction>> selectHandlerOptional;
@@ -59,6 +57,7 @@ public SelectDepositTxPopup show() {
         createGridPane();
         addHeadLine();
         addContent();
+        addCloseButton();
         createPopup();
         return this;
     }
@@ -86,6 +85,7 @@ private void addContent() {
 
         Tuple2<Label, ComboBox> tuple = addLabelComboBox(gridPane, ++rowIndex);
         transactionsComboBox = tuple.second;
+        transactionsComboBox.setPromptText("Select deposit transaction");
         transactionsComboBox.setConverter(new StringConverter<Transaction>() {
             @Override
             public String toString(Transaction transaction) {
@@ -100,6 +100,7 @@ public Transaction fromString(String string) {
         transactionsComboBox.setItems(FXCollections.observableArrayList(transaction));
         transactionsComboBox.setOnAction(event -> {
             selectHandlerOptional.get().accept(transactionsComboBox.getSelectionModel().getSelectedItem());
+            hide();
         });
     }