Merge pull request #1629 from ripcurlx/add-new-feature-popup-for-roun…

…ded-fiat-values Add rounded fiat value info popup
bisq-network · Aug 16, 2018 · 63acd56 · 63acd56
2 parents 45a9019 + e0bd79f
commit 63acd56
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 9 deletions.
diff --git a/src/main/java/bisq/desktop/main/offer/MutableOfferView.java b/src/main/java/bisq/desktop/main/offer/MutableOfferView.java
@@ -723,6 +723,10 @@ private void createListeners() {
         volumeListener = (observable, oldValue, newValue) -> {
           if (!newValue.equals("") && CurrencyUtil.isFiatCurrency(model.tradeCurrencyCode.get())) {
               volumeInfoInputTextField.setContentForPrivacyPopOver(createPopoverLabel(Res.get("offerbook.info.roundedFiatVolume")));
+              new Popup<>().headLine(Res.get("popup.roundedFiatValues.headline"))
+                  .information(Res.get("popup.roundedFiatValues.msg", model.tradeCurrencyCode.get()))
+                  .dontShowAgainId("FiatValuesRoundedWarning")
+                  .show();
           }
         };
 

diff --git a/src/main/java/bisq/desktop/main/offer/takeoffer/TakeOfferView.java b/src/main/java/bisq/desktop/main/offer/takeoffer/TakeOfferView.java
@@ -145,7 +145,6 @@ public class TakeOfferView extends ActivatableViewAndModel<AnchorPane, TakeOffer
     private BusyAnimation waitingForFundsBusyAnimation, offerAvailabilityBusyAnimation;
     private Notification walletFundedNotification;
     private OfferView.CloseHandler closeHandler;
-    private ChangeListener<Boolean> amountFocusedListener;
     private Subscription cancelButton2StyleSubscription, balanceSubscription,
             showTransactionPublishedScreenSubscription, showWarningInvalidBtcDecimalPlacesSubscription,
             isWaitingForFundsSubscription, offerWarningSubscription, errorMessageSubscription,
@@ -154,7 +153,7 @@ public class TakeOfferView extends ActivatableViewAndModel<AnchorPane, TakeOffer
     private int gridRow = 0;
     private boolean offerDetailsWindowDisplayed, clearXchangeWarningDisplayed;
     private SimpleBooleanProperty errorPopupDisplayed;
-    private ChangeListener<Boolean> getShowWalletFundedNotificationListener;
+    private ChangeListener<Boolean> amountFocusedListener, getShowWalletFundedNotificationListener;
     private InfoTextField volumeInfoTextField;
 
     ///////////////////////////////////////////////////////////////////////////////////////////
@@ -212,8 +211,7 @@ protected void initialize() {
     protected void activate() {
         addBindings();
         addSubscriptions();
-
-        amountTextField.focusedProperty().addListener(amountFocusedListener);
+        addListeners();
 
         if (offerAvailabilityBusyAnimation != null && !model.showPayFundsScreenDisplayed.get()) {
             offerAvailabilityBusyAnimation.play();
@@ -253,23 +251,25 @@ protected void activate() {
             showNextStepAfterAmountIsSet();
         }
 
-        // notifications
-        model.dataModel.getShowWalletFundedNotification().addListener(getShowWalletFundedNotificationListener);
+        if (CurrencyUtil.isFiatCurrency(model.getOffer().getCurrencyCode())) {
+            new Popup<>().headLine(Res.get("popup.roundedFiatValues.headline"))
+                    .information(Res.get("popup.roundedFiatValues.msg", model.getOffer().getCurrencyCode()))
+                    .dontShowAgainId("FiatValuesRoundedWarning")
+                    .show();
+        }
     }
 
     @Override
     protected void deactivate() {
         removeBindings();
         removeSubscriptions();
-        amountTextField.focusedProperty().removeListener(amountFocusedListener);
+        removeListeners();
 
         if (offerAvailabilityBusyAnimation != null)
             offerAvailabilityBusyAnimation.stop();
 
         if (waitingForFundsBusyAnimation != null)
             waitingForFundsBusyAnimation.stop();
-
-        model.dataModel.getShowWalletFundedNotification().removeListener(getShowWalletFundedNotificationListener);
     }
 
     ///////////////////////////////////////////////////////////////////////////////////////////
@@ -664,6 +664,15 @@ private void removeSubscriptions() {
         cancelButton2StyleSubscription.unsubscribe();
     }
 
+    private void addListeners() {
+        amountTextField.focusedProperty().addListener(amountFocusedListener);
+        model.dataModel.getShowWalletFundedNotification().addListener(getShowWalletFundedNotificationListener);
+    }
+
+    private void removeListeners() {
+        amountTextField.focusedProperty().removeListener(amountFocusedListener);
+        model.dataModel.getShowWalletFundedNotification().removeListener(getShowWalletFundedNotificationListener);
+    }
 
     ///////////////////////////////////////////////////////////////////////////////////////////
     // Build UI elements