Git-Mirrors/haveno
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2025-08-22 13:39:39 -04:00
Code Issues Projects Releases Packages Wiki Activity

Fixed missing locale check for non euro countries

Browse source
This commit is contained in:
Manfred Karrer 2016-02-08 19:39:17 +01:00
parent 9d4730dfbf
commit 9438bc818e
1 changed files with 14 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

22
gui/src/main/java/io/bitsquare/gui/components/paymentmethods/SepaForm.java
View file

@ -133,11 +133,14 @@ public class SepaForm extends PaymentMethodForm {
countryComboBox.setItems(FXCollections.observableArrayList(CountryUtil.getAllSepaCountries())); countryComboBox.setItems(FXCollections.observableArrayList(CountryUtil.getAllSepaCountries()));
Country country = CountryUtil.getDefaultCountry(); Country country = CountryUtil.getDefaultCountry();
countryComboBox.getSelectionModel().select(country); if (CountryUtil.getAllSepaCountries().contains(country)) {
sepaAccount.setCountry(country); countryComboBox.getSelectionModel().select(country);
TradeCurrency currency = CurrencyUtil.getCurrencyByCountryCode(country.code); sepaAccount.setCountry(country);
sepaAccount.setSingleTradeCurrency(currency); TradeCurrency currency = CurrencyUtil.getCurrencyByCountryCode(country.code);
currencyTextField.setText(currency.getCodeAndName()); sepaAccount.setSingleTradeCurrency(currency);
currencyTextField.setText(currency.getCodeAndName());
}
updateFromInputs(); updateFromInputs();
} }
@ -195,12 +198,15 @@ public class SepaForm extends PaymentMethodForm {
checkBoxList.stream().forEach(checkBox -> { checkBoxList.stream().forEach(checkBox -> {
String countryCode = (String) checkBox.getUserData(); String countryCode = (String) checkBox.getUserData();
TradeCurrency selectedCurrency = sepaAccount.getSelectedTradeCurrency(); TradeCurrency selectedCurrency = sepaAccount.getSelectedTradeCurrency();
if (selectedCurrency == null) if (selectedCurrency == null) {
selectedCurrency = CurrencyUtil.getCurrencyByCountryCode(CountryUtil.getDefaultCountry().code); Country country = CountryUtil.getDefaultCountry();
if (CountryUtil.getAllSepaCountries().contains(country))
selectedCurrency = CurrencyUtil.getCurrencyByCountryCode(country.code);
}
boolean selected; boolean selected;
if (isEditable) { if (isEditable && selectedCurrency != null) {
selected = CurrencyUtil.getCurrencyByCountryCode(countryCode).getCode().equals(selectedCurrency.getCode()); selected = CurrencyUtil.getCurrencyByCountryCode(countryCode).getCode().equals(selectedCurrency.getCode());
if (selected) if (selected)