From 8a3abcca43ba1d4c6797ca80255a052a12c4ad13 Mon Sep 17 00:00:00 2001
From: ivkovnikola <ivkovnikola@gmail.com>
Date: Fri, 27 Oct 2017 20:23:57 +0200
Subject: [PATCH] Merge request for INXT

---
 .../java/io/bisq/common/locale/CurrencyUtil.java |  1 +
 .../util/validation/AltCoinAddressValidator.java |  5 +++++
 .../validation/AltCoinAddressValidatorTest.java  | 16 ++++++++++++++++
 3 files changed, 22 insertions(+)

diff --git a/common/src/main/java/io/bisq/common/locale/CurrencyUtil.java b/common/src/main/java/io/bisq/common/locale/CurrencyUtil.java
index b37f9e0fa2..2a39649272 100644
--- a/common/src/main/java/io/bisq/common/locale/CurrencyUtil.java
+++ b/common/src/main/java/io/bisq/common/locale/CurrencyUtil.java
@@ -137,6 +137,7 @@ public class CurrencyUtil {
         result.add(new CryptoCurrency("XZC", "Zcoin"));
         result.add(new CryptoCurrency("ZEC", "Zcash"));
         result.add(new CryptoCurrency("ZEN", "ZenCash"));
+        result.add(new CryptoCurrency("INXT", "Internext", true));
 
         result.sort(TradeCurrency::compareTo);
 
diff --git a/gui/src/main/java/io/bisq/gui/util/validation/AltCoinAddressValidator.java b/gui/src/main/java/io/bisq/gui/util/validation/AltCoinAddressValidator.java
index 468c9ff65f..1db70a0322 100644
--- a/gui/src/main/java/io/bisq/gui/util/validation/AltCoinAddressValidator.java
+++ b/gui/src/main/java/io/bisq/gui/util/validation/AltCoinAddressValidator.java
@@ -349,6 +349,11 @@ public final class AltCoinAddressValidator extends InputValidator {
                         return new ValidationResult(false, getErrorMessage(e));
                     }
                     return new ValidationResult(true);
+                case "INXT": 
+                    if (!input.matches("^(0x)?[0-9a-fA-F]{40}$"))
+                        return regexTestFailed;
+                    else
+                        return new ValidationResult(true);
                 default:
                     log.debug("Validation for AltCoinAddress not implemented yet. currencyCode: " + currencyCode);
                     return validationResult;
diff --git a/gui/src/test/java/io/bisq/gui/util/validation/AltCoinAddressValidatorTest.java b/gui/src/test/java/io/bisq/gui/util/validation/AltCoinAddressValidatorTest.java
index a9574f3296..a9d90ec2a4 100644
--- a/gui/src/test/java/io/bisq/gui/util/validation/AltCoinAddressValidatorTest.java
+++ b/gui/src/test/java/io/bisq/gui/util/validation/AltCoinAddressValidatorTest.java
@@ -254,4 +254,20 @@ public class AltCoinAddressValidatorTest {
         assertFalse(validator.validate("1asdasd").isValid);
         assertFalse(validator.validate("asdasd").isValid);
     }
+
+
+    @Test
+    public void testINXT() {
+        AltCoinAddressValidator validator = new AltCoinAddressValidator();
+        validator.setCurrencyCode("INXT");
+
+        assertTrue(validator.validate("0x2a65Aca4D5fC5B5C859090a6c34d164135398226").isValid);
+        assertTrue(validator.validate("2a65Aca4D5fC5B5C859090a6c34d164135398226").isValid);
+
+        assertFalse(validator.validate("0x2a65Aca4D5fC5B5C859090a6c34d1641353982266").isValid);
+        assertFalse(validator.validate("0x2a65Aca4D5fC5B5C859090a6c34d16413539822g").isValid);
+        assertFalse(validator.validate("2a65Aca4D5fC5B5C859090a6c34d16413539822g").isValid);
+        assertFalse(validator.validate("").isValid);
+    }
+
 }