From 9080400e1c1d12224a7ffdd82dbb402288553e31 Mon Sep 17 00:00:00 2001
From: woodser <13068859+woodser@users.noreply.github.com>
Date: Thu, 3 Apr 2025 20:31:06 -0400
Subject: [PATCH] populate extra info on duplicate or edit offer

---
 .../haveno/desktop/main/offer/MutableOfferViewModel.java  | 8 ++++++--
 .../portfolio/duplicateoffer/DuplicateOfferDataModel.java | 3 +--
 .../main/portfolio/editoffer/EditOfferDataModel.java      | 2 ++
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/desktop/src/main/java/haveno/desktop/main/offer/MutableOfferViewModel.java b/desktop/src/main/java/haveno/desktop/main/offer/MutableOfferViewModel.java
index 6d087b27ea..d49b4f2d15 100644
--- a/desktop/src/main/java/haveno/desktop/main/offer/MutableOfferViewModel.java
+++ b/desktop/src/main/java/haveno/desktop/main/offer/MutableOfferViewModel.java
@@ -501,7 +501,10 @@ public abstract class MutableOfferViewModel<M extends MutableOfferDataModel> ext
         };
 
         extraInfoStringListener = (ov, oldValue, newValue) -> {
-            onExtraInfoTextAreaChanged();
+            if (newValue != null) {
+                extraInfo.set(newValue);
+                onExtraInfoTextAreaChanged();
+            }
         };
 
         isWalletFundedListener = (ov, oldValue, newValue) -> updateButtonDisableState();
@@ -582,6 +585,7 @@ public abstract class MutableOfferViewModel<M extends MutableOfferDataModel> ext
         dataModel.getVolume().removeListener(volumeListener);
         dataModel.getSecurityDepositPct().removeListener(securityDepositAsDoubleListener);
         dataModel.getBuyerAsTakerWithoutDeposit().removeListener(buyerAsTakerWithoutDepositListener);
+        dataModel.getExtraInfo().removeListener(extraInfoStringListener);
 
         //dataModel.feeFromFundingTxProperty.removeListener(feeFromFundingTxListener);
         dataModel.getIsXmrWalletFunded().removeListener(isWalletFundedListener);
@@ -843,7 +847,7 @@ public abstract class MutableOfferViewModel<M extends MutableOfferDataModel> ext
         extraInfoValidationResult.set(getExtraInfoValidationResult());
         updateButtonDisableState();
         if (extraInfoValidationResult.get().isValid) {
-            dataModel.setExtraInfo(extraInfo.get());
+            setExtraInfoToModel();
         }
     }
 
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 21ab8a7788..547b14d936 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
@@ -90,12 +90,11 @@ class DuplicateOfferDataModel extends MutableOfferDataModel {
         setVolume(offer.getVolume());
         setUseMarketBasedPrice(offer.isUseMarketBasedPrice());
         setBuyerAsTakerWithoutDeposit(offer.hasBuyerAsTakerWithoutDeposit());
-
         setSecurityDepositPct(getSecurityAsPercent(offer));
-
         if (offer.isUseMarketBasedPrice()) {
             setMarketPriceMarginPct(offer.getMarketPriceMarginPct());
         }
+        setExtraInfo(offer.getOfferExtraInfo());
     }
 
     private double getSecurityAsPercent(Offer offer) {
diff --git a/desktop/src/main/java/haveno/desktop/main/portfolio/editoffer/EditOfferDataModel.java b/desktop/src/main/java/haveno/desktop/main/portfolio/editoffer/EditOfferDataModel.java
index 151a72c0d7..aa7993447a 100644
--- a/desktop/src/main/java/haveno/desktop/main/portfolio/editoffer/EditOfferDataModel.java
+++ b/desktop/src/main/java/haveno/desktop/main/portfolio/editoffer/EditOfferDataModel.java
@@ -137,6 +137,8 @@ class EditOfferDataModel extends MutableOfferDataModel {
             securityDepositPct.set(securityDepositPercent);
 
         allowAmountUpdate = false;
+
+        extraInfo.set(offer.getOfferExtraInfo());
     }
 
     @Override