mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-02-22 14:42:37 +01:00
Code Issues Projects Releases Packages Wiki Activity

Improve handling of editing of offers with invalid security deposit

Browse source
This commit is contained in:
Christoph Atteneder 2019-04-18 14:45:23 +02:00
parent 2119872c9b
commit 8481593370
No known key found for this signature in database
GPG key ID: CD5DC1C529CDFD3B
4 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
core/src/main/resources/i18n/displayStrings.properties
View file

@ -493,6 +493,7 @@ editOffer.confirmEdit=Confirm: Edit offer
editOffer.publishOffer=Publishing your offer. editOffer.publishOffer=Publishing your offer.
editOffer.failed=Editing of offer failed:\n{0} editOffer.failed=Editing of offer failed:\n{0}
editOffer.success=Your offer has been successfully edited. editOffer.success=Your offer has been successfully edited.
editOffer.invalidDeposit=The buyer's security deposit is not within the constraints defined by the Bisq DAO and can no longer be edited.
#################################################################### ####################################################################
# Portfolio # Portfolio

4
desktop/src/main/java/bisq/desktop/main/offer/MutableOfferViewModel.java
View file

@ -84,7 +84,7 @@ import static javafx.beans.binding.Bindings.createStringBinding;
public abstract class MutableOfferViewModel<M extends MutableOfferDataModel> extends ActivatableWithDataModel<M> { public abstract class MutableOfferViewModel<M extends MutableOfferDataModel> extends ActivatableWithDataModel<M> {
private final BtcValidator btcValidator; private final BtcValidator btcValidator;
private final BsqValidator bsqValidator; private final BsqValidator bsqValidator;
private final SecurityDepositValidator securityDepositValidator; protected final SecurityDepositValidator securityDepositValidator;
private final P2PService p2PService; private final P2PService p2PService;
private final WalletsSetup walletsSetup; private final WalletsSetup walletsSetup;
private final PriceFeedService priceFeedService; private final PriceFeedService priceFeedService;
@ -104,7 +104,7 @@ public abstract class MutableOfferViewModel<M extends MutableOfferDataModel> ext
public final StringProperty amount = new SimpleStringProperty(); public final StringProperty amount = new SimpleStringProperty();
public final StringProperty minAmount = new SimpleStringProperty(); public final StringProperty minAmount = new SimpleStringProperty();
final StringProperty buyerSecurityDeposit = new SimpleStringProperty(); protected final StringProperty buyerSecurityDeposit = new SimpleStringProperty();
final StringProperty buyerSecurityDepositInBTC = new SimpleStringProperty(); final StringProperty buyerSecurityDepositInBTC = new SimpleStringProperty();
final StringProperty buyerSecurityDepositLabel = new SimpleStringProperty(); final StringProperty buyerSecurityDepositLabel = new SimpleStringProperty();

10
desktop/src/main/java/bisq/desktop/main/portfolio/editoffer/EditOfferView.java
View file

@ -148,11 +148,15 @@ public class EditOfferView extends MutableOfferView<EditOfferViewModel> {
model.onStartEditOffer(errorMessage -> { model.onStartEditOffer(errorMessage -> {
log.error(errorMessage); log.error(errorMessage);
new Popup<>().warning(Res.get("editOffer.failed", errorMessage)) new Popup<>().warning(Res.get("editOffer.failed", errorMessage))
.onClose(() -> { .onClose(this::close)
close();
})
.show(); .show();
}); });
if (!model.isSecurityDepositValid()) {
new Popup<>().warning(Res.get("editOffer.invalidDeposit"))
.onClose(this::close)
.show();
}
} }
/////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////

4
desktop/src/main/java/bisq/desktop/main/portfolio/editoffer/EditOfferViewModel.java
View file

@ -80,4 +80,8 @@ class EditOfferViewModel extends MutableOfferViewModel<EditOfferDataModel> {
price.set(btcFormatter.formatPrice(null)); price.set(btcFormatter.formatPrice(null));
price.set(btcFormatter.formatPrice(dataModel.getPrice().get())); price.set(btcFormatter.formatPrice(dataModel.getPrice().get()));
} }
public boolean isSecurityDepositValid() {
return securityDepositValidator.validate(buyerSecurityDeposit.get()).isValid;
}
} }