Git-Mirrors/haveno
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2025-08-02 11:46:11 -04:00
Code Issues Projects Releases Packages Wiki Activity

support amazon e-gift card payment account over grpc api

Browse source
This commit is contained in:
woodser 2025-06-20 15:57:11 -04:00
parent 425dc1dd4d
commit 49005d604e
No known key found for this signature in database
GPG key ID: 55A10DD48ADEE5EF
6 changed files with 25 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
core/src/main/java/haveno/core/api/model/PaymentAccountForm.java
View file

@ -82,7 +82,8 @@ public final class PaymentAccountForm implements PersistablePayload {
WECHAT_PAY, WECHAT_PAY,
ALI_PAY, ALI_PAY,
SWISH, SWISH,
TRANSFERWISE_USD; TRANSFERWISE_USD,
AMAZON_GIFT_CARD;
public static PaymentAccountForm.FormId fromProto(protobuf.PaymentAccountForm.FormId formId) { public static PaymentAccountForm.FormId fromProto(protobuf.PaymentAccountForm.FormId formId) {
return ProtoUtil.enumFromProto(PaymentAccountForm.FormId.class, formId.name()); return ProtoUtil.enumFromProto(PaymentAccountForm.FormId.class, formId.name());

17
core/src/main/java/haveno/core/payment/AmazonGiftCardAccount.java
View file

@ -46,6 +46,14 @@ public final class AmazonGiftCardAccount extends PaymentAccount {
new TraditionalCurrency("USD") new TraditionalCurrency("USD")
); );
private static final List<PaymentAccountFormField.FieldId> INPUT_FIELD_IDS = List.of(
PaymentAccountFormField.FieldId.EMAIL_OR_MOBILE_NR,
PaymentAccountFormField.FieldId.COUNTRY,
PaymentAccountFormField.FieldId.TRADE_CURRENCIES,
PaymentAccountFormField.FieldId.ACCOUNT_NAME,
PaymentAccountFormField.FieldId.SALT
);
@Nullable @Nullable
private Country country; private Country country;
@ -65,7 +73,7 @@ public final class AmazonGiftCardAccount extends PaymentAccount {
@Override @Override
public @NotNull List<PaymentAccountFormField.FieldId> getInputFieldIds() { public @NotNull List<PaymentAccountFormField.FieldId> getInputFieldIds() {
throw new RuntimeException("Not implemented"); return INPUT_FIELD_IDS;
} }
public String getEmailOrMobileNr() { public String getEmailOrMobileNr() {
@ -97,4 +105,11 @@ public final class AmazonGiftCardAccount extends PaymentAccount {
private AmazonGiftCardAccountPayload getAmazonGiftCardAccountPayload() { private AmazonGiftCardAccountPayload getAmazonGiftCardAccountPayload() {
return (AmazonGiftCardAccountPayload) paymentAccountPayload; return (AmazonGiftCardAccountPayload) paymentAccountPayload;
} }
@Override
protected PaymentAccountFormField getEmptyFormField(PaymentAccountFormField.FieldId fieldId) {
var field = super.getEmptyFormField(fieldId);
if (field.getId() == PaymentAccountFormField.FieldId.TRADE_CURRENCIES) field.setComponent(PaymentAccountFormField.Component.SELECT_ONE);
return field;
}
} }

3
core/src/main/java/haveno/core/payment/PaymentAccountTypeAdapter.java
View file

@ -50,6 +50,7 @@ import static haveno.common.util.Utilities.decodeFromHex;
import static haveno.core.locale.CountryUtil.findCountryByCode; import static haveno.core.locale.CountryUtil.findCountryByCode;
import static haveno.core.locale.CurrencyUtil.getTradeCurrenciesInList; import static haveno.core.locale.CurrencyUtil.getTradeCurrenciesInList;
import static haveno.core.locale.CurrencyUtil.getTradeCurrency; import static haveno.core.locale.CurrencyUtil.getTradeCurrency;
import static haveno.core.payment.payload.PaymentMethod.AMAZON_GIFT_CARD_ID;
import static haveno.core.payment.payload.PaymentMethod.MONEY_GRAM_ID; import static haveno.core.payment.payload.PaymentMethod.MONEY_GRAM_ID;
import static java.lang.String.format; import static java.lang.String.format;
import static java.util.Arrays.stream; import static java.util.Arrays.stream;
@ -438,6 +439,8 @@ class PaymentAccountTypeAdapter extends TypeAdapter<PaymentAccount> {
// account.setSingleTradeCurrency(fiatCurrency); // account.setSingleTradeCurrency(fiatCurrency);
} else if (account.hasPaymentMethodWithId(MONEY_GRAM_ID)) { } else if (account.hasPaymentMethodWithId(MONEY_GRAM_ID)) {
((MoneyGramAccount) account).setCountry(country.get()); ((MoneyGramAccount) account).setCountry(country.get());
} else if (account.hasPaymentMethodWithId(AMAZON_GIFT_CARD_ID)) {
((AmazonGiftCardAccount) account).setCountry(country.get());
} else { } else {
String errMsg = format("cannot set the country on a %s", String errMsg = format("cannot set the country on a %s",
paymentAccountType.getSimpleName()); paymentAccountType.getSimpleName());

3
core/src/main/java/haveno/core/payment/payload/PaymentMethod.java
View file

@ -373,7 +373,8 @@ public final class PaymentMethod implements PersistablePayload, Comparable<Payme
WECHAT_PAY_ID, WECHAT_PAY_ID,
ALI_PAY_ID, ALI_PAY_ID,
SWISH_ID, SWISH_ID,
TRANSFERWISE_USD_ID); TRANSFERWISE_USD_ID,
AMAZON_GIFT_CARD_ID);
return paymentMethods.stream().filter(paymentMethod -> paymentMethodIds.contains(paymentMethod.getId())).collect(Collectors.toList()); return paymentMethods.stream().filter(paymentMethod -> paymentMethodIds.contains(paymentMethod.getId())).collect(Collectors.toList());
} }

2
desktop/src/main/java/haveno/desktop/components/paymentmethods/AmazonGiftCardForm.java
View file

@ -120,7 +120,7 @@ public class AmazonGiftCardForm extends PaymentMethodForm {
@Override @Override
protected void autoFillNameTextField() { protected void autoFillNameTextField() {
setAccountNameWithString(amazonGiftCardAccount.getEmailOrMobileNr()); setAccountNameWithString(amazonGiftCardAccount.getEmailOrMobileNr() == null ? "" : amazonGiftCardAccount.getEmailOrMobileNr());
} }
@Override @Override

1
proto/src/main/proto/pb.proto
View file

@ -1907,6 +1907,7 @@ message PaymentAccountForm {
ALI_PAY = 21; ALI_PAY = 21;
SWISH = 22; SWISH = 22;
TRANSFERWISE_USD = 23; TRANSFERWISE_USD = 23;
AMAZON_GIFT_CARD = 24;
} }
FormId id = 1; FormId id = 1;
repeated PaymentAccountFormField fields = 2; repeated PaymentAccountFormField fields = 2;