populate trigger price and extra info on duplicate or edit offer

Author: woodser

desktop/src/main/java/haveno/desktop/main/offer/MutableOfferView.java

@@ -262,6 +262,7 @@ protected void doActivate() {
 
             buyerAsTakerWithoutDepositSlider.setSelected(model.dataModel.getBuyerAsTakerWithoutDeposit().get());
 
+            triggerPriceInputTextField.setText(model.triggerPrice.get());
             extraInfoTextArea.setText(model.dataModel.extraInfo.get());
         }
     }

desktop/src/main/java/haveno/desktop/main/offer/MutableOfferViewModel.java

@@ -501,7 +501,10 @@ private void createListeners() {
         };
 
         extraInfoStringListener = (ov, oldValue, newValue) -> {
-            onExtraInfoTextAreaChanged();
+            if (newValue != null) {
+                extraInfo.set(newValue);
+                onExtraInfoTextAreaChanged();
+            }
         };
 
         isWalletFundedListener = (ov, oldValue, newValue) -> updateButtonDisableState();
@@ -582,6 +585,7 @@ private void removeListeners() {
         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 void onExtraInfoTextAreaChanged() {
         extraInfoValidationResult.set(getExtraInfoValidationResult());
         updateButtonDisableState();
         if (extraInfoValidationResult.get().isValid) {
-            dataModel.setExtraInfo(extraInfo.get());
+            setExtraInfoToModel();
         }
     }
 

desktop/src/main/java/haveno/desktop/main/portfolio/duplicateoffer/DuplicateOfferDataModel.java

@@ -26,6 +26,7 @@
 import haveno.core.offer.CreateOfferService;
 import haveno.core.offer.Offer;
 import haveno.core.offer.OfferUtil;
+import haveno.core.offer.OpenOffer;
 import haveno.core.offer.OpenOfferManager;
 import haveno.core.payment.PaymentAccount;
 import haveno.core.provider.price.PriceFeedService;
@@ -89,13 +90,15 @@ public void populateData(Offer offer) {
         setPrice(offer.getPrice());
         setVolume(offer.getVolume());
         setUseMarketBasedPrice(offer.isUseMarketBasedPrice());
-        setBuyerAsTakerWithoutDeposit(offer.hasBuyerAsTakerWithoutDeposit());
-
-        setSecurityDepositPct(getSecurityAsPercent(offer));
-
         if (offer.isUseMarketBasedPrice()) {
             setMarketPriceMarginPct(offer.getMarketPriceMarginPct());
         }
+        setBuyerAsTakerWithoutDeposit(offer.hasBuyerAsTakerWithoutDeposit());
+        setSecurityDepositPct(getSecurityAsPercent(offer));
+        setExtraInfo(offer.getOfferExtraInfo());
+
+        OpenOffer openOffer = openOfferManager.getOpenOffer(offer.getId()).orElse(null);
+        if (openOffer != null) setTriggerPrice(openOffer.getTriggerPrice());
     }
 
     private double getSecurityAsPercent(Offer offer) {

desktop/src/main/java/haveno/desktop/main/portfolio/duplicateoffer/DuplicateOfferViewModel.java

@@ -29,6 +29,7 @@
 import haveno.core.provider.price.PriceFeedService;
 import haveno.core.user.Preferences;
 import haveno.core.util.FormattingUtils;
+import haveno.core.util.PriceUtil;
 import haveno.core.util.coin.CoinFormatter;
 import haveno.core.util.validation.AmountValidator4Decimals;
 import haveno.core.util.validation.AmountValidator8Decimals;
@@ -76,6 +77,16 @@ public void initWithData(OfferPayload offerPayload) {
     public void activate() {
         super.activate();
         dataModel.populateData(offer);
+
+        long triggerPriceAsLong = dataModel.getTriggerPrice();
+        dataModel.setTriggerPrice(triggerPriceAsLong);
+        if (triggerPriceAsLong > 0) {
+            triggerPrice.set(PriceUtil.formatMarketPrice(triggerPriceAsLong, dataModel.getCurrencyCode()));
+        } else {
+            triggerPrice.set("");
+        }
+        onTriggerPriceTextFieldChanged();
+
         triggerFocusOutOnAmountFields();
         onFocusOutPriceAsPercentageTextField(true, false);
     }

desktop/src/main/java/haveno/desktop/main/portfolio/editoffer/EditOfferDataModel.java

@@ -137,6 +137,9 @@ public void applyOpenOffer(OpenOffer openOffer) {
             securityDepositPct.set(securityDepositPercent);
 
         allowAmountUpdate = false;
+
+        triggerPrice = openOffer.getTriggerPrice();
+        extraInfo.set(offer.getOfferExtraInfo());
     }
 
     @Override
@@ -164,10 +167,10 @@ public void populateData() {
         setPrice(offer.getPrice());
         setVolume(offer.getVolume());
         setUseMarketBasedPrice(offer.isUseMarketBasedPrice());
-        setTriggerPrice(openOffer.getTriggerPrice());
         if (offer.isUseMarketBasedPrice()) {
             setMarketPriceMarginPct(offer.getMarketPriceMarginPct());
         }
+        setTriggerPrice(openOffer.getTriggerPrice());
         setExtraInfo(offer.getOfferExtraInfo());
     }