Update MoneyBeam account, add HolderName

core/src/main/java/bisq/core/payment/payload/MoneyBeamAccountPayload.java

@@ -21,6 +21,8 @@
 
 import com.google.protobuf.Message;
 
+import org.apache.commons.lang3.ArrayUtils;
+
 import java.nio.charset.StandardCharsets;
 
 import java.util.HashMap;
@@ -85,16 +87,21 @@ public static MoneyBeamAccountPayload fromProto(protobuf.PaymentAccountPayload p
 
     @Override
     public String getPaymentDetails() {
-        return Res.get(paymentMethodId) + " - " + Res.getWithCol("payment.account") + " " + accountId;
+        return Res.get(paymentMethodId) + " - " + getPaymentDetailsForTradePopup().replace("\n", ", ");
     }
 
     @Override
     public String getPaymentDetailsForTradePopup() {
-        return getPaymentDetails();
+        return Res.getWithCol("payment.account") + " " + accountId + "\n" +
+                Res.getWithCol("payment.account.owner") + " " + getHolderNameOrPromptIfEmpty();
     }
 
     @Override
     public byte[] getAgeWitnessInputData() {
-        return super.getAgeWitnessInputData(accountId.getBytes(StandardCharsets.UTF_8));
+        // holderName will be included as part of the witness data.
+        // older accounts that don't have holderName still retain their existing witness.
+        return super.getAgeWitnessInputData(ArrayUtils.addAll(
+                accountId.getBytes(StandardCharsets.UTF_8),
+                getHolderName().getBytes(StandardCharsets.UTF_8)));
     }
 }

core/src/main/java/bisq/core/payment/payload/PaymentAccountPayload.java

@@ -17,6 +17,8 @@
 
 package bisq.core.payment.payload;
 
+import bisq.core.locale.Res;
+
 import bisq.common.consensus.UsedForTradeContractJson;
 import bisq.common.crypto.CryptoUtils;
 import bisq.common.proto.network.NetworkPayload;
@@ -135,6 +137,9 @@ public String getHolderName() {
         return excludeFromJsonDataMap.getOrDefault(HOLDER_NAME, "");
     }
 
+    public String getHolderNameOrPromptIfEmpty() {
+        return getHolderName().isEmpty() ? Res.get("payment.account.owner.ask") : getHolderName();
+    }
     public void setHolderName(String holderName) {
         // an empty string must result in the mapping removing the entry.
         excludeFromJsonDataMap.compute(HOLDER_NAME, (k, v) -> Strings.emptyToNull(holderName));

core/src/main/resources/i18n/displayStrings.properties

@@ -3710,6 +3710,7 @@ payment.account.name=Account name
 payment.account.userName=User name
 payment.account.phoneNr=Phone number
 payment.account.owner=Account owner full name
+payment.account.owner.ask=[Ask trader to provide account name if needed]
 payment.account.fullName=Full name (first, middle, last)
 payment.account.state=State/Province/Region
 payment.account.city=City

desktop/src/main/java/bisq/desktop/components/paymentmethods/MoneyBeamForm.java

@@ -44,6 +44,8 @@ public class MoneyBeamForm extends PaymentMethodForm {
 
     public static int addFormForBuyer(GridPane gridPane, int gridRow, PaymentAccountPayload paymentAccountPayload) {
         addCompactTopLabelTextFieldWithCopyIcon(gridPane, ++gridRow, Res.get("payment.moneyBeam.accountId"), ((MoneyBeamAccountPayload) paymentAccountPayload).getAccountId());
+        addCompactTopLabelTextFieldWithCopyIcon(gridPane, gridRow, 1, Res.get("payment.account.owner"),
+                paymentAccountPayload.getHolderNameOrPromptIfEmpty());
         return gridRow;
     }
 
@@ -64,6 +66,14 @@ public void addFormForAddAccount() {
             updateFromInputs();
         });
 
+        InputTextField holderNameInputTextField = FormBuilder.addInputTextField(gridPane, ++gridRow,
+                Res.get("payment.account.owner"));
+        holderNameInputTextField.setValidator(inputValidator);
+        holderNameInputTextField.textProperty().addListener((ov, oldValue, newValue) -> {
+            account.setHolderName(newValue);
+            updateFromInputs();
+        });
+
         final TradeCurrency singleTradeCurrency = account.getSingleTradeCurrency();
         final String nameAndCode = singleTradeCurrency != null ? singleTradeCurrency.getNameAndCode() : "";
         addTopLabelTextField(gridPane, ++gridRow, Res.get("shared.currency"), nameAndCode);
@@ -83,6 +93,8 @@ public void addFormForEditAccount() {
         addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("shared.paymentMethod"), Res.get(account.getPaymentMethod().getId()));
         TextField field = addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.moneyBeam.accountId"), account.getAccountId()).second;
         field.setMouseTransparent(false);
+        addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.account.owner"),
+                account.getHolderName());
         final TradeCurrency singleTradeCurrency = account.getSingleTradeCurrency();
         final String nameAndCode = singleTradeCurrency != null ? singleTradeCurrency.getNameAndCode() : "";
         addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("shared.currency"), nameAndCode);
@@ -93,6 +105,7 @@ public void addFormForEditAccount() {
     public void updateAllInputsValid() {
         allInputsValid.set(isAccountNameValid()
                 && validator.validate(account.getAccountId()).isValid
+                && inputValidator.validate(account.getHolderName()).isValid
                 && account.getTradeCurrencies().size() > 0);
     }
 }