nihilist/haveno
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix jfx error on offer book added

Browse Source
This commit is contained in:
woodser 2022-08-31 10:32:23 -04:00
parent bdaa054c95
commit 3da228750f
4 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/java/bisq/core/trade/Trade.java
View File

@ -75,7 +75,6 @@ import lombok.Setter;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkNotNull;
@ -725,6 +724,7 @@ public abstract class Trade implements Tradable, Model {
// gather relevant info // gather relevant info
XmrWalletService walletService = processModel.getProvider().getXmrWalletService(); XmrWalletService walletService = processModel.getProvider().getXmrWalletService();
MoneroWallet multisigWallet = walletService.getMultisigWallet(this.getId()); MoneroWallet multisigWallet = walletService.getMultisigWallet(this.getId());
if (multisigWallet.isMultisigImportNeeded()) throw new RuntimeException("Cannot create payout tx because multisig import is needed");
String sellerPayoutAddress = this.getSeller().getPayoutAddressString(); String sellerPayoutAddress = this.getSeller().getPayoutAddressString();
String buyerPayoutAddress = this.getBuyer().getPayoutAddressString(); String buyerPayoutAddress = this.getBuyer().getPayoutAddressString();
Preconditions.checkNotNull(sellerPayoutAddress, "Seller payout address must not be null"); Preconditions.checkNotNull(sellerPayoutAddress, "Seller payout address must not be null");

24
desktop/src/main/java/bisq/desktop/main/market/offerbook/OfferBookChartViewModel.java
View File

@ -32,7 +32,7 @@ import bisq.desktop.util.CurrencyList;
import bisq.desktop.util.CurrencyListItem; import bisq.desktop.util.CurrencyListItem;
import bisq.desktop.util.DisplayUtils; import bisq.desktop.util.DisplayUtils;
import bisq.desktop.util.GUIUtil; import bisq.desktop.util.GUIUtil;
import bisq.common.UserThread;
import bisq.core.account.witness.AccountAgeWitnessService; import bisq.core.account.witness.AccountAgeWitnessService;
import bisq.core.locale.CurrencyUtil; import bisq.core.locale.CurrencyUtil;
import bisq.core.locale.GlobalSettings; import bisq.core.locale.GlobalSettings;
@ -125,17 +125,19 @@ class OfferBookChartViewModel extends ActivatableViewModel {
offerBookListItems = offerBook.getOfferBookListItems(); offerBookListItems = offerBook.getOfferBookListItems();
offerBookListItemsListener = c -> { offerBookListItemsListener = c -> {
c.next(); UserThread.execute(() -> {
if (c.wasAdded() || c.wasRemoved()) { c.next();
ArrayList<OfferBookListItem> list = new ArrayList<>(c.getRemoved()); if (c.wasAdded() || c.wasRemoved()) {
list.addAll(c.getAddedSubList()); ArrayList<OfferBookListItem> list = new ArrayList<>(c.getRemoved());
if (list.stream() list.addAll(c.getAddedSubList());
.map(OfferBookListItem::getOffer) if (list.stream()
.anyMatch(e -> e.getCurrencyCode().equals(selectedTradeCurrencyProperty.get().getCode()))) .map(OfferBookListItem::getOffer)
updateChartData(); .anyMatch(e -> e.getCurrencyCode().equals(selectedTradeCurrencyProperty.get().getCode())))
} updateChartData();
}
fillTradeCurrencies(); fillTradeCurrencies();
});
}; };
currenciesUpdatedListener = (observable, oldValue, newValue) -> { currenciesUpdatedListener = (observable, oldValue, newValue) -> {

4
desktop/src/main/java/bisq/desktop/main/market/spread/SpreadViewModel.java
View File

@ -22,7 +22,7 @@ import bisq.desktop.main.offer.offerbook.OfferBook;
import bisq.desktop.main.offer.offerbook.OfferBookListItem; import bisq.desktop.main.offer.offerbook.OfferBookListItem;
import bisq.desktop.main.overlays.popups.Popup; import bisq.desktop.main.overlays.popups.Popup;
import bisq.desktop.util.GUIUtil; import bisq.desktop.util.GUIUtil;
import bisq.common.UserThread;
import bisq.core.locale.Res; import bisq.core.locale.Res;
import bisq.core.monetary.Altcoin; import bisq.core.monetary.Altcoin;
import bisq.core.monetary.Price; import bisq.core.monetary.Price;
@ -89,7 +89,7 @@ class SpreadViewModel extends ActivatableViewModel {
this.formatter = formatter; this.formatter = formatter;
includePaymentMethod = false; includePaymentMethod = false;
offerBookListItems = offerBook.getOfferBookListItems(); offerBookListItems = offerBook.getOfferBookListItems();
listChangeListener = c -> update(offerBookListItems); listChangeListener = c -> UserThread.execute(() -> update(offerBookListItems));
} }
public String getKeyColumnName() { public String getKeyColumnName() {

1
desktop/src/main/java/bisq/desktop/main/offer/offerbook/OfferBookViewModel.java
View File

@ -87,7 +87,6 @@ import java.util.Optional;
import java.util.Set; import java.util.Set;
import java.util.function.Predicate; import java.util.function.Predicate;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import java.util.stream.Stream;
import lombok.Getter; import lombok.Getter;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;