From e66517fb8af6e3c67b0f2de0a6f5a4a9fe195501 Mon Sep 17 00:00:00 2001
From: jmacxx <47253594+jmacxx@users.noreply.github.com>
Date: Fri, 7 Apr 2023 09:31:30 -0500
Subject: [PATCH] Code review changes. Pick a more user friendly name instead
 of OCO. Clean up code.

---
 .../resources/i18n/displayStrings.properties  |  2 +-
 .../portfolio/openoffer/OpenOffersView.java   | 21 ++++++++-----------
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/core/src/main/resources/i18n/displayStrings.properties b/core/src/main/resources/i18n/displayStrings.properties
index fed8371eb0..a914172bf0 100644
--- a/core/src/main/resources/i18n/displayStrings.properties
+++ b/core/src/main/resources/i18n/displayStrings.properties
@@ -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
diff --git a/desktop/src/main/java/bisq/desktop/main/portfolio/openoffer/OpenOffersView.java b/desktop/src/main/java/bisq/desktop/main/portfolio/openoffer/OpenOffersView.java
index 3d2555c163..1b80069463 100644
--- a/desktop/src/main/java/bisq/desktop/main/portfolio/openoffer/OpenOffersView.java
+++ b/desktop/src/main/java/bisq/desktop/main/portfolio/openoffer/OpenOffersView.java
@@ -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());
+            });
         }
     }