Merge pull request #2725 from ripcurlx/remove-rounding-popup-showing-redundancy

Only show rounding popup once during activation
This commit is contained in:
Manfred Karrer 2019-04-16 08:49:43 -05:00 committed by GitHub
commit 536ef67be0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 3 deletions

View file

@ -250,8 +250,6 @@ public abstract class MutableOfferView<M extends MutableOfferViewModel> extends
balanceTextField.setTargetAmount(model.getDataModel().totalToPayAsCoinProperty().get());
updatePriceToggle();
showFiatRoundingInfoPopup();
boolean currencyForMakerFeeBtc = model.getDataModel().isCurrencyForMakerFeeBtc();
tradeFeeInBtcToggle.setSelected(currencyForMakerFeeBtc);
tradeFeeInBsqToggle.setSelected(!currencyForMakerFeeBtc);
@ -346,7 +344,7 @@ public abstract class MutableOfferView<M extends MutableOfferViewModel> extends
// UI actions
///////////////////////////////////////////////////////////////////////////////////////////
private void showFiatRoundingInfoPopup() {
protected void showFiatRoundingInfoPopup() {
if (CurrencyUtil.isFiatCurrency(model.tradeCurrencyCode.get()) && !DevEnv.isDevMode()) {
new Popup<>().headLine(Res.get("popup.roundedFiatValues.headline"))
.information(Res.get("popup.roundedFiatValues.msg", model.tradeCurrencyCode.get()))

View file

@ -130,6 +130,11 @@ public class EditOfferView extends MutableOfferView<EditOfferViewModel> {
removeBindings();
}
@Override
protected void showFiatRoundingInfoPopup() {
// don't show it again as it was already shown when creating the offer in the first place
}
///////////////////////////////////////////////////////////////////////////////////////////
// API
///////////////////////////////////////////////////////////////////////////////////////////