fix account limits displayed in payment account form

This commit is contained in:
woodser 2023-05-24 10:01:24 -04:00
parent 79247e87fa
commit 55edf10635

View File

@ -31,6 +31,7 @@ import haveno.core.offer.OfferDirection;
import haveno.core.payment.AssetAccount; import haveno.core.payment.AssetAccount;
import haveno.core.payment.PaymentAccount; import haveno.core.payment.PaymentAccount;
import haveno.core.payment.payload.PaymentMethod; import haveno.core.payment.payload.PaymentMethod;
import haveno.core.trade.HavenoUtils;
import haveno.core.util.coin.CoinFormatter; import haveno.core.util.coin.CoinFormatter;
import haveno.core.util.validation.InputValidator; import haveno.core.util.validation.InputValidator;
import haveno.desktop.components.AutoTooltipCheckBox; import haveno.desktop.components.AutoTooltipCheckBox;
@ -56,7 +57,6 @@ import javafx.scene.layout.VBox;
import javafx.util.StringConverter; import javafx.util.StringConverter;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.bitcoinj.core.Coin;
import java.util.Date; import java.util.Date;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
@ -183,15 +183,15 @@ public abstract class PaymentMethodForm {
final String limitationsText = paymentAccount instanceof AssetAccount ? final String limitationsText = paymentAccount instanceof AssetAccount ?
Res.get("payment.maxPeriodAndLimitCrypto", Res.get("payment.maxPeriodAndLimitCrypto",
getTimeText(hours), getTimeText(hours),
formatter.formatCoinWithCode(Coin.valueOf(accountAgeWitnessService.getMyTradeLimit( HavenoUtils.formatXmr(accountAgeWitnessService.getMyTradeLimit(
paymentAccount, tradeCurrency.getCode(), OfferDirection.BUY)))) paymentAccount, tradeCurrency.getCode(), OfferDirection.BUY), true))
: :
Res.get("payment.maxPeriodAndLimit", Res.get("payment.maxPeriodAndLimit",
getTimeText(hours), getTimeText(hours),
formatter.formatCoinWithCode(Coin.valueOf(accountAgeWitnessService.getMyTradeLimit( HavenoUtils.formatXmr(accountAgeWitnessService.getMyTradeLimit(
paymentAccount, tradeCurrency.getCode(), OfferDirection.BUY))), paymentAccount, tradeCurrency.getCode(), OfferDirection.BUY), true),
formatter.formatCoinWithCode(Coin.valueOf(accountAgeWitnessService.getMyTradeLimit( HavenoUtils.formatXmr(accountAgeWitnessService.getMyTradeLimit(
paymentAccount, tradeCurrency.getCode(), OfferDirection.SELL))), paymentAccount, tradeCurrency.getCode(), OfferDirection.SELL), true),
DisplayUtils.formatAccountAge(accountAge)); DisplayUtils.formatAccountAge(accountAge));
return limitationsText; return limitationsText;
} }