mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-02-23 06:55:08 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #3194 from ben-kaufman/fix-offer-volume-jumps

Browse source 
Fix offer volume jumps
This commit is contained in:
Christoph Atteneder 2019-09-19 15:45:51 +02:00 • committed by GitHub
commit f0fb663a90
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 51 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
desktop/src/main/java/bisq/desktop/main/offer/MutableOfferDataModel.java
View file

@ -56,6 +56,7 @@ import bisq.network.p2p.P2PService;
import bisq.common.app.Version;
import bisq.common.crypto.KeyRing;
import bisq.common.util.MathUtils;
import bisq.common.util.Tuple2;
import bisq.common.util.Utilities;
@ -590,6 +591,15 @@ public abstract class MutableOfferDataModel extends OfferDataModel implements Bs
// Utils
///////////////////////////////////////////////////////////////////////////////////////////
double calculateMarketPriceManual(double marketPrice, double volumeAsDouble, double amountAsDouble) {
double manualPriceAsDouble = volumeAsDouble / amountAsDouble;
double percentage = MathUtils.roundDouble(manualPriceAsDouble / marketPrice, 4);
setMarketPriceMargin(percentage);
return manualPriceAsDouble;
}
void calculateVolume() {
if (price.get() != null &&
amount.get() != null &&

46
desktop/src/main/java/bisq/desktop/main/offer/MutableOfferViewModel.java
View file

@ -507,9 +507,9 @@ public abstract class MutableOfferViewModel<M extends MutableOfferDataModel> ext
feeInFiatAsString = Res.get("shared.na");
}
double amountAsLong = (double) dataModel.getAmount().get().value;
double makerFeeInBtcAsLong = (double) makerFeeInBtc.value;
double percent = makerFeeInBtcAsLong / amountAsLong;
double amountAsDouble = (double) dataModel.getAmount().get().value;
double makerFeeInBtcAsDouble = (double) makerFeeInBtc.value;
double percent = makerFeeInBtcAsDouble / amountAsDouble;
tradeFeeInBsqWithFiat.set(Res.get("createOffer.tradeFee.fiatAndPercent",
feeInFiatAsString,
@ -734,6 +734,10 @@ public abstract class MutableOfferViewModel<M extends MutableOfferDataModel> ext
onFocusOutVolumeTextField(true, false);
onFocusOutMinAmountTextField(true, false);
});
if (marketPriceMargin.get() == null && amount.get() != null && volume.get() != null) {
updateMarketPriceToManual();
}
}
}
@ -800,12 +804,13 @@ public abstract class MutableOfferViewModel<M extends MutableOfferDataModel> ext
public void onFocusOutPriceAsPercentageTextField(boolean oldValue, boolean newValue) {
inputIsMarketBasedPrice = !oldValue && newValue;
if (oldValue && !newValue)
if (oldValue && !newValue) {
if (marketPriceMargin.get() == null) {
// field wasn't set manually
inputIsMarketBasedPrice = true;
}
marketPriceMargin.set(BSFormatter.formatRoundedDoubleWithPrecision(dataModel.getMarketPriceMargin() * 100, 2));
marketPriceMargin.set(btcFormatter.formatRoundedDoubleWithPrecision(dataModel.getMarketPriceMargin() * 100, 2));
}
// We want to trigger a recalculation of the volume
UserThread.execute(() -> {
@ -848,6 +853,10 @@ public abstract class MutableOfferViewModel<M extends MutableOfferDataModel> ext
minAmountValidationResult.set(isBtcInputValid(minAmount.get()));
}
}
if (marketPriceMargin.get() == null && amount.get() != null && volume.get() != null) {
updateMarketPriceToManual();
}
}
}
@ -1190,4 +1199,31 @@ public abstract class MutableOfferViewModel<M extends MutableOfferDataModel> ext
return dataModel.isCurrencyForMakerFeeBtc() ? btcFormatter : bsqFormatter;
}
private void updateMarketPriceToManual() {
final String currencyCode = dataModel.getTradeCurrencyCode().get();
MarketPrice marketPrice = priceFeedService.getMarketPrice(currencyCode);
if (marketPrice != null && marketPrice.isRecentExternalPriceAvailable()) {
double marketPriceAsDouble = marketPrice.getPrice();
double amountAsDouble = ParsingUtils.parseNumberStringToDouble(amount.get());
double volumeAsDouble = ParsingUtils.parseNumberStringToDouble(volume.get());
double manualPriceAsDouble = dataModel.calculateMarketPriceManual(marketPriceAsDouble, volumeAsDouble, amountAsDouble);
final boolean isCryptoCurrency = CurrencyUtil.isCryptoCurrency(currencyCode);
int precision = isCryptoCurrency ?
Altcoin.SMALLEST_UNIT_EXPONENT : Fiat.SMALLEST_UNIT_EXPONENT;
price.set(BSFormatter.formatRoundedDoubleWithPrecision(manualPriceAsDouble, precision));
setPriceToModel();
dataModel.calculateTotalToPay();
updateButtonDisableState();
applyMakerFee();
} else {
marketPriceMargin.set("");
String id = "showNoPriceFeedAvailablePopup";
if (preferences.showAgain(id)) {
new Popup<>().warning(Res.get("popup.warning.noPriceFeedAvailable"))
.dontShowAgainId(id)
.show();
}
}
}
}