From dced3c1f4e8a03042af8fb739c2177b327a96fc3 Mon Sep 17 00:00:00 2001 From: Christoph Atteneder Date: Fri, 25 Jan 2019 13:47:35 +0100 Subject: [PATCH 1/2] Not disable the payment account selection in take offer screen as long DAO is not live --- .../bisq/desktop/main/offer/takeoffer/TakeOfferView.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/desktop/src/main/java/bisq/desktop/main/offer/takeoffer/TakeOfferView.java b/desktop/src/main/java/bisq/desktop/main/offer/takeoffer/TakeOfferView.java index 27d5d9365f1..f7a4c75c496 100644 --- a/desktop/src/main/java/bisq/desktop/main/offer/takeoffer/TakeOfferView.java +++ b/desktop/src/main/java/bisq/desktop/main/offer/takeoffer/TakeOfferView.java @@ -484,9 +484,11 @@ private void onShowPayFundsScreen() { model.onShowPayFundsScreen(); - paymentAccountsComboBox.setMouseTransparent(true); - paymentAccountsComboBox.setDisable(true); - paymentAccountsComboBox.setFocusTraversable(false); + if (DevEnv.isDaoActivated()) { + paymentAccountsComboBox.setMouseTransparent(true); + paymentAccountsComboBox.setDisable(true); + paymentAccountsComboBox.setFocusTraversable(false); + } amountTextField.setMouseTransparent(true); amountTextField.setDisable(false); From 8013aa2076f02433c1ed7a3197601baf606b9e4f Mon Sep 17 00:00:00 2001 From: Christoph Atteneder Date: Fri, 25 Jan 2019 13:50:30 +0100 Subject: [PATCH 2/2] Disable payment accounts combobox so it is clear that it cannot be selected anymore --- .../src/main/java/bisq/desktop/main/offer/MutableOfferView.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/desktop/src/main/java/bisq/desktop/main/offer/MutableOfferView.java b/desktop/src/main/java/bisq/desktop/main/offer/MutableOfferView.java index 3ace8007f12..6e973186b8d 100644 --- a/desktop/src/main/java/bisq/desktop/main/offer/MutableOfferView.java +++ b/desktop/src/main/java/bisq/desktop/main/offer/MutableOfferView.java @@ -411,6 +411,8 @@ private void onShowPayFundsScreen() { model.onShowPayFundsScreen(); + paymentAccountsComboBox.setDisable(true); + editOfferElements.forEach(node -> { node.setMouseTransparent(true); node.setFocusTraversable(false);