Merge pull request #6235 from jmacxx/fix_issue_6218

Prevent account creation for banned Revolut GBP sort code 040075
bisq-network · Jun 9, 2022 · 8b2affe · 8b2affe
2 parents 52303ba + 8255031
commit 8b2affe
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/core/src/main/resources/i18n/displayStrings.properties b/core/src/main/resources/i18n/displayStrings.properties
@@ -4250,6 +4250,7 @@ validation.bic.letters=Bank and Country code must be letters
 validation.bic.invalidLocationCode=BIC contains invalid location code
 validation.bic.invalidBranchCode=BIC contains invalid branch code
 validation.bic.sepaRevolutBic=Revolut Sepa accounts are not supported.
+validation.gbp.revolutBranch=Revolut Branch accounts are not supported.
 validation.btc.invalidFormat=Invalid format for a Bitcoin address.
 validation.bsq.invalidFormat=Invalid format for a BSQ address.
 validation.email.invalidAddress=Invalid address

diff --git a/desktop/src/main/java/bisq/desktop/util/validation/BranchIdValidator.java b/desktop/src/main/java/bisq/desktop/util/validation/BranchIdValidator.java
@@ -31,6 +31,9 @@ public ValidationResult validate(String input) {
         int length;
         switch (countryCode) {
             case "GB":
+                if (input.strip().startsWith("040075")) {
+                    return new ValidationResult(false, Res.get("validation.gbp.revolutBranch"));
+                }
                 length = 6;
                 if (isNumberWithFixedLength(input, length))
                     return super.validate(input);