mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-02-24 07:07:43 +01:00
Code Issues Projects Releases Packages Wiki Activity

Wise: fix account summary and add copy icon to form.

Browse source 
Add copy icon to Pix form holder name field.
Prompt for holder name if empty.
Optimize form layout.
This commit is contained in:
yonson2023 2023-12-31 13:23:12 -06:00
parent e9e62b9e48
commit 25a6e08c09
No known key found for this signature in database
GPG key ID: 653F31AF4087E2F2
4 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/src/main/java/bisq/core/payment/payload/PixAccountPayload.java
View file

@ -91,8 +91,8 @@ public final class PixAccountPayload extends CountryBasedPaymentAccountPayload {
@Override @Override
public String getPaymentDetailsForTradePopup() { public String getPaymentDetailsForTradePopup() {
return (getHolderName().isEmpty() ? "" : Res.getWithCol("payment.account.owner") + " " + getHolderName() + "\n") + return Res.getWithCol("payment.pix.key") + " " + pixKey + "\n" +
Res.getWithCol("payment.pix.key") + " " + pixKey; Res.getWithCol("payment.account.owner") + " " + getHolderNameOrPromptIfEmpty();
} }
@Override @Override

5
core/src/main/java/bisq/core/payment/payload/TransferwiseAccountPayload.java
View file

@ -86,12 +86,13 @@ public final class TransferwiseAccountPayload extends PaymentAccountPayload {
@Override @Override
public String getPaymentDetails() { public String getPaymentDetails() {
return Res.get(paymentMethodId) + " - " + Res.getWithCol("payment.email") + " " + email; return Res.get(paymentMethodId) + " - " + getPaymentDetailsForTradePopup().replace("\n", ", ");
} }
@Override @Override
public String getPaymentDetailsForTradePopup() { public String getPaymentDetailsForTradePopup() {
return getPaymentDetails(); return Res.getWithCol("payment.email") + " " + email + "\n" +
Res.getWithCol("payment.account.owner") + " " + getHolderNameOrPromptIfEmpty();
} }
@Override @Override

5
desktop/src/main/java/bisq/desktop/components/paymentmethods/PixForm.java
View file

@ -35,6 +35,7 @@ import javafx.scene.control.TextField;
import javafx.scene.layout.GridPane; import javafx.scene.layout.GridPane;
import static bisq.desktop.util.FormBuilder.addCompactTopLabelTextField; import static bisq.desktop.util.FormBuilder.addCompactTopLabelTextField;
import static bisq.desktop.util.FormBuilder.addCompactTopLabelTextFieldWithCopyIcon;
import static bisq.desktop.util.FormBuilder.addTopLabelTextField; import static bisq.desktop.util.FormBuilder.addTopLabelTextField;
import static bisq.desktop.util.FormBuilder.addTopLabelTextFieldWithCopyIcon; import static bisq.desktop.util.FormBuilder.addTopLabelTextFieldWithCopyIcon;
@ -45,8 +46,8 @@ public class PixForm extends PaymentMethodForm {
PaymentAccountPayload paymentAccountPayload) { PaymentAccountPayload paymentAccountPayload) {
addTopLabelTextFieldWithCopyIcon(gridPane, gridRow, 1, Res.get("payment.pix.key"), addTopLabelTextFieldWithCopyIcon(gridPane, gridRow, 1, Res.get("payment.pix.key"),
((PixAccountPayload) paymentAccountPayload).getPixKey(), Layout.COMPACT_FIRST_ROW_AND_GROUP_DISTANCE); ((PixAccountPayload) paymentAccountPayload).getPixKey(), Layout.COMPACT_FIRST_ROW_AND_GROUP_DISTANCE);
addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.account.owner"), addCompactTopLabelTextFieldWithCopyIcon(gridPane, ++gridRow, Res.get("payment.account.owner"),
paymentAccountPayload.getHolderName()); paymentAccountPayload.getHolderNameOrPromptIfEmpty());
return gridRow; return gridRow;
} }

10
desktop/src/main/java/bisq/desktop/components/paymentmethods/TransferwiseForm.java
View file

@ -19,6 +19,7 @@ package bisq.desktop.components.paymentmethods;
import bisq.desktop.components.InputTextField; import bisq.desktop.components.InputTextField;
import bisq.desktop.util.FormBuilder; import bisq.desktop.util.FormBuilder;
import bisq.desktop.util.Layout;
import bisq.desktop.util.validation.TransferwiseValidator; import bisq.desktop.util.validation.TransferwiseValidator;
import bisq.core.account.witness.AccountAgeWitnessService; import bisq.core.account.witness.AccountAgeWitnessService;
@ -36,6 +37,7 @@ import javafx.scene.layout.GridPane;
import static bisq.desktop.util.FormBuilder.addCompactTopLabelTextField; import static bisq.desktop.util.FormBuilder.addCompactTopLabelTextField;
import static bisq.desktop.util.FormBuilder.addCompactTopLabelTextFieldWithCopyIcon; import static bisq.desktop.util.FormBuilder.addCompactTopLabelTextFieldWithCopyIcon;
import static bisq.desktop.util.FormBuilder.addTopLabelTextFieldWithCopyIcon;
public class TransferwiseForm extends PaymentMethodForm { public class TransferwiseForm extends PaymentMethodForm {
private final TransferwiseAccount account; private final TransferwiseAccount account;
@ -43,10 +45,10 @@ public class TransferwiseForm extends PaymentMethodForm {
public static int addFormForBuyer(GridPane gridPane, int gridRow, public static int addFormForBuyer(GridPane gridPane, int gridRow,
PaymentAccountPayload paymentAccountPayload) { PaymentAccountPayload paymentAccountPayload) {
addCompactTopLabelTextFieldWithCopyIcon(gridPane, ++gridRow, Res.get("payment.email"), addTopLabelTextFieldWithCopyIcon(gridPane, gridRow, 1, Res.get("payment.email"),
((TransferwiseAccountPayload) paymentAccountPayload).getEmail()); ((TransferwiseAccountPayload) paymentAccountPayload).getEmail(), Layout.COMPACT_FIRST_ROW_AND_GROUP_DISTANCE);
addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.account.owner"), addCompactTopLabelTextFieldWithCopyIcon(gridPane, ++gridRow, Res.get("payment.account.owner"),
paymentAccountPayload.getHolderName()); paymentAccountPayload.getHolderNameOrPromptIfEmpty());
return gridRow; return gridRow;
} }