From c74c08c0484fce5cddeb6960397e8921405523c5 Mon Sep 17 00:00:00 2001
From: beingindot <beingindot@protonmail.com>
Date: Thu, 7 Nov 2019 17:23:49 +0530
Subject: [PATCH] Added empty check validation for
 popmoney/revolut/uphold/zelle

---
 .../desktop/components/paymentmethods/ClearXchangeForm.java | 6 +++---
 .../desktop/components/paymentmethods/PopmoneyForm.java     | 6 +++---
 .../bisq/desktop/components/paymentmethods/RevolutForm.java | 4 ++--
 .../bisq/desktop/components/paymentmethods/UpholdForm.java  | 4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/ClearXchangeForm.java b/desktop/src/main/java/bisq/desktop/components/paymentmethods/ClearXchangeForm.java
index 85111a06c81..6a70ba49a82 100644
--- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/ClearXchangeForm.java
+++ b/desktop/src/main/java/bisq/desktop/components/paymentmethods/ClearXchangeForm.java
@@ -66,7 +66,7 @@ public void addFormForAddAccount() {
                 Res.get("payment.account.owner"));
         holderNameInputTextField.setValidator(inputValidator);
         holderNameInputTextField.textProperty().addListener((ov, oldValue, newValue) -> {
-            clearXchangeAccount.setHolderName(newValue);
+            clearXchangeAccount.setHolderName(newValue.trim());
             updateFromInputs();
         });
 
@@ -74,7 +74,7 @@ public void addFormForAddAccount() {
                 Res.get("payment.email.mobile"));
         mobileNrInputTextField.setValidator(clearXchangeValidator);
         mobileNrInputTextField.textProperty().addListener((ov, oldValue, newValue) -> {
-            clearXchangeAccount.setEmailOrMobileNr(newValue);
+            clearXchangeAccount.setEmailOrMobileNr(newValue.trim());
             updateFromInputs();
         });
         final TradeCurrency singleTradeCurrency = clearXchangeAccount.getSingleTradeCurrency();
@@ -87,7 +87,7 @@ public void addFormForAddAccount() {
 
     @Override
     protected void autoFillNameTextField() {
-        setAccountNameWithString(mobileNrInputTextField.getText());
+        setAccountNameWithString(mobileNrInputTextField.getText().trim());
     }
 
     @Override
diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/PopmoneyForm.java b/desktop/src/main/java/bisq/desktop/components/paymentmethods/PopmoneyForm.java
index ee1e3666b73..29ea78a2083 100644
--- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/PopmoneyForm.java
+++ b/desktop/src/main/java/bisq/desktop/components/paymentmethods/PopmoneyForm.java
@@ -65,14 +65,14 @@ public void addFormForAddAccount() {
                 Res.get("payment.account.owner"));
         holderNameInputTextField.setValidator(inputValidator);
         holderNameInputTextField.textProperty().addListener((ov, oldValue, newValue) -> {
-            account.setHolderName(newValue);
+            account.setHolderName(newValue.trim());
             updateFromInputs();
         });
 
         accountIdInputTextField = FormBuilder.addInputTextField(gridPane, ++gridRow, Res.get("payment.popmoney.accountId"));
         accountIdInputTextField.setValidator(validator);
         accountIdInputTextField.textProperty().addListener((ov, oldValue, newValue) -> {
-            account.setAccountId(newValue);
+            account.setAccountId(newValue.trim());
             updateFromInputs();
         });
 
@@ -85,7 +85,7 @@ public void addFormForAddAccount() {
 
     @Override
     protected void autoFillNameTextField() {
-        setAccountNameWithString(accountIdInputTextField.getText());
+        setAccountNameWithString(accountIdInputTextField.getText().trim());
     }
 
     @Override
diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/RevolutForm.java b/desktop/src/main/java/bisq/desktop/components/paymentmethods/RevolutForm.java
index a473912ffd6..07b6606538c 100644
--- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/RevolutForm.java
+++ b/desktop/src/main/java/bisq/desktop/components/paymentmethods/RevolutForm.java
@@ -77,7 +77,7 @@ public void addFormForAddAccount() {
         accountIdInputTextField = FormBuilder.addInputTextField(gridPane, ++gridRow, Res.get("payment.revolut.phoneNr"));
         accountIdInputTextField.setValidator(validator);
         accountIdInputTextField.textProperty().addListener((ov, oldValue, newValue) -> {
-            account.setAccountId(newValue);
+            account.setAccountId(newValue.trim());
             updateFromInputs();
         });
 
@@ -102,7 +102,7 @@ private void addCurrenciesGrid(boolean isEditable) {
 
     @Override
     protected void autoFillNameTextField() {
-        setAccountNameWithString(accountIdInputTextField.getText());
+        setAccountNameWithString(accountIdInputTextField.getText().trim());
     }
 
     @Override
diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/UpholdForm.java b/desktop/src/main/java/bisq/desktop/components/paymentmethods/UpholdForm.java
index 9e00124a9b1..8aaac096cd1 100644
--- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/UpholdForm.java
+++ b/desktop/src/main/java/bisq/desktop/components/paymentmethods/UpholdForm.java
@@ -67,7 +67,7 @@ public void addFormForAddAccount() {
         accountIdInputTextField = FormBuilder.addInputTextField(gridPane, ++gridRow, Res.get("payment.uphold.accountId"));
         accountIdInputTextField.setValidator(upholdValidator);
         accountIdInputTextField.textProperty().addListener((ov, oldValue, newValue) -> {
-            upholdAccount.setAccountId(newValue);
+            upholdAccount.setAccountId(newValue.trim());
             updateFromInputs();
         });
 
@@ -92,7 +92,7 @@ private void addCurrenciesGrid(boolean isEditable) {
 
     @Override
     protected void autoFillNameTextField() {
-        setAccountNameWithString(accountIdInputTextField.getText());
+        setAccountNameWithString(accountIdInputTextField.getText().trim());
     }
 
     @Override