Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Not disable the payment account selection in take offer screen #2315

Conversation

ripcurlx
Copy link
Contributor

@ripcurlx ripcurlx commented Jan 24, 2019

Fixes #2276.

@ripcurlx ripcurlx changed the title Not disable the payment account selection in take offer screen Fixes #2276. Not disable the payment account selection in take offer screen Jan 24, 2019
@ripcurlx ripcurlx force-pushed the fix-multiple-payment-account-selection-disabled branch from 8f78e82 to 8013aa2 Compare January 25, 2019 12:50
@@ -484,10 +484,6 @@ private void onShowPayFundsScreen() {

model.onShowPayFundsScreen();

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Doesn't that this keep the combobox enabled in the DAO mode when at payment screen? Maybe it requires an if check ro the dao mode?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If the DAO is activated there is the additional step where you select the trade fee currency (BTC or BSQ), so there is no need to be able to switch the payment account also in the show funds screen. Before the DAO, you switch directly to the Pay Funds screen if there is no range to choose from, so it wouldn't be possible to switch to another payment account. That's why I needed to add this check.

if (DevEnv.isDaoActivated()) {
            paymentAccountsComboBox.setMouseTransparent(true);
            paymentAccountsComboBox.setDisable(true);
            paymentAccountsComboBox.setFocusTraversable(false);
}

@ManfredKarrer ManfredKarrer merged commit 8b7646a into bisq-network:master Jan 25, 2019
@ripcurlx ripcurlx deleted the fix-multiple-payment-account-selection-disabled branch December 18, 2019 08:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants