From c972dfe668ebfc1b33f7b1ff8ff9879f7c52d5d1 Mon Sep 17 00:00:00 2001 From: Christoph Atteneder Date: Tue, 16 Apr 2019 15:01:14 +0200 Subject: [PATCH] Only show rounding popup once during activation and not show it in edit offer screen. Fixes #2708. --- .../main/java/bisq/desktop/main/offer/MutableOfferView.java | 4 +--- .../bisq/desktop/main/portfolio/editoffer/EditOfferView.java | 5 +++++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/desktop/src/main/java/bisq/desktop/main/offer/MutableOfferView.java b/desktop/src/main/java/bisq/desktop/main/offer/MutableOfferView.java index 06fa032ad29..75770ae7bdd 100644 --- a/desktop/src/main/java/bisq/desktop/main/offer/MutableOfferView.java +++ b/desktop/src/main/java/bisq/desktop/main/offer/MutableOfferView.java @@ -250,8 +250,6 @@ protected void doActivate() { balanceTextField.setTargetAmount(model.getDataModel().totalToPayAsCoinProperty().get()); updatePriceToggle(); - showFiatRoundingInfoPopup(); - boolean currencyForMakerFeeBtc = model.getDataModel().isCurrencyForMakerFeeBtc(); tradeFeeInBtcToggle.setSelected(currencyForMakerFeeBtc); tradeFeeInBsqToggle.setSelected(!currencyForMakerFeeBtc); @@ -346,7 +344,7 @@ public void setCloseHandler(OfferView.CloseHandler closeHandler) { // 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())) diff --git a/desktop/src/main/java/bisq/desktop/main/portfolio/editoffer/EditOfferView.java b/desktop/src/main/java/bisq/desktop/main/portfolio/editoffer/EditOfferView.java index 4b1a8729af2..e0729daab38 100644 --- a/desktop/src/main/java/bisq/desktop/main/portfolio/editoffer/EditOfferView.java +++ b/desktop/src/main/java/bisq/desktop/main/portfolio/editoffer/EditOfferView.java @@ -130,6 +130,11 @@ protected void deactivate() { removeBindings(); } + @Override + protected void showFiatRoundingInfoPopup() { + // don't show it again as it was already shown when creating the offer in the first place + } + /////////////////////////////////////////////////////////////////////////////////////////// // API ///////////////////////////////////////////////////////////////////////////////////////////