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

Fix bug with removed currencies not updating market price combobox list

Browse source
This commit is contained in:
Manfred Karrer 2016-04-12 01:43:18 +02:00
parent dd8d300496
commit b7e87c51ad
2 changed files with 26 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

17
gui/src/main/java/io/bitsquare/gui/main/MainViewModel.java
View file

@ -721,7 +721,17 @@ public class MainViewModel implements ViewModel {
selectedPriceFeedComboBoxItemProperty.get().setDisplayString(newValue); selectedPriceFeedComboBoxItemProperty.get().setDisplayString(newValue);
}); });
priceFeedAllLoadedSubscription = EasyBind.subscribe(priceFeed.currenciesUpdateFlagProperty(), newPriceUpdate -> { priceFeedAllLoadedSubscription = EasyBind.subscribe(priceFeed.currenciesUpdateFlagProperty(), newPriceUpdate -> setMarketPriceInItems());
preferences.getTradeCurrenciesAsObservable().addListener((ListChangeListener<TradeCurrency>) c -> {
UserThread.runAfter(() -> {
fillPriceFeedComboBoxItems();
setMarketPriceInItems();
}, 100, TimeUnit.MILLISECONDS);
});
}
private void setMarketPriceInItems() {
priceFeedComboBoxItems.stream().forEach(item -> { priceFeedComboBoxItems.stream().forEach(item -> {
String currencyCode = item.currencyCode; String currencyCode = item.currencyCode;
MarketPrice marketPrice = priceFeed.getMarketPrice(currencyCode); MarketPrice marketPrice = priceFeed.getMarketPrice(currencyCode);
@ -741,11 +751,6 @@ public class MainViewModel implements ViewModel {
} }
item.setDisplayString(priceString + " " + currencyPairString); item.setDisplayString(priceString + " " + currencyPairString);
}); });
});
preferences.getTradeCurrenciesAsObservable().addListener((ListChangeListener<TradeCurrency>) c -> {
UserThread.runAfter(() -> fillPriceFeedComboBoxItems(), 100, TimeUnit.MILLISECONDS);
});
} }
public void setPriceFeedComboBoxItem(PriceFeedComboBoxItem item) { public void setPriceFeedComboBoxItem(PriceFeedComboBoxItem item) {

1
gui/src/main/java/io/bitsquare/gui/main/settings/preferences/PreferencesView.java
View file

@ -356,7 +356,6 @@ public class PreferencesView extends ActivatableViewAndModel<GridPane, Activatab
fiatCurrenciesListView.setItems(fiatCurrencies); fiatCurrenciesListView.setItems(fiatCurrencies);
fiatCurrenciesComboBox.setOnAction(e -> { fiatCurrenciesComboBox.setOnAction(e -> {
FiatCurrency selectedItem = fiatCurrenciesComboBox.getSelectionModel().getSelectedItem(); FiatCurrency selectedItem = fiatCurrenciesComboBox.getSelectionModel().getSelectedItem();
log.error("setOnAction " + selectedItem);
if (selectedItem != null) { if (selectedItem != null) {
preferences.addFiatCurrency(selectedItem); preferences.addFiatCurrency(selectedItem);
if (allFiatCurrencies.contains(selectedItem)) { if (allFiatCurrencies.contains(selectedItem)) {