From 8b72eba1e0df03ab64bb6dc82716c7988c642f7d Mon Sep 17 00:00:00 2001 From: Nolaan Date: Sat, 11 Nov 2017 18:11:21 +0100 Subject: [PATCH] Rebase correction Add one more argument --- .../core/payment/payload/WesternUnionAccountPayload.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/core/src/main/java/io/bisq/core/payment/payload/WesternUnionAccountPayload.java b/core/src/main/java/io/bisq/core/payment/payload/WesternUnionAccountPayload.java index 0505e58cb6..04f9f31a0b 100644 --- a/core/src/main/java/io/bisq/core/payment/payload/WesternUnionAccountPayload.java +++ b/core/src/main/java/io/bisq/core/payment/payload/WesternUnionAccountPayload.java @@ -59,9 +59,12 @@ public class WesternUnionAccountPayload extends CountryBasedPaymentAccountPayloa String countryCode, String holderName, @Nullable String requirements, + long maxTradePeriod, @Nullable Map excludeFromJsonDataMap) { - super(paymentMethodName, id, + super(paymentMethodName, + id, countryCode, + maxTradePeriod, excludeFromJsonDataMap); this.holderName = holderName; this.requirements = requirements; @@ -90,6 +93,7 @@ public class WesternUnionAccountPayload extends CountryBasedPaymentAccountPayloa countryBasedPaymentAccountPayload.getCountryCode(), westernUnionAccountPayload.getHolderName(), westernUnionAccountPayload.getRequirements().isEmpty() ? null : westernUnionAccountPayload.getRequirements(), + proto.getMaxTradePeriod(), CollectionUtils.isEmpty(proto.getExcludeFromJsonDataMap()) ? null : new HashMap<>(proto.getExcludeFromJsonDataMap())); }