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

desktop app creates offers with floating market price

Browse Source
This commit is contained in:
woodser 2023-03-06 12:03:59 -05:00
parent 369e562362
commit f91db182d8
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/main/java/bisq/core/offer/CreateOfferService.java
View File

@ -133,6 +133,12 @@ public class CreateOfferService {
minAmount,
buyerSecurityDepositAsDouble);
// verify fixed price xor market price with margin
if (price != null) {
if (useMarketBasedPrice) throw new IllegalArgumentException("Can create offer with fixed price or floating market price but not both");
if (marketPriceMargin != 0) throw new IllegalArgumentException("Cannot set market price margin with fixed price");
}
long creationTime = new Date().getTime();
NodeAddress makerAddress = p2PService.getAddress();
boolean useMarketBasedPriceValue = price == null &&

2
desktop/src/main/java/bisq/desktop/main/offer/MutableOfferDataModel.java
View File

@ -293,7 +293,7 @@ public abstract class MutableOfferDataModel extends OfferDataModel {
tradeCurrencyCode.get(),
amount.get(),
minAmount.get(),
price.get(),
useMarketBasedPrice.get() ? null : price.get(),
Coin.ZERO,
useMarketBasedPrice.get(),
marketPriceMargin,

3
desktop/src/main/java/bisq/desktop/main/offer/MutableOfferViewModel.java
View File

@ -676,11 +676,8 @@ public abstract class MutableOfferViewModel<M extends MutableOfferDataModel> ext
// On focus out we do validation and apply the data to the model
void onFocusOutAmountTextField(boolean oldValue, boolean newValue) {
if (oldValue && !newValue) {
System.out.println("Checking if input valid: " + amount.get());
InputValidator.ValidationResult result = isXmrInputValid(amount.get());
amountValidationResult.set(result);
System.out.println("Result is valid: " + result.isValid);
System.out.println("Result error: " + result.errorMessage);
if (result.isValid) {
setAmountToModel();
ignoreAmountStringListener = true;