mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2024-11-19 09:52:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix deviation in open portfolio offers & history.

Browse Source
This commit is contained in:
jmacxx 2023-10-23 14:26:01 -05:00
parent 175a0946e5
commit 7f4bde8669
No known key found for this signature in database
GPG Key ID: 155297BABFE94A1B
3 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/src/main/java/bisq/core/trade/ClosedTradableFormatter.java
View File

@ -26,6 +26,7 @@ import bisq.core.offer.OpenOffer;
import bisq.core.trade.model.Tradable; import bisq.core.trade.model.Tradable;
import bisq.core.trade.model.bisq_v1.Trade; import bisq.core.trade.model.bisq_v1.Trade;
import bisq.core.util.FormattingUtils; import bisq.core.util.FormattingUtils;
import bisq.core.util.PriceUtil;
import bisq.core.util.coin.BsqFormatter; import bisq.core.util.coin.BsqFormatter;
import bisq.core.util.coin.CoinFormatter; import bisq.core.util.coin.CoinFormatter;
@ -49,7 +50,6 @@ import static bisq.core.trade.model.bisq_v1.Trade.DisputeState.DISPUTE_CLOSED;
import static bisq.core.trade.model.bisq_v1.Trade.DisputeState.MEDIATION_CLOSED; import static bisq.core.trade.model.bisq_v1.Trade.DisputeState.MEDIATION_CLOSED;
import static bisq.core.trade.model.bisq_v1.Trade.DisputeState.REFUND_REQUEST_CLOSED; import static bisq.core.trade.model.bisq_v1.Trade.DisputeState.REFUND_REQUEST_CLOSED;
import static bisq.core.util.FormattingUtils.BTC_FORMATTER_KEY; import static bisq.core.util.FormattingUtils.BTC_FORMATTER_KEY;
import static bisq.core.util.FormattingUtils.formatPercentagePrice;
import static bisq.core.util.FormattingUtils.formatToPercentWithSymbol; import static bisq.core.util.FormattingUtils.formatToPercentWithSymbol;
import static bisq.core.util.VolumeUtil.formatVolume; import static bisq.core.util.VolumeUtil.formatVolume;
import static bisq.core.util.VolumeUtil.formatVolumeWithCode; import static bisq.core.util.VolumeUtil.formatVolumeWithCode;
@ -142,11 +142,9 @@ public class ClosedTradableFormatter {
} }
public String getPriceDeviationAsString(Tradable tradable) { public String getPriceDeviationAsString(Tradable tradable) {
if (tradable.getOffer().isUseMarketBasedPrice()) { return PriceUtil.offerPercentageToDeviation(tradable.getOffer())
return formatPercentagePrice(tradable.getOffer().getMarketPriceMargin()); .map(FormattingUtils::formatPercentagePrice)
} else { .orElse(Res.get("shared.na"));
return Res.get("shared.na");
}
} }
public String getVolumeAsString(Tradable tradable, boolean appendCode) { public String getVolumeAsString(Tradable tradable, boolean appendCode) {

9
core/src/main/java/bisq/core/util/PriceUtil.java
View File

@ -129,6 +129,15 @@ public class PriceUtil {
return bsq30DayAveragePrice; return bsq30DayAveragePrice;
} }
public static Optional<Double> offerPercentageToDeviation(Offer offer) {
if (offer.isUseMarketBasedPrice()) {
return Optional.of(offer.getDirection() == OfferDirection.SELL ?
offer.getMarketPriceMargin() : -offer.getMarketPriceMargin());
} else {
return Optional.empty();
}
}
public boolean hasMarketPrice(Offer offer) { public boolean hasMarketPrice(Offer offer) {
String currencyCode = offer.getCurrencyCode(); String currencyCode = offer.getCurrencyCode();
checkNotNull(priceFeedService, "priceFeed must not be null"); checkNotNull(priceFeedService, "priceFeed must not be null");

4
desktop/src/main/java/bisq/desktop/main/portfolio/openoffer/OpenOfferListItem.java
View File

@ -85,12 +85,12 @@ class OpenOfferListItem implements FilterableListItem {
public Double getPriceDeviationAsDouble() { public Double getPriceDeviationAsDouble() {
Offer offer = getOffer(); Offer offer = getOffer();
return priceUtil.getMarketBasedPrice(offer, offer.getMirroredDirection()).orElse(0d); return PriceUtil.offerPercentageToDeviation(offer).orElse(0d);
} }
public String getPriceDeviationAsString() { public String getPriceDeviationAsString() {
Offer offer = getOffer(); Offer offer = getOffer();
return priceUtil.getMarketBasedPrice(offer, offer.getMirroredDirection()) return PriceUtil.offerPercentageToDeviation(offer)
.map(FormattingUtils::formatPercentagePrice) .map(FormattingUtils::formatPercentagePrice)
.orElse(""); .orElse("");
} }