From 2521749a316e164cc11f275c12e5ec4f0a461f93 Mon Sep 17 00:00:00 2001 From: woodser Date: Fri, 31 Jan 2025 08:53:57 -0500 Subject: [PATCH] fix npe duplicating offer with deleted payment account --- .../portfolio/duplicateoffer/DuplicateOfferDataModel.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/desktop/src/main/java/haveno/desktop/main/portfolio/duplicateoffer/DuplicateOfferDataModel.java b/desktop/src/main/java/haveno/desktop/main/portfolio/duplicateoffer/DuplicateOfferDataModel.java index e3fd44c0ba0..21ab8a77889 100644 --- a/desktop/src/main/java/haveno/desktop/main/portfolio/duplicateoffer/DuplicateOfferDataModel.java +++ b/desktop/src/main/java/haveno/desktop/main/portfolio/duplicateoffer/DuplicateOfferDataModel.java @@ -79,7 +79,11 @@ class DuplicateOfferDataModel extends MutableOfferDataModel { public void populateData(Offer offer) { if (offer == null) return; - paymentAccount = user.getPaymentAccount(offer.getMakerPaymentAccountId()); + + PaymentAccount account = user.getPaymentAccount(offer.getMakerPaymentAccountId()); + if (account != null) { + this.paymentAccount = account; + } setMinAmount(offer.getMinAmount()); setAmount(offer.getAmount()); setPrice(offer.getPrice());