mirror of
https://github.com/haveno-dex/haveno.git
synced 2025-01-03 17:40:10 +00:00
hide take offer progress popup on validation error
This commit is contained in:
parent
897c010e0c
commit
d9b983b0fb
1 changed files with 13 additions and 6 deletions
|
@ -233,18 +233,19 @@ class TakeOfferDataModel extends OfferDataModel {
|
||||||
if (isBuyOffer())
|
if (isBuyOffer())
|
||||||
fundsNeededForTrade = fundsNeededForTrade.add(amount.get());
|
fundsNeededForTrade = fundsNeededForTrade.add(amount.get());
|
||||||
|
|
||||||
|
String errorMsg = null;
|
||||||
if (filterManager.isCurrencyBanned(offer.getCurrencyCode())) {
|
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())) {
|
} 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())) {
|
} 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())) {
|
} 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()) {
|
} 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())) {
|
} else if (tradeManager.wasOfferAlreadyUsedInTrade(offer.getId())) {
|
||||||
new Popup().warning(Res.get("offerbook.warning.offerWasAlreadyUsedInTrade")).show();
|
errorMsg = Res.get("offerbook.warning.offerWasAlreadyUsedInTrade");
|
||||||
} else {
|
} else {
|
||||||
tradeManager.onTakeOffer(amount.get(),
|
tradeManager.onTakeOffer(amount.get(),
|
||||||
getTakerFee(),
|
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) {
|
public void onPaymentAccountSelected(PaymentAccount paymentAccount) {
|
||||||
|
|
Loading…
Reference in a new issue