From 3847d1bd3a590eaf847e86afd2efcb0d4eb44cfe Mon Sep 17 00:00:00 2001 From: woodser Date: Tue, 21 Jan 2025 09:49:42 -0500 Subject: [PATCH] WeChat Pay supports CNY, USD, EUR, and GBP --- .../main/java/haveno/core/payment/WeChatPayAccount.java | 8 ++++++-- .../desktop/components/paymentmethods/WeChatPayForm.java | 7 +++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/core/src/main/java/haveno/core/payment/WeChatPayAccount.java b/core/src/main/java/haveno/core/payment/WeChatPayAccount.java index e7099879..297968ef 100644 --- a/core/src/main/java/haveno/core/payment/WeChatPayAccount.java +++ b/core/src/main/java/haveno/core/payment/WeChatPayAccount.java @@ -31,11 +31,15 @@ import java.util.List; @EqualsAndHashCode(callSuper = true) public final class WeChatPayAccount extends PaymentAccount { - public static final List SUPPORTED_CURRENCIES = List.of(new TraditionalCurrency("CNY")); + public static final List SUPPORTED_CURRENCIES = List.of( + new TraditionalCurrency("CNY"), + new TraditionalCurrency("USD"), + new TraditionalCurrency("EUR"), + new TraditionalCurrency("GBP") + ); public WeChatPayAccount() { super(PaymentMethod.WECHAT_PAY); - setSingleTradeCurrency(SUPPORTED_CURRENCIES.get(0)); } @Override diff --git a/desktop/src/main/java/haveno/desktop/components/paymentmethods/WeChatPayForm.java b/desktop/src/main/java/haveno/desktop/components/paymentmethods/WeChatPayForm.java index eb384687..cb1b40f6 100644 --- a/desktop/src/main/java/haveno/desktop/components/paymentmethods/WeChatPayForm.java +++ b/desktop/src/main/java/haveno/desktop/components/paymentmethods/WeChatPayForm.java @@ -26,6 +26,7 @@ import haveno.core.payment.payload.WeChatPayAccountPayload; import haveno.core.payment.validation.WeChatPayValidator; import haveno.core.util.coin.CoinFormatter; import haveno.core.util.validation.InputValidator; +import javafx.collections.FXCollections; import javafx.scene.layout.GridPane; import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextFieldWithCopyIcon; @@ -44,6 +45,12 @@ public class WeChatPayForm extends GeneralAccountNumberForm { this.weChatPayAccount = (WeChatPayAccount) paymentAccount; } + @Override + public void addTradeCurrency() { + addTradeCurrencyComboBox(); + currencyComboBox.setItems(FXCollections.observableArrayList(weChatPayAccount.getSupportedCurrencies())); + } + @Override void setAccountNumber(String newValue) { weChatPayAccount.setAccountNr(newValue);