From 9a3ed33238a689a3c05d98597c2bf635a26c5d86 Mon Sep 17 00:00:00 2001 From: Christoph Atteneder Date: Mon, 11 Apr 2022 12:31:54 +0200 Subject: [PATCH] Use Offer.isFiat helper method --- core/src/main/java/bisq/core/offer/Offer.java | 2 +- .../src/main/java/bisq/core/offer/OfferFilterService.java | 5 ++--- .../main/java/bisq/core/offer/bisq_v1/TakeOfferModel.java | 3 +-- .../main/java/bisq/core/trade/model/bisq_v1/Trade.java | 3 +-- .../java/bisq/desktop/components/PeerInfoIconTrading.java | 3 +-- .../main/market/offerbook/OfferBookChartViewModel.java | 4 ++-- .../main/offer/bisq_v1/takeoffer/TakeOfferDataModel.java | 2 +- .../main/offer/bisq_v1/takeoffer/TakeOfferView.java | 4 ++-- .../main/offer/bisq_v1/takeoffer/TakeOfferViewModel.java | 5 ++--- .../main/offer/offerbook/BtcOfferBookViewModel.java | 2 +- .../bisq/desktop/main/offer/offerbook/OfferBookView.java | 2 +- .../desktop/main/offer/offerbook/OfferBookViewModel.java | 2 +- .../desktop/main/overlays/windows/OfferDetailsWindow.java | 8 ++++---- .../desktop/main/overlays/windows/TradeDetailsWindow.java | 3 +-- 14 files changed, 21 insertions(+), 27 deletions(-) diff --git a/core/src/main/java/bisq/core/offer/Offer.java b/core/src/main/java/bisq/core/offer/Offer.java index 37cece1772..57136ad692 100644 --- a/core/src/main/java/bisq/core/offer/Offer.java +++ b/core/src/main/java/bisq/core/offer/Offer.java @@ -269,7 +269,7 @@ public class Offer implements NetworkPayload, PersistablePayload { Volume volumeByAmount = price.getVolumeByAmount(amount); if (offerPayloadBase.getPaymentMethodId().equals(PaymentMethod.HAL_CASH_ID)) volumeByAmount = VolumeUtil.getAdjustedVolumeForHalCash(volumeByAmount); - else if (CurrencyUtil.isFiatCurrency(offerPayloadBase.getCurrencyCode())) + else if (isFiatOffer()) volumeByAmount = VolumeUtil.getRoundedFiatVolume(volumeByAmount); return volumeByAmount; diff --git a/core/src/main/java/bisq/core/offer/OfferFilterService.java b/core/src/main/java/bisq/core/offer/OfferFilterService.java index 7a18db1f96..62268c7dce 100644 --- a/core/src/main/java/bisq/core/offer/OfferFilterService.java +++ b/core/src/main/java/bisq/core/offer/OfferFilterService.java @@ -19,7 +19,6 @@ package bisq.core.offer; import bisq.core.account.witness.AccountAgeWitnessService; import bisq.core.filter.FilterManager; -import bisq.core.locale.CurrencyUtil; import bisq.core.payment.PaymentAccount; import bisq.core.payment.PaymentAccountUtil; import bisq.core.user.Preferences; @@ -178,7 +177,7 @@ public class OfferFilterService { return insufficientCounterpartyTradeLimitCache.get(offerId); } - boolean result = CurrencyUtil.isFiatCurrency(offer.getCurrencyCode()) && + boolean result = offer.isFiatOffer() && !accountAgeWitnessService.verifyPeersTradeAmount(offer, offer.getAmount(), errorMessage -> { }); @@ -205,7 +204,7 @@ public class OfferFilterService { accountOptional.isPresent() ? accountOptional.get().getAccountName() : "null", Coin.valueOf(myTradeLimit).toFriendlyString(), Coin.valueOf(offerMinAmount).toFriendlyString()); - boolean result = CurrencyUtil.isFiatCurrency(offer.getCurrencyCode()) && + boolean result = offer.isFiatOffer() && accountOptional.isPresent() && myTradeLimit < offerMinAmount; myInsufficientTradeLimitCache.put(offerId, result); diff --git a/core/src/main/java/bisq/core/offer/bisq_v1/TakeOfferModel.java b/core/src/main/java/bisq/core/offer/bisq_v1/TakeOfferModel.java index 447d1d7076..c6d69a47a1 100644 --- a/core/src/main/java/bisq/core/offer/bisq_v1/TakeOfferModel.java +++ b/core/src/main/java/bisq/core/offer/bisq_v1/TakeOfferModel.java @@ -20,7 +20,6 @@ package bisq.core.offer.bisq_v1; import bisq.core.account.witness.AccountAgeWitnessService; import bisq.core.btc.model.AddressEntry; import bisq.core.btc.wallet.BtcWalletService; -import bisq.core.locale.CurrencyUtil; import bisq.core.monetary.Price; import bisq.core.monetary.Volume; import bisq.core.offer.Offer; @@ -196,7 +195,7 @@ public class TakeOfferModel implements Model { if (offer.getPaymentMethod().getId().equals(PaymentMethod.HAL_CASH_ID)) volumeByAmount = getAdjustedVolumeForHalCash(volumeByAmount); - else if (CurrencyUtil.isFiatCurrency(offer.getCurrencyCode())) + else if (offer.isFiatOffer()) volumeByAmount = getRoundedFiatVolume(volumeByAmount); volume = volumeByAmount; diff --git a/core/src/main/java/bisq/core/trade/model/bisq_v1/Trade.java b/core/src/main/java/bisq/core/trade/model/bisq_v1/Trade.java index 5a37ce1c01..b5ad48d1fc 100644 --- a/core/src/main/java/bisq/core/trade/model/bisq_v1/Trade.java +++ b/core/src/main/java/bisq/core/trade/model/bisq_v1/Trade.java @@ -18,7 +18,6 @@ package bisq.core.trade.model.bisq_v1; import bisq.core.btc.wallet.BtcWalletService; -import bisq.core.locale.CurrencyUtil; import bisq.core.monetary.Price; import bisq.core.monetary.Volume; import bisq.core.offer.Offer; @@ -776,7 +775,7 @@ public abstract class Trade extends TradeModel { if (offer != null) { if (offer.getPaymentMethod().getId().equals(PaymentMethod.HAL_CASH_ID)) volumeByAmount = VolumeUtil.getAdjustedVolumeForHalCash(volumeByAmount); - else if (CurrencyUtil.isFiatCurrency(offer.getCurrencyCode())) + else if (offer.isFiatOffer()) volumeByAmount = VolumeUtil.getRoundedFiatVolume(volumeByAmount); } return volumeByAmount; diff --git a/desktop/src/main/java/bisq/desktop/components/PeerInfoIconTrading.java b/desktop/src/main/java/bisq/desktop/components/PeerInfoIconTrading.java index 43a2c559e2..a8d079c4f3 100644 --- a/desktop/src/main/java/bisq/desktop/components/PeerInfoIconTrading.java +++ b/desktop/src/main/java/bisq/desktop/components/PeerInfoIconTrading.java @@ -19,7 +19,6 @@ package bisq.desktop.components; import bisq.core.account.witness.AccountAgeWitnessService; import bisq.core.alert.PrivateNotificationManager; -import bisq.core.locale.CurrencyUtil; import bisq.core.locale.Res; import bisq.core.offer.Offer; import bisq.core.payment.payload.PaymentMethod; @@ -107,7 +106,7 @@ public class PeerInfoIconTrading extends PeerInfoIcon { offer = tradeModel.getOffer(); } checkNotNull(offer, "Offer must not be null"); - isFiatCurrency = CurrencyUtil.isFiatCurrency(offer.getCurrencyCode()); + isFiatCurrency = offer.isFiatOffer(); initialize(role, offer, tradeModel, privateNotificationManager, useDevPrivilegeKeys); } diff --git a/desktop/src/main/java/bisq/desktop/main/market/offerbook/OfferBookChartViewModel.java b/desktop/src/main/java/bisq/desktop/main/market/offerbook/OfferBookChartViewModel.java index e3a17e23d6..bd9b66fd1d 100644 --- a/desktop/src/main/java/bisq/desktop/main/market/offerbook/OfferBookChartViewModel.java +++ b/desktop/src/main/java/bisq/desktop/main/market/offerbook/OfferBookChartViewModel.java @@ -253,13 +253,13 @@ class OfferBookChartViewModel extends ActivatableViewModel { } public int getMaxNumberOfPriceZeroDecimalsToColorize(Offer offer) { - return CurrencyUtil.isFiatCurrency(offer.getCurrencyCode()) + return offer.isFiatOffer() ? GUIUtil.FIAT_DECIMALS_WITH_ZEROS : GUIUtil.ALTCOINS_DECIMALS_WITH_ZEROS; } public int getZeroDecimalsForPrice(Offer offer) { - return CurrencyUtil.isFiatCurrency(offer.getCurrencyCode()) + return offer.isFiatOffer() ? GUIUtil.FIAT_PRICE_DECIMALS_WITH_ZEROS : GUIUtil.ALTCOINS_DECIMALS_WITH_ZEROS; } diff --git a/desktop/src/main/java/bisq/desktop/main/offer/bisq_v1/takeoffer/TakeOfferDataModel.java b/desktop/src/main/java/bisq/desktop/main/offer/bisq_v1/takeoffer/TakeOfferDataModel.java index 26171216a1..67c8124416 100644 --- a/desktop/src/main/java/bisq/desktop/main/offer/bisq_v1/takeoffer/TakeOfferDataModel.java +++ b/desktop/src/main/java/bisq/desktop/main/offer/bisq_v1/takeoffer/TakeOfferDataModel.java @@ -492,7 +492,7 @@ class TakeOfferDataModel extends OfferDataModel { Volume volumeByAmount = tradePrice.getVolumeByAmount(amount.get()); if (offer.getPaymentMethod().getId().equals(PaymentMethod.HAL_CASH_ID)) volumeByAmount = VolumeUtil.getAdjustedVolumeForHalCash(volumeByAmount); - else if (CurrencyUtil.isFiatCurrency(getCurrencyCode())) + else if (offer.isFiatOffer()) volumeByAmount = VolumeUtil.getRoundedFiatVolume(volumeByAmount); volume.set(volumeByAmount); diff --git a/desktop/src/main/java/bisq/desktop/main/offer/bisq_v1/takeoffer/TakeOfferView.java b/desktop/src/main/java/bisq/desktop/main/offer/bisq_v1/takeoffer/TakeOfferView.java index ec7fe475a9..fab3f1a9bf 100644 --- a/desktop/src/main/java/bisq/desktop/main/offer/bisq_v1/takeoffer/TakeOfferView.java +++ b/desktop/src/main/java/bisq/desktop/main/offer/bisq_v1/takeoffer/TakeOfferView.java @@ -406,7 +406,7 @@ public class TakeOfferView extends ActivatableViewAndModel im maxTradeLimit); dataModel.applyAmount(adjustedAmountForHalCash); amount.set(btcFormatter.formatCoin(dataModel.getAmount().get())); - } else if (CurrencyUtil.isFiatCurrency(dataModel.getCurrencyCode())) { + } else if (dataModel.getOffer().isFiatOffer()) { if (!isAmountEqualMinAmount(dataModel.getAmount().get()) && (!isAmountEqualMaxAmount(dataModel.getAmount().get()))) { // We only apply the rounding if the amount is variable (minAmount is lower as amount). // Otherwise we could get an amount lower then the minAmount set by rounding @@ -624,7 +623,7 @@ class TakeOfferViewModel extends ActivatableWithDataModel im if (price != null) { if (dataModel.isUsingHalCashAccount()) { amount = CoinUtil.getAdjustedAmountForHalCash(amount, price, maxTradeLimit); - } else if (CurrencyUtil.isFiatCurrency(dataModel.getCurrencyCode()) + } else if (dataModel.getOffer().isFiatOffer() && !isAmountEqualMinAmount(amount) && !isAmountEqualMaxAmount(amount)) { // We only apply the rounding if the amount is variable (minAmount is lower as amount). // Otherwise we could get an amount lower then the minAmount set by rounding diff --git a/desktop/src/main/java/bisq/desktop/main/offer/offerbook/BtcOfferBookViewModel.java b/desktop/src/main/java/bisq/desktop/main/offer/offerbook/BtcOfferBookViewModel.java index 1e18554272..bbfeecaceb 100644 --- a/desktop/src/main/java/bisq/desktop/main/offer/offerbook/BtcOfferBookViewModel.java +++ b/desktop/src/main/java/bisq/desktop/main/offer/offerbook/BtcOfferBookViewModel.java @@ -120,7 +120,7 @@ public class BtcOfferBookViewModel extends OfferBookViewModel { return offerBookListItem -> { Offer offer = offerBookListItem.getOffer(); boolean directionResult = offer.getDirection() != direction; - boolean currencyResult = (showAllTradeCurrenciesProperty.get() && CurrencyUtil.isFiatCurrency(offer.getCurrencyCode())) || + boolean currencyResult = (showAllTradeCurrenciesProperty.get() && offer.isFiatOffer()) || offer.getCurrencyCode().equals(selectedTradeCurrency.getCode()); boolean paymentMethodResult = showAllPaymentMethods || offer.getPaymentMethod().equals(selectedPaymentMethod); diff --git a/desktop/src/main/java/bisq/desktop/main/offer/offerbook/OfferBookView.java b/desktop/src/main/java/bisq/desktop/main/offer/offerbook/OfferBookView.java index baa1df48bc..7c51cd125f 100644 --- a/desktop/src/main/java/bisq/desktop/main/offer/offerbook/OfferBookView.java +++ b/desktop/src/main/java/bisq/desktop/main/offer/offerbook/OfferBookView.java @@ -774,7 +774,7 @@ abstract public class OfferBookView { boolean isBuyerRole = isPlaceOffer == isBuyOffer; String tradeCurrencyByCode = offer.getCurrencyCode(); String placeOfferButtonText = isBuyerRole ? - CurrencyUtil.isFiatCurrency(offer.getCurrencyCode()) ? + offer.isFiatOffer() ? Res.get("offerDetailsWindow.confirm.maker", Res.get("shared.buy")) : Res.get("offerDetailsWindow.confirm.makerAltcoin", Res.get("shared.buy"), tradeCurrencyByCode) : - CurrencyUtil.isFiatCurrency(offer.getCurrencyCode()) ? + offer.isFiatOffer() ? Res.get("offerDetailsWindow.confirm.maker", Res.get("shared.sell")) : Res.get("offerDetailsWindow.confirm.makerAltcoin", Res.get("shared.sell"), tradeCurrencyByCode); String takeOfferButtonText = isBuyerRole ? - CurrencyUtil.isFiatCurrency(offer.getCurrencyCode()) ? + offer.isFiatOffer() ? Res.get("offerDetailsWindow.confirm.taker", Res.get("shared.buy")) : Res.get("offerDetailsWindow.confirm.takerAltcoin", Res.get("shared.buy"), tradeCurrencyByCode) : - CurrencyUtil.isFiatCurrency(offer.getCurrencyCode()) ? + offer.isFiatOffer() ? Res.get("offerDetailsWindow.confirm.taker", Res.get("shared.sell")) : Res.get("offerDetailsWindow.confirm.takerAltcoin", Res.get("shared.sell"), tradeCurrencyByCode); diff --git a/desktop/src/main/java/bisq/desktop/main/overlays/windows/TradeDetailsWindow.java b/desktop/src/main/java/bisq/desktop/main/overlays/windows/TradeDetailsWindow.java index 5a80df5330..d8b305b6ec 100644 --- a/desktop/src/main/java/bisq/desktop/main/overlays/windows/TradeDetailsWindow.java +++ b/desktop/src/main/java/bisq/desktop/main/overlays/windows/TradeDetailsWindow.java @@ -27,7 +27,6 @@ import bisq.desktop.util.Layout; import bisq.core.account.witness.AccountAgeWitnessService; import bisq.core.btc.wallet.BtcWalletService; -import bisq.core.locale.CurrencyUtil; import bisq.core.locale.Res; import bisq.core.offer.Offer; import bisq.core.payment.payload.PaymentAccountPayload; @@ -340,7 +339,7 @@ public class TradeDetailsWindow extends Overlay { data += "\n\nOther detail data:"; data += "\n\nBuyerMultiSigPubKeyHex: " + Utils.HEX.encode(contract.getBuyerMultiSigPubKey()); data += "\nSellerMultiSigPubKeyHex: " + Utils.HEX.encode(contract.getSellerMultiSigPubKey()); - if (CurrencyUtil.isFiatCurrency(offer.getCurrencyCode())) { + if (offer.isFiatOffer()) { data += "\n\nBuyersAccountAge: " + buyersAccountAge; data += "\nSellersAccountAge: " + sellersAccountAge; }