From 36bd41210502f8a843eba8d269bce095661f59a9 Mon Sep 17 00:00:00 2001
From: Manfred Karrer <mk@nucleo.io>
Date: Sat, 20 Aug 2016 10:48:03 +0200
Subject: [PATCH] Rename parseToFiatWith2Decimals to parseToFiatWithPrecision

---
 .../main/offer/createoffer/CreateOfferViewModel.java | 12 +++++++++---
 .../main/java/io/bitsquare/gui/util/BSFormatter.java |  4 ++--
 .../java/io/bitsquare/gui/util/BSFormatterTest.java  | 12 ++++++------
 3 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferViewModel.java b/gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferViewModel.java
index a653ec603f..d4daf9b033 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferViewModel.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferViewModel.java
@@ -36,6 +36,7 @@ import io.bitsquare.gui.util.validation.BtcValidator;
 import io.bitsquare.gui.util.validation.FiatValidator;
 import io.bitsquare.gui.util.validation.InputValidator;
 import io.bitsquare.locale.BSResources;
+import io.bitsquare.locale.CurrencyUtil;
 import io.bitsquare.locale.TradeCurrency;
 import io.bitsquare.p2p.P2PService;
 import io.bitsquare.payment.PaymentAccount;
@@ -567,7 +568,7 @@ class CreateOfferViewModel extends ActivatableWithDataModel<CreateOfferDataModel
 
                 // must be placed after calculateAmount (btc value has been adjusted in case the calculation leads to
                 // invalid decimal places for the amount value
-                showWarningAdjustedVolume.set(!formatter.formatFiat(formatter.parseToFiatWith2Decimals(userInput, dataModel.tradeCurrencyCode.get()))
+                showWarningAdjustedVolume.set(!formatter.formatFiat(formatter.parseToFiatWithPrecision(userInput, dataModel.tradeCurrencyCode.get()))
                         .equals(volume
                                 .get()));
             }
@@ -718,11 +719,11 @@ class CreateOfferViewModel extends ActivatableWithDataModel<CreateOfferDataModel
     }
 
     private void setPriceToModel() {
-        dataModel.priceAsFiat.set(formatter.parseToFiatWith2Decimals(price.get(), dataModel.tradeCurrencyCode.get()));
+        dataModel.priceAsFiat.set(formatter.parseToFiatWithPrecision(price.get(), dataModel.tradeCurrencyCode.get()));
     }
 
     private void setVolumeToModel() {
-        dataModel.volumeAsFiat.set(formatter.parseToFiatWith2Decimals(volume.get(), dataModel.tradeCurrencyCode.get()));
+        dataModel.volumeAsFiat.set(formatter.parseToFiatWithPrecision(volume.get(), dataModel.tradeCurrencyCode.get()));
     }
 
     private InputValidator.ValidationResult isBtcInputValid(String input) {
@@ -730,6 +731,11 @@ class CreateOfferViewModel extends ActivatableWithDataModel<CreateOfferDataModel
     }
 
     private InputValidator.ValidationResult isFiatInputValid(String input) {
+        if (CurrencyUtil.isCryptoCurrency(getTradeCurrency().getCode()))
+            fiatValidator.setMinValue(FiatValidator.MIN_ALTCOIN_VALUE);
+        else
+            fiatValidator.setMinValue(FiatValidator.MIN_FIAT_VALUE);
+
         return fiatValidator.validate(input);
     }
 
diff --git a/gui/src/main/java/io/bitsquare/gui/util/BSFormatter.java b/gui/src/main/java/io/bitsquare/gui/util/BSFormatter.java
index 0d7b1b3128..304d1840ac 100644
--- a/gui/src/main/java/io/bitsquare/gui/util/BSFormatter.java
+++ b/gui/src/main/java/io/bitsquare/gui/util/BSFormatter.java
@@ -240,7 +240,7 @@ public class BSFormatter {
      * @return
      */
 
-    public Fiat parseToFiatWith2Decimals(String input, String currencyCode) {
+    public Fiat parseToFiatWithPrecision(String input, String currencyCode) {
         if (input != null && input.length() > 0) {
             try {
                 return parseToFiat(new BigDecimal(cleanInput(input)).setScale(2, BigDecimal.ROUND_HALF_UP).toString(), currencyCode);
@@ -254,7 +254,7 @@ public class BSFormatter {
     }
 
     public boolean hasFiatValidDecimals(String input, String currencyCode) {
-        return parseToFiat(input, currencyCode).equals(parseToFiatWith2Decimals(input, currencyCode));
+        return parseToFiat(input, currencyCode).equals(parseToFiatWithPrecision(input, currencyCode));
     }
 
 
diff --git a/gui/src/test/java/io/bitsquare/gui/util/BSFormatterTest.java b/gui/src/test/java/io/bitsquare/gui/util/BSFormatterTest.java
index 6953fe48c1..f3ec8a1ddb 100644
--- a/gui/src/test/java/io/bitsquare/gui/util/BSFormatterTest.java
+++ b/gui/src/test/java/io/bitsquare/gui/util/BSFormatterTest.java
@@ -159,12 +159,12 @@ public class BSFormatterTest {
         BSFormatter formatter = new BSFormatter();
         formatter.useMilliBitFormat(false);
         formatter.setLocale(Locale.GERMAN);
-        assertEquals("0", formatter.parseToFiatWith2Decimals("0", "EUR").toPlainString());
-        assertEquals("0", formatter.parseToFiatWith2Decimals(null, "EUR").toPlainString());
-        assertEquals("0", formatter.parseToFiatWith2Decimals("s", "EUR").toPlainString());
-        assertEquals("0.12", formatter.parseToFiatWith2Decimals("0.123", "EUR").toPlainString());
-        assertEquals("0.13", formatter.parseToFiatWith2Decimals("0.125", "EUR").toPlainString());
-        assertEquals("0.13", formatter.parseToFiatWith2Decimals("0,125", "EUR").toPlainString());
+        assertEquals("0", formatter.parseToFiatWithPrecision("0", "EUR").toPlainString());
+        assertEquals("0", formatter.parseToFiatWithPrecision(null, "EUR").toPlainString());
+        assertEquals("0", formatter.parseToFiatWithPrecision("s", "EUR").toPlainString());
+        assertEquals("0.12", formatter.parseToFiatWithPrecision("0.123", "EUR").toPlainString());
+        assertEquals("0.13", formatter.parseToFiatWithPrecision("0.125", "EUR").toPlainString());
+        assertEquals("0.13", formatter.parseToFiatWithPrecision("0,125", "EUR").toPlainString());
     }
 
     @Test