From c3f7f194b0a031d00036827ecd0c99ff41afbaee Mon Sep 17 00:00:00 2001
From: woodser <woodser@protonmail.com>
Date: Tue, 21 Jan 2025 10:10:57 -0500
Subject: [PATCH] AliPay supports all supported currencies

---
 .../haveno/core/payment/AliPayAccount.java    | 29 ++++++++++++++++++-
 .../components/paymentmethods/AliPayForm.java |  7 +++++
 2 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/core/src/main/java/haveno/core/payment/AliPayAccount.java b/core/src/main/java/haveno/core/payment/AliPayAccount.java
index b6f93b36..1bff92b5 100644
--- a/core/src/main/java/haveno/core/payment/AliPayAccount.java
+++ b/core/src/main/java/haveno/core/payment/AliPayAccount.java
@@ -31,7 +31,34 @@ import java.util.List;
 @EqualsAndHashCode(callSuper = true)
 public final class AliPayAccount extends PaymentAccount {
 
-    public static final List<TradeCurrency> SUPPORTED_CURRENCIES = List.of(new TraditionalCurrency("CNY"));
+    public static final List<TradeCurrency> SUPPORTED_CURRENCIES = List.of(
+            new TraditionalCurrency("AED"),
+            new TraditionalCurrency("AUD"),
+            new TraditionalCurrency("CAD"),
+            new TraditionalCurrency("CHF"),
+            new TraditionalCurrency("CNY"),
+            new TraditionalCurrency("CZK"),
+            new TraditionalCurrency("DKK"),
+            new TraditionalCurrency("EUR"),
+            new TraditionalCurrency("GBP"),
+            new TraditionalCurrency("HKD"),
+            new TraditionalCurrency("IDR"),
+            new TraditionalCurrency("ILS"),
+            new TraditionalCurrency("JPY"),
+            new TraditionalCurrency("KRW"),
+            new TraditionalCurrency("LKR"),
+            new TraditionalCurrency("MUR"),
+            new TraditionalCurrency("MYR"),
+            new TraditionalCurrency("NOK"),
+            new TraditionalCurrency("NZD"),
+            new TraditionalCurrency("PHP"),
+            new TraditionalCurrency("RUB"),
+            new TraditionalCurrency("SEK"),
+            new TraditionalCurrency("SGD"),
+            new TraditionalCurrency("THB"),
+            new TraditionalCurrency("USD"),
+            new TraditionalCurrency("ZAR")
+    );
 
     public AliPayAccount() {
         super(PaymentMethod.ALI_PAY);
diff --git a/desktop/src/main/java/haveno/desktop/components/paymentmethods/AliPayForm.java b/desktop/src/main/java/haveno/desktop/components/paymentmethods/AliPayForm.java
index f4d7cce6..6688bb59 100644
--- a/desktop/src/main/java/haveno/desktop/components/paymentmethods/AliPayForm.java
+++ b/desktop/src/main/java/haveno/desktop/components/paymentmethods/AliPayForm.java
@@ -26,6 +26,7 @@ import haveno.core.payment.payload.PaymentAccountPayload;
 import haveno.core.payment.validation.AliPayValidator;
 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 AliPayForm extends GeneralAccountNumberForm {
         this.aliPayAccount = (AliPayAccount) paymentAccount;
     }
 
+    @Override
+    public void addTradeCurrency() {
+        addTradeCurrencyComboBox();
+        currencyComboBox.setItems(FXCollections.observableArrayList(aliPayAccount.getSupportedCurrencies()));
+    }
+
     @Override
     void setAccountNumber(String newValue) {
         aliPayAccount.setAccountNr(newValue);