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

Merged
merged 2 commits into from Jan 25, 2019

Conversation

Projects
None yet
2 participants
@ripcurlx
Copy link
Member

ripcurlx commented Jan 24, 2019

Fixes #2276.

@ripcurlx ripcurlx requested a review from ManfredKarrer as a code owner Jan 24, 2019

@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 added some commits Jan 25, 2019

@ripcurlx ripcurlx force-pushed the ripcurlx:fix-multiple-payment-account-selection-disabled branch from 8f78e82 to 8013aa2 Jan 25, 2019

@@ -484,10 +484,6 @@ private void onShowPayFundsScreen() {

model.onShowPayFundsScreen();

This comment has been minimized.

@ManfredKarrer

ManfredKarrer Jan 25, 2019

Member

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?

This comment has been minimized.

@ripcurlx

ripcurlx Jan 25, 2019

Author Member

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

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details

@ripcurlx ripcurlx referenced this pull request Jan 30, 2019

Closed

For January 2019 #206

@ripcurlx ripcurlx referenced this pull request Feb 27, 2019

Closed

For February 2019 #224

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.
You signed in with another tab or window. Reload to refresh your session. You signed out in another tab or window. Reload to refresh your session.