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

…redundancy Only show rounding popup once during activation
bisq-network · Apr 16, 2019 · 536ef67 · 536ef67
2 parents ddeb1b4 + c972dfe
commit 536ef67
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 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
@@ -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
@@ -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
     ///////////////////////////////////////////////////////////////////////////////////////////