fix npe duplicating offer with deleted payment account

woodser · Jan 31, 2025 · 2521749 · 2521749
1 parent e6b29b8
commit 2521749
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/...p/src/main/java/haveno/desktop/main/portfolio/duplicateoffer/DuplicateOfferDataModel.java b/...p/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());