mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-03-03 10:46:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

Code review changes.

Browse source 
Pick a more user friendly name instead of OCO.
Clean up code.
This commit is contained in:
jmacxx 2023-04-07 09:31:30 -05:00 • committed by HenrikJannsen
parent 27dcec00e9
commit e66517fb8a
No known key found for this signature in database
GPG key ID: 02AA2BAE387C8307
2 changed files with 10 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -101,7 +101,7 @@ shared.removeOffer=Remove offer
shared.dontRemoveOffer=Don't remove offer
shared.editOffer=Edit offer
shared.duplicateOffer=Duplicate offer
shared.duplicateOcoOffer=Duplicate as OCO
shared.cloneGroupedOfferOco=Clone as Grouped Offer
shared.openLargeQRWindow=Open large QR code window
shared.chooseTradingAccount=Choose trading account
shared.faq=Visit FAQ page

21
desktop/src/main/java/bisq/desktop/main/portfolio/openoffer/OpenOffersView.java
View file

@ -223,13 +223,13 @@ public class OpenOffersView extends ActivatableViewAndModel<VBox, OpenOffersView
final ContextMenu rowMenu = new ContextMenu();
MenuItem duplicateItem = new MenuItem(Res.get("portfolio.context.offerLikeThis"));
duplicateItem.setOnAction((event) -> onDuplicateOffer(row.getItem()));
MenuItem duplicateItemOco1 = new MenuItem(Res.get("shared.duplicateOcoOffer"));
duplicateItemOco1.setOnAction((event) -> onDuplicateOfferOco(row.getItem(), 1));
MenuItem duplicateItemOco5 = new MenuItem(Res.get("shared.duplicateOcoOffer") + " x5");
duplicateItemOco5.setOnAction((event) -> onDuplicateOfferOco(row.getItem(), 5));
MenuItem cloneGroupedOfferOco1 = new MenuItem(Res.get("shared.cloneGroupedOfferOco"));
cloneGroupedOfferOco1.setOnAction((event) -> onDuplicateOfferOco(row.getItem(), 1));
MenuItem cloneGroupedOfferOco5 = new MenuItem(Res.get("shared.cloneGroupedOfferOco") + " x5");
cloneGroupedOfferOco5.setOnAction((event) -> onDuplicateOfferOco(row.getItem(), 5));
rowMenu.getItems().add(duplicateItem);
rowMenu.getItems().add(duplicateItemOco1);
rowMenu.getItems().add(duplicateItemOco5);
rowMenu.getItems().add(cloneGroupedOfferOco1);
rowMenu.getItems().add(cloneGroupedOfferOco5);
row.contextMenuProperty().bind(
Bindings.when(Bindings.isNotNull(row.itemProperty()))
.then(rowMenu)
@ -449,9 +449,8 @@ public class OpenOffersView extends ActivatableViewAndModel<VBox, OpenOffersView
}
private void onDuplicateOfferOco(OpenOfferListItem item, int numDuplicates) {
try {
for (int i=0; i< numDuplicates; i++) {
OfferPayload original = item.getOffer().getOfferPayload().orElseThrow();
for (int i=0; i< numDuplicates; i++) {
item.getOffer().getOfferPayload().ifPresent(original -> {
log.info("Duplicating offer as OCO: {}", original.getId());
String newOfferId = getRandomOfferId();
OfferPayload offerPayload = new OfferPayload(newOfferId,
@ -501,9 +500,7 @@ public class OpenOffersView extends ActivatableViewAndModel<VBox, OpenOffersView
transaction -> {
},
log::error);
}
} catch (NullPointerException e) {
log.warn("Unable to get offerPayload - {}", e.toString());
});
}
}