Add support to duplicate BSQ swap offers #5886

ripcurlx · 2021-12-02T12:42:44Z

As BSQ swap offers have their own creation form I didn't want to bloat the duplicate offer tab, but rather re-use the create offer form.

ghost · 2021-12-02T19:49:09Z

@ripcurlx ACK for invocation from Open Offers.
It should work the same from History. Looks like it was an issue even before this PR, FWIW.

Dec-02 13:40:13.522 [JavaFX Application Thread] ERROR bisq.common.setup.CommonSetup: Uncaught Exception from thread JavaFX Application Thread 
Dec-02 13:40:13.523 [JavaFX Application Thread] ERROR bisq.common.setup.CommonSetup: throwableMessage= No value present 
Dec-02 13:40:13.523 [JavaFX Application Thread] ERROR bisq.common.setup.CommonSetup: throwableClass= class java.util.NoSuchElementException 
Dec-02 13:40:13.524 [JavaFX Application Thread] ERROR bisq.common.setup.CommonSetup: Stack trace:
java.util.NoSuchElementException: No value present
    at java.base/java.util.Optional.orElseThrow(Optional.java:382)
    at bisq.desktop.main.portfolio.closedtrades.ClosedTradesView.lambda$initialize$10(ClosedTradesView.java:268)
    at com.sun.javafx.event.CompositeEventHandler.dispatchBubblingEvent(CompositeEventHandler.java:86)
    at com.sun.javafx.event.EventHandlerManager.dispatchBubblingEvent(EventHandlerManager.java:234)
    at com.sun.javafx.event.EventHandlerManager.dispatchBubblingEvent(EventHandlerManager.java:191)
    at com.sun.javafx.event.BasicEventDispatcher.dispatchEvent(BasicEventDispatcher.java:58)
    at com.sun.javafx.event.EventDispatchChainImpl.dispatchEvent(EventDispatchChainImpl.java:114)
    at com.sun.javafx.event.EventUtil.fireEventImpl(EventUtil.java:74)
    at com.sun.javafx.event.EventUtil.fireEvent(EventUtil.java:49)
    at javafx.event.Event.fireEvent(Event.java:198)
    at javafx.scene.control.MenuItem.fire(MenuItem.java:459)
    at com.sun.javafx.scene.control.ContextMenuContent$MenuItemContainer.doSelect(ContextMenuContent.java:1385)
    at com.sun.javafx.scene.control.ContextMenuContent$MenuItemContainer.lambda$createChildren$12(ContextMenuContent.java:1338)

ripcurlx · 2021-12-03T10:27:06Z

@ripcurlx ACK for invocation from Open Offers. It should work the same from History. Looks like it was an issue even before this PR, FWIW.

Dec-02 13:40:13.522 [JavaFX Application Thread] ERROR bisq.common.setup.CommonSetup: Uncaught Exception from thread JavaFX Application Thread 
Dec-02 13:40:13.523 [JavaFX Application Thread] ERROR bisq.common.setup.CommonSetup: throwableMessage= No value present 
Dec-02 13:40:13.523 [JavaFX Application Thread] ERROR bisq.common.setup.CommonSetup: throwableClass= class java.util.NoSuchElementException 
Dec-02 13:40:13.524 [JavaFX Application Thread] ERROR bisq.common.setup.CommonSetup: Stack trace:
java.util.NoSuchElementException: No value present
    at java.base/java.util.Optional.orElseThrow(Optional.java:382)
    at bisq.desktop.main.portfolio.closedtrades.ClosedTradesView.lambda$initialize$10(ClosedTradesView.java:268)
    at com.sun.javafx.event.CompositeEventHandler.dispatchBubblingEvent(CompositeEventHandler.java:86)
    at com.sun.javafx.event.EventHandlerManager.dispatchBubblingEvent(EventHandlerManager.java:234)
    at com.sun.javafx.event.EventHandlerManager.dispatchBubblingEvent(EventHandlerManager.java:191)
    at com.sun.javafx.event.BasicEventDispatcher.dispatchEvent(BasicEventDispatcher.java:58)
    at com.sun.javafx.event.EventDispatchChainImpl.dispatchEvent(EventDispatchChainImpl.java:114)
    at com.sun.javafx.event.EventUtil.fireEventImpl(EventUtil.java:74)
    at com.sun.javafx.event.EventUtil.fireEvent(EventUtil.java:49)
    at javafx.event.Event.fireEvent(Event.java:198)
    at javafx.scene.control.MenuItem.fire(MenuItem.java:459)
    at com.sun.javafx.scene.control.ContextMenuContent$MenuItemContainer.doSelect(ContextMenuContent.java:1385)
    at com.sun.javafx.scene.control.ContextMenuContent$MenuItemContainer.lambda$createChildren$12(ContextMenuContent.java:1338)

Missed to add it there as well ☝️
I'm thinking about adding an additional action column (copy icon) as well to make it more visible as mentioned by @chimp1984.

ripcurlx · 2021-12-03T10:29:04Z

Maybe only in History and and My open offers first, as within Open trades it might become a little bit confusing.

ripcurlx · 2021-12-03T11:04:22Z

I've added a copy icon column in Open offers and History to communicate the copy offer functionality more visually. I still kept the duplicate offer right click as it is also possible in pending offers which would just cause confusion if there is a duplicate offer column there as well.

ghost

ACK

chimp1984 · 2021-12-03T17:02:41Z

The top level enable toggle is not aligned:

chimp1984 · 2021-12-03T17:05:11Z

The duplicate icon is shown also for the taker in history. When clicking it shows a popup. Better to use that data to not show it in the first place IMO.

core/src/main/java/bisq/core/offer/bsq_swap/BsqSwapOfferModel.java

...src/main/java/bisq/desktop/main/offer/bsq_swap/create_offer/BsqSwapCreateOfferDataModel.java

desktop/src/main/java/bisq/desktop/main/offer/bsq_swap/create_offer/BsqSwapCreateOfferView.java

...src/main/java/bisq/desktop/main/offer/bsq_swap/create_offer/BsqSwapCreateOfferViewModel.java

chimp1984 · 2021-12-03T17:20:12Z

...src/main/java/bisq/desktop/main/offer/bsq_swap/create_offer/BsqSwapCreateOfferViewModel.java

@@ -572,6 +575,33 @@ private void updateButtonDisableState() {
        isPlaceOfferButtonDisabled.set(createOfferRequested || !inputDataValid || miningPoW.get());
    }

+    private void maybeInitializeWithData() {


Maybe rename to maybeApplyFromDuplicateOffer or the like, to make the use case more clear. I check if the offer is null at the caller would also help to make it more clear when its applied.

I kept the naming more general, as I though that there could be other use cases as well. Like some onboarding form in the future that automatic pre-fills a buy BSQ form.
Regarding the offer null check. Where do you want to see this?

I meant to have the if check for null could be done at the caller of maybeInitializeWithData and then its not a maybe anymore... but no strong opinion either... It just took a bit more effort to understand the code that ways as one need to jump to the method to see whats really going on there to see that its only an optional case if the param is null.

desktop/src/main/java/bisq/desktop/main/portfolio/closedtrades/ClosedTradesView.java

desktop/src/main/java/bisq/desktop/main/portfolio/duplicateoffer/DuplicateOfferView.java

desktop/src/main/java/bisq/desktop/main/portfolio/PortfolioView.java

ripcurlx · 2021-12-06T09:49:41Z

Just pushed the last alignment fix of the enable/disable all button

…ffer is duplicated

chimp1984

utACK

chimp1984 · 2021-12-06T17:50:35Z

Fixes #5774

bisq-github-admin-3

utACK - based on #5886 (review) and #5886 (review)

Add support to duplicate bsq swap offers

1606439

ripcurlx added this to the v1.8.0 milestone Dec 2, 2021

ripcurlx requested a review from chimp1984 December 2, 2021 12:49

Add support to duplicate bsq swap offers also in History view

6a384a7

Add visual icon for duplicate offer functionality

daf762f

ghost previously approved these changes Dec 3, 2021

View reviewed changes

chimp1984 suggested changes Dec 3, 2021

View reviewed changes

ripcurlx dismissed ghost ’s stale review via 3f66f60 December 6, 2021 09:42

ripcurlx force-pushed the add-bsq-swap-duplicate-offer-support branch from e0c9051 to c6c2ae5 Compare December 6, 2021 09:53

Apply suggestions and fix edge case when BSQ legacy payment account o…

a1ecf35

…ffer is duplicated

ripcurlx force-pushed the add-bsq-swap-duplicate-offer-support branch from c6c2ae5 to a1ecf35 Compare December 6, 2021 10:04

Make Codacy happy

d85373a

chimp1984 approved these changes Dec 6, 2021

View reviewed changes

bisq-github-admin-3 approved these changes Dec 7, 2021

View reviewed changes

bisq-github-admin-3 merged commit 5041dc5 into bisq-network:master Dec 7, 2021

ripcurlx mentioned this pull request Dec 20, 2021

For Cycle 31 bisq-network/compensation#966

Closed

ghost mentioned this pull request Jan 11, 2022

Make clone offer feature more visible #5774

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add support to duplicate BSQ swap offers #5886

Add support to duplicate BSQ swap offers #5886

ripcurlx commented Dec 2, 2021 •

edited

Loading

ghost commented Dec 2, 2021

ripcurlx commented Dec 3, 2021

ripcurlx commented Dec 3, 2021

ripcurlx commented Dec 3, 2021

ghost left a comment

chimp1984 commented Dec 3, 2021

chimp1984 commented Dec 3, 2021

chimp1984 Dec 3, 2021

ripcurlx Dec 6, 2021

chimp1984 Dec 6, 2021

ripcurlx commented Dec 6, 2021

chimp1984 left a comment

chimp1984 commented Dec 6, 2021

bisq-github-admin-3 left a comment

Add support to duplicate BSQ swap offers #5886

Add support to duplicate BSQ swap offers #5886

Conversation

ripcurlx commented Dec 2, 2021 • edited Loading

ghost commented Dec 2, 2021

ripcurlx commented Dec 3, 2021

ripcurlx commented Dec 3, 2021

ripcurlx commented Dec 3, 2021

ghost left a comment

Choose a reason for hiding this comment

chimp1984 commented Dec 3, 2021

chimp1984 commented Dec 3, 2021

chimp1984 Dec 3, 2021

Choose a reason for hiding this comment

ripcurlx Dec 6, 2021

Choose a reason for hiding this comment

chimp1984 Dec 6, 2021

Choose a reason for hiding this comment

ripcurlx commented Dec 6, 2021

chimp1984 left a comment

Choose a reason for hiding this comment

chimp1984 commented Dec 6, 2021

bisq-github-admin-3 left a comment

Choose a reason for hiding this comment

ripcurlx commented Dec 2, 2021 •

edited

Loading