Ecosystem/haveno
Ecosystem/haveno
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2024-09-29 12:01:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

hide take offer progress popup on validation error

Browse source
This commit is contained in:
woodser 2024-03-22 08:56:41 -04:00
parent 897c010e0c
commit d9b983b0fb
1 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
desktop/src/main/java/haveno/desktop/main/offer/takeoffer/TakeOfferDataModel.java
View file

@ -233,18 +233,19 @@ class TakeOfferDataModel extends OfferDataModel {
if (isBuyOffer())
fundsNeededForTrade = fundsNeededForTrade.add(amount.get());
String errorMsg = null;
if (filterManager.isCurrencyBanned(offer.getCurrencyCode())) {
new Popup().warning(Res.get("offerbook.warning.currencyBanned")).show();
errorMsg = Res.get("offerbook.warning.currencyBanned");
} else if (filterManager.isPaymentMethodBanned(offer.getPaymentMethod())) {
new Popup().warning(Res.get("offerbook.warning.paymentMethodBanned")).show();
errorMsg = Res.get("offerbook.warning.paymentMethodBanned");
} else if (filterManager.isOfferIdBanned(offer.getId())) {
new Popup().warning(Res.get("offerbook.warning.offerBlocked")).show();
errorMsg = Res.get("offerbook.warning.offerBlocked");
} else if (filterManager.isNodeAddressBanned(offer.getMakerNodeAddress())) {
new Popup().warning(Res.get("offerbook.warning.nodeBlocked")).show();
errorMsg = Res.get("offerbook.warning.nodeBlocked");
} else if (filterManager.requireUpdateToNewVersionForTrading()) {
new Popup().warning(Res.get("offerbook.warning.requireUpdateToNewVersion")).show();
errorMsg = Res.get("offerbook.warning.requireUpdateToNewVersion");
} else if (tradeManager.wasOfferAlreadyUsedInTrade(offer.getId())) {
new Popup().warning(Res.get("offerbook.warning.offerWasAlreadyUsedInTrade")).show();
errorMsg = Res.get("offerbook.warning.offerWasAlreadyUsedInTrade");
} else {
tradeManager.onTakeOffer(amount.get(),
getTakerFee(),
@ -260,6 +261,12 @@ class TakeOfferDataModel extends OfferDataModel {
}
);
}
// handle error
if (errorMsg != null) {
new Popup().warning(errorMsg).show();
errorMessageHandler.handleErrorMessage(errorMsg);
}
}
public void onPaymentAccountSelected(PaymentAccount paymentAccount) {