From 2e85f855a6555a47288eef1ba5d320d586444e76 Mon Sep 17 00:00:00 2001 From: Manfred Karrer Date: Sat, 30 Apr 2016 13:12:47 +0200 Subject: [PATCH] Fix validation for inputs at create offer screen --- .../main/offer/createoffer/CreateOfferViewModel.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferViewModel.java b/gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferViewModel.java index edb39ef4032..7077e549ae2 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferViewModel.java +++ b/gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferViewModel.java @@ -493,9 +493,9 @@ void onFocusOutAmountTextField(boolean oldValue, boolean newValue, String userIn calculateVolume(); // handle minAmount/amount relationship - if (!dataModel.isMinAmountLessOrEqualAmount()) + if (!dataModel.isMinAmountLessOrEqualAmount()) minAmount.set(amount.get()); - else + else amountValidationResult.set(result); if (minAmount.get() != null) @@ -750,10 +750,11 @@ private void updateButtonDisableState() { boolean inputDataValid = isBtcInputValid(amount.get()).isValid && isBtcInputValid(minAmount.get()).isValid && isFiatInputValid(price.get()).isValid && + dataModel.priceAsFiat.get() != null && + dataModel.priceAsFiat.get().getValue() != 0 && isFiatInputValid(volume.get()).isValid && - dataModel.isMinAmountLessOrEqualAmount() && - !dataModel.useMarketBasedPrice.get() || dataModel.getMarketPriceMargin() != 0 && - dataModel.useMarketBasedPrice.get() || (dataModel.priceAsFiat.get() != null && dataModel.priceAsFiat.get().getValue() != 0); + dataModel.isMinAmountLessOrEqualAmount(); + isNextButtonDisabled.set(!inputDataValid); // boolean notSufficientFees = dataModel.isWalletFunded.get() && dataModel.isMainNet.get() && !dataModel.isFeeFromFundingTxSufficient.get(); //isPlaceOfferButtonDisabled.set(createOfferRequested || !inputDataValid || notSufficientFees);