From 97569bad37825c04bbb9b4bd46dcb23f1b81ef80 Mon Sep 17 00:00:00 2001 From: woodser Date: Tue, 28 Jan 2025 10:47:23 -0500 Subject: [PATCH] do not require extra info in cardless cash form --- .../components/paymentmethods/CashAtAtmForm.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/desktop/src/main/java/haveno/desktop/components/paymentmethods/CashAtAtmForm.java b/desktop/src/main/java/haveno/desktop/components/paymentmethods/CashAtAtmForm.java index 728f860104..b6447a868d 100644 --- a/desktop/src/main/java/haveno/desktop/components/paymentmethods/CashAtAtmForm.java +++ b/desktop/src/main/java/haveno/desktop/components/paymentmethods/CashAtAtmForm.java @@ -41,12 +41,12 @@ public class CashAtAtmForm extends PaymentMethodForm { public static int addFormForBuyer(GridPane gridPane, int gridRow, PaymentAccountPayload paymentAccountPayload) { - CashAtAtmAccountPayload cbm = (CashAtAtmAccountPayload) paymentAccountPayload; + CashAtAtmAccountPayload cashAtAtmPayload = (CashAtAtmAccountPayload) paymentAccountPayload; TextArea textExtraInfo = addCompactTopLabelTextArea(gridPane, ++gridRow, 0, Res.get("payment.shared.extraInfo"), "").second; textExtraInfo.setMinHeight(70); textExtraInfo.setEditable(false); - textExtraInfo.setText(cbm.getExtraInfo()); + textExtraInfo.setText(cashAtAtmPayload.getExtraInfo()); return gridRow; } @@ -79,7 +79,11 @@ public class CashAtAtmForm extends PaymentMethodForm { @Override protected void autoFillNameTextField() { - setAccountNameWithString(cashAtAtmAccount.getExtraInfo().substring(0, Math.min(50, cashAtAtmAccount.getExtraInfo().length()))); + if (cashAtAtmAccount.getExtraInfo() != null && !cashAtAtmAccount.getExtraInfo().isEmpty()) { + setAccountNameWithString(cashAtAtmAccount.getExtraInfo().substring(0, Math.min(50, cashAtAtmAccount.getExtraInfo().length()))); + } else { + setAccountNameWithString(cashAtAtmAccount.getSelectedTradeCurrency().getCode()); + } } @Override @@ -104,7 +108,6 @@ public class CashAtAtmForm extends PaymentMethodForm { @Override public void updateAllInputsValid() { allInputsValid.set(isAccountNameValid() - && !cashAtAtmAccount.getExtraInfo().isEmpty() && paymentAccount.getSingleTradeCurrency() != null); } }