Git-Mirrors/haveno
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2025-04-06 21:13:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

populate extra info on duplicate or edit offer

Browse Source
This commit is contained in:
woodser 2025-04-03 20:31:06 -04:00
parent 9bd4f70d02
commit 9080400e1c
No known key found for this signature in database
GPG Key ID: 55A10DD48ADEE5EF
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
desktop/src/main/java/haveno/desktop/main/offer/MutableOfferViewModel.java
View File

@ -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();
}
}

3
desktop/src/main/java/haveno/desktop/main/portfolio/duplicateoffer/DuplicateOfferDataModel.java
View File

@ -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) {

2
desktop/src/main/java/haveno/desktop/main/portfolio/editoffer/EditOfferDataModel.java
View File

@ -137,6 +137,8 @@ class EditOfferDataModel extends MutableOfferDataModel {
securityDepositPct.set(securityDepositPercent);
allowAmountUpdate = false;
extraInfo.set(offer.getOfferExtraInfo());
}
@Override