Merge pull request #2315 from ripcurlx/fix-multiple-payment-account-s…

…election-disabled Not disable the payment account selection in take offer screen
bisq-network · Jan 25, 2019 · 8b7646a · 8b7646a
2 parents 43da9ad + 8013aa2
commit 8b7646a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git 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);

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
@@ -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);