mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-02-24 07:07:43 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #6209 from ripcurlx/fix-matching-account-toggle

Browse source 
Update matching account toggle state when tab is selected
This commit is contained in:
Bisq GitHub Admin 2022-05-18 11:34:07 +02:00 • committed by GitHub
commit 671263c430
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
desktop/src/main/java/bisq/desktop/main/offer/offerbook/OfferBookView.java
View file

@ -609,7 +609,7 @@ abstract public class OfferBookView<R extends GridPane, M extends OfferBookViewM
if (isSelected) {
updateCurrencyComboBoxFromModel();
root.requestFocus();
updateCreateOfferButton();
matchingOffersToggle.setSelected(model.useOffersMatchingMyAccountsFilter);
}
updateCreateOfferButton();
}

13
desktop/src/main/java/bisq/desktop/main/offer/offerbook/OfferBookViewModel.java
View file

@ -231,10 +231,7 @@ abstract class OfferBookViewModel extends ActivatableViewModel {
protected void activate() {
filteredItems.addListener(filterItemsListener);
if (user != null) {
disableMatchToggle.set(user.getPaymentAccounts() == null || user.getPaymentAccounts().isEmpty());
}
useOffersMatchingMyAccountsFilter = !disableMatchToggle.get() && isShowOffersMatchingMyAccounts();
updateMatchingAccountToggleState();
fillCurrencies();
updateSelectedTradeCurrency();
@ -268,6 +265,7 @@ abstract class OfferBookViewModel extends ActivatableViewModel {
if (isTabSelected) {
updateSelectedTradeCurrency();
filterOffers();
updateMatchingAccountToggleState();
}
}
@ -561,6 +559,13 @@ abstract class OfferBookViewModel extends ActivatableViewModel {
fillCurrencies(tradeCurrencies, allCurrencies);
}
private void updateMatchingAccountToggleState() {
if (user != null) {
disableMatchToggle.set(user.getPaymentAccounts() == null || user.getPaymentAccounts().isEmpty());
}
useOffersMatchingMyAccountsFilter = !disableMatchToggle.get() && isShowOffersMatchingMyAccounts();
}
abstract void fillCurrencies(ObservableList<TradeCurrency> tradeCurrencies,
ObservableList<TradeCurrency> allCurrencies);