Git-Mirrors/haveno
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2025-08-15 01:45:32 -04:00
Code Issues Projects Releases Packages Wiki Activity

Fix validation for inputs at create offer screen

Browse source
This commit is contained in:
Manfred Karrer 2016-04-30 13:12:47 +02:00
parent 528a1dc62e
commit 2e85f855a6
1 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferViewModel.java
View file

@ -493,9 +493,9 @@ class CreateOfferViewModel extends ActivatableWithDataModel<CreateOfferDataModel
calculateVolume(); calculateVolume();
// handle minAmount/amount relationship // handle minAmount/amount relationship
if (!dataModel.isMinAmountLessOrEqualAmount()) if (!dataModel.isMinAmountLessOrEqualAmount())
minAmount.set(amount.get()); minAmount.set(amount.get());
else else
amountValidationResult.set(result); amountValidationResult.set(result);
if (minAmount.get() != null) if (minAmount.get() != null)
@ -750,10 +750,11 @@ class CreateOfferViewModel extends ActivatableWithDataModel<CreateOfferDataModel
boolean inputDataValid = isBtcInputValid(amount.get()).isValid && boolean inputDataValid = isBtcInputValid(amount.get()).isValid &&
isBtcInputValid(minAmount.get()).isValid && isBtcInputValid(minAmount.get()).isValid &&
isFiatInputValid(price.get()).isValid && isFiatInputValid(price.get()).isValid &&
dataModel.priceAsFiat.get() != null &&
dataModel.priceAsFiat.get().getValue() != 0 &&
isFiatInputValid(volume.get()).isValid && isFiatInputValid(volume.get()).isValid &&
dataModel.isMinAmountLessOrEqualAmount() && dataModel.isMinAmountLessOrEqualAmount();
!dataModel.useMarketBasedPrice.get() || dataModel.getMarketPriceMargin() != 0 &&
dataModel.useMarketBasedPrice.get() || (dataModel.priceAsFiat.get() != null && dataModel.priceAsFiat.get().getValue() != 0);
isNextButtonDisabled.set(!inputDataValid); isNextButtonDisabled.set(!inputDataValid);
// boolean notSufficientFees = dataModel.isWalletFunded.get() && dataModel.isMainNet.get() && !dataModel.isFeeFromFundingTxSufficient.get(); // boolean notSufficientFees = dataModel.isWalletFunded.get() && dataModel.isMainNet.get() && !dataModel.isFeeFromFundingTxSufficient.get();
//isPlaceOfferButtonDisabled.set(createOfferRequested || !inputDataValid || notSufficientFees); //isPlaceOfferButtonDisabled.set(createOfferRequested || !inputDataValid || notSufficientFees);