nihilist/haveno-reto
1
0
Fork 0
mirror of https://github.com/retoaccess1/haveno-reto.git synced 2024-11-10 13:13:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

support paxum

Browse Source
This commit is contained in:
woodser 2022-06-23 11:16:13 -04:00
parent 27f4b18330
commit 7ad2e20d95
6 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/main/java/bisq/core/api/model/PaymentAccountForm.java
View File

@ -75,7 +75,8 @@ public final class PaymentAccountForm implements PersistablePayload {
STRIKE, STRIKE,
MONEY_GRAM, MONEY_GRAM,
FASTER_PAYMENTS, FASTER_PAYMENTS,
UPHOLD; UPHOLD,
PAXUM;
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());

18
core/src/main/java/bisq/core/payment/PaxumAccount.java
View File

@ -25,7 +25,7 @@ import bisq.core.payment.payload.PaymentAccountPayload;
import bisq.core.payment.payload.PaymentMethod; import bisq.core.payment.payload.PaymentMethod;
import java.util.List; import java.util.List;
import java.util.stream.Collectors;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
@ -33,6 +33,13 @@ import org.jetbrains.annotations.NotNull;
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
public final class PaxumAccount extends PaymentAccount { public final class PaxumAccount extends PaymentAccount {
private static final List<PaymentAccountFormField.FieldId> INPUT_FIELD_IDS = List.of(
PaymentAccountFormField.FieldId.ACCOUNT_NAME,
PaymentAccountFormField.FieldId.EMAIL,
PaymentAccountFormField.FieldId.TRADE_CURRENCIES,
PaymentAccountFormField.FieldId.SALT
);
// https://github.com/bisq-network/growth/issues/235 // https://github.com/bisq-network/growth/issues/235
public static final List<TradeCurrency> SUPPORTED_CURRENCIES = List.of( public static final List<TradeCurrency> SUPPORTED_CURRENCIES = List.of(
new FiatCurrency("AUD"), new FiatCurrency("AUD"),
@ -71,7 +78,7 @@ public final class PaxumAccount 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 void setEmail(String accountId) { public void setEmail(String accountId) {
@ -81,4 +88,11 @@ public final class PaxumAccount extends PaymentAccount {
public String getEmail() { public String getEmail() {
return ((PaxumAccountPayload) paymentAccountPayload).getEmail(); return ((PaxumAccountPayload) paymentAccountPayload).getEmail();
} }
@Override
protected PaymentAccountFormField getEmptyFormField(PaymentAccountFormField.FieldId fieldId) {
var field = super.getEmptyFormField(fieldId);
if (field.getId() == PaymentAccountFormField.FieldId.TRADE_CURRENCIES) field.setValue("");
return field;
}
} }

1
core/src/main/java/bisq/core/payment/PaymentAccount.java
View File

@ -665,6 +665,7 @@ public abstract class PaymentAccount implements PersistablePayload {
field.setComponent(PaymentAccountFormField.Component.SELECT_MULTIPLE); field.setComponent(PaymentAccountFormField.Component.SELECT_MULTIPLE);
field.setLabel("Supported currencies"); field.setLabel("Supported currencies");
field.setSupportedCurrencies(getSupportedCurrencies()); field.setSupportedCurrencies(getSupportedCurrencies());
field.setValue(String.join(",", getSupportedCurrencies().stream().map(TradeCurrency::getCode).collect(Collectors.toList())));
break; break;
case USER_NAME: case USER_NAME:
field.setComponent(PaymentAccountFormField.Component.TEXT); field.setComponent(PaymentAccountFormField.Component.TEXT);

7
core/src/main/java/bisq/core/payment/RevolutAccount.java
View File

@ -124,11 +124,4 @@ public final class RevolutAccount extends PaymentAccount {
public @NonNull List<TradeCurrency> getSupportedCurrencies() { public @NonNull List<TradeCurrency> getSupportedCurrencies() {
return SUPPORTED_CURRENCIES; return SUPPORTED_CURRENCIES;
} }
@Override
protected PaymentAccountFormField getEmptyFormField(PaymentAccountFormField.FieldId fieldId) {
var field = super.getEmptyFormField(fieldId);
if (field.getId() == PaymentAccountFormField.FieldId.TRADE_CURRENCIES) field.setValue(String.join(",", getSupportedCurrencies().stream().map(TradeCurrency::getCode).collect(Collectors.toList())));
return field;
}
} }

3
core/src/main/java/bisq/core/payment/payload/PaymentMethod.java
View File

@ -338,7 +338,8 @@ public final class PaymentMethod implements PersistablePayload, Comparable<Payme
STRIKE_ID, STRIKE_ID,
MONEY_GRAM_ID, MONEY_GRAM_ID,
FASTER_PAYMENTS_ID, FASTER_PAYMENTS_ID,
UPHOLD_ID); UPHOLD_ID,
PAXUM_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());
} }

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

@ -2085,6 +2085,7 @@ message PaymentAccountForm {
MONEY_GRAM = 8; MONEY_GRAM = 8;
FASTER_PAYMENTS = 9; FASTER_PAYMENTS = 9;
UPHOLD = 10; UPHOLD = 10;
PAXUM = 11;
} }
FormId id = 1; FormId id = 1;
repeated PaymentAccountFormField fields = 2; repeated PaymentAccountFormField fields = 2;