From a323e2d9b944a04bb433f5a17dff58aac59492d2 Mon Sep 17 00:00:00 2001 From: Christoph Atteneder Date: Mon, 25 Jun 2018 11:38:09 +0200 Subject: [PATCH 1/2] Set default payment account for an edited offer to null --- .../bisq/desktop/main/offer/EditableOfferDataModel.java | 6 +++++- .../main/portfolio/editoffer/EditOpenOfferDataModel.java | 6 ++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/main/java/bisq/desktop/main/offer/EditableOfferDataModel.java b/src/main/java/bisq/desktop/main/offer/EditableOfferDataModel.java index f581e65b111..c9963fbabd9 100644 --- a/src/main/java/bisq/desktop/main/offer/EditableOfferDataModel.java +++ b/src/main/java/bisq/desktop/main/offer/EditableOfferDataModel.java @@ -245,7 +245,7 @@ public boolean initWithData(OfferPayload.Direction direction, TradeCurrency trad fillPaymentAccounts(); PaymentAccount account; - PaymentAccount lastSelectedPaymentAccount = preferences.getSelectedPaymentAccountForCreateOffer(); + PaymentAccount lastSelectedPaymentAccount = getPreselectedPaymentAccount(); if (lastSelectedPaymentAccount != null && user.getPaymentAccounts() != null && user.getPaymentAccounts().contains(lastSelectedPaymentAccount)) { @@ -286,6 +286,10 @@ public boolean initWithData(OfferPayload.Direction direction, TradeCurrency trad return true; } + protected PaymentAccount getPreselectedPaymentAccount() { + return preferences.getSelectedPaymentAccountForCreateOffer(); + } + void onTabSelected(boolean isSelected) { this.isTabSelected = isSelected; if (isTabSelected) diff --git a/src/main/java/bisq/desktop/main/portfolio/editoffer/EditOpenOfferDataModel.java b/src/main/java/bisq/desktop/main/portfolio/editoffer/EditOpenOfferDataModel.java index 14de6c786c3..69d7cc2f4bc 100644 --- a/src/main/java/bisq/desktop/main/portfolio/editoffer/EditOpenOfferDataModel.java +++ b/src/main/java/bisq/desktop/main/portfolio/editoffer/EditOpenOfferDataModel.java @@ -30,6 +30,7 @@ import bisq.core.offer.OpenOffer; import bisq.core.offer.OpenOfferManager; import bisq.core.payment.AccountAgeWitnessService; +import bisq.core.payment.PaymentAccount; import bisq.core.provider.fee.FeeService; import bisq.core.provider.price.PriceFeedService; import bisq.core.user.Preferences; @@ -61,6 +62,11 @@ public void initWithData(OpenOffer openOffer) { this.allowAmountUpdate = false; } + @Override + protected PaymentAccount getPreselectedPaymentAccount() { + return null; + } + public void populateData() { Offer offer = openOffer.getOffer(); From a16f6a8e5328c4639a1d35cd27379c5248fafe68 Mon Sep 17 00:00:00 2001 From: Christoph Atteneder Date: Mon, 25 Jun 2018 12:09:40 +0200 Subject: [PATCH 2/2] Add nullable annotation --- .../java/bisq/desktop/main/offer/EditableOfferDataModel.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/java/bisq/desktop/main/offer/EditableOfferDataModel.java b/src/main/java/bisq/desktop/main/offer/EditableOfferDataModel.java index c9963fbabd9..f1e4c98c285 100644 --- a/src/main/java/bisq/desktop/main/offer/EditableOfferDataModel.java +++ b/src/main/java/bisq/desktop/main/offer/EditableOfferDataModel.java @@ -89,6 +89,8 @@ import java.util.Optional; import java.util.UUID; +import javax.annotation.Nullable; + import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; @@ -245,6 +247,8 @@ public boolean initWithData(OfferPayload.Direction direction, TradeCurrency trad fillPaymentAccounts(); PaymentAccount account; + + @Nullable PaymentAccount lastSelectedPaymentAccount = getPreselectedPaymentAccount(); if (lastSelectedPaymentAccount != null && user.getPaymentAccounts() != null &&