From 9438bc818e3f46345b62892f89dfab077c389772 Mon Sep 17 00:00:00 2001 From: Manfred Karrer Date: Mon, 8 Feb 2016 19:39:17 +0100 Subject: [PATCH] Fixed missing locale check for non euro countries --- .../components/paymentmethods/SepaForm.java | 22 ++++++++++++------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/gui/src/main/java/io/bitsquare/gui/components/paymentmethods/SepaForm.java b/gui/src/main/java/io/bitsquare/gui/components/paymentmethods/SepaForm.java index 6e5f91925a..d3aa540a92 100644 --- a/gui/src/main/java/io/bitsquare/gui/components/paymentmethods/SepaForm.java +++ b/gui/src/main/java/io/bitsquare/gui/components/paymentmethods/SepaForm.java @@ -133,11 +133,14 @@ public class SepaForm extends PaymentMethodForm { countryComboBox.setItems(FXCollections.observableArrayList(CountryUtil.getAllSepaCountries())); Country country = CountryUtil.getDefaultCountry(); - countryComboBox.getSelectionModel().select(country); - sepaAccount.setCountry(country); - TradeCurrency currency = CurrencyUtil.getCurrencyByCountryCode(country.code); - sepaAccount.setSingleTradeCurrency(currency); - currencyTextField.setText(currency.getCodeAndName()); + if (CountryUtil.getAllSepaCountries().contains(country)) { + countryComboBox.getSelectionModel().select(country); + sepaAccount.setCountry(country); + TradeCurrency currency = CurrencyUtil.getCurrencyByCountryCode(country.code); + sepaAccount.setSingleTradeCurrency(currency); + currencyTextField.setText(currency.getCodeAndName()); + } + updateFromInputs(); } @@ -195,12 +198,15 @@ public class SepaForm extends PaymentMethodForm { checkBoxList.stream().forEach(checkBox -> { String countryCode = (String) checkBox.getUserData(); TradeCurrency selectedCurrency = sepaAccount.getSelectedTradeCurrency(); - if (selectedCurrency == null) - selectedCurrency = CurrencyUtil.getCurrencyByCountryCode(CountryUtil.getDefaultCountry().code); + if (selectedCurrency == null) { + Country country = CountryUtil.getDefaultCountry(); + if (CountryUtil.getAllSepaCountries().contains(country)) + selectedCurrency = CurrencyUtil.getCurrencyByCountryCode(country.code); + } boolean selected; - if (isEditable) { + if (isEditable && selectedCurrency != null) { selected = CurrencyUtil.getCurrencyByCountryCode(countryCode).getCode().equals(selectedCurrency.getCode()); if (selected)