Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Edit offer button #5955

Merged
merged 2 commits into from Jan 12, 2022
Merged

Edit offer button #5955

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0ab0aed
Edit offer button
Jan 8, 2022
949d5eb
Minor refactorings
ripcurlx Jan 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 5 additions & 1 deletion desktop/src/main/java/bisq/desktop/main/offer/offerbook/OfferBookView.java
View file
Open in desktop
Expand Up @@ -60,6 +60,7 @@
import bisq.core.offer.OfferDirection;
import bisq.core.offer.OfferFilterService;
import bisq.core.offer.OfferRestrictions;
import bisq.core.offer.OpenOffer;
import bisq.core.payment.PaymentAccount;
import bisq.core.payment.payload.PaymentMethod;
import bisq.core.user.DontShowAgainLookup;
Expand Down Expand Up @@ -735,7 +736,10 @@ private void onRemoveOpenOffer(Offer offer) {
}

private void onEditOpenOffer(Offer offer) {
navigation.navigateToWithData(offer, MainView.class, PortfolioView.class, EditOfferView.class);
OpenOffer openOffer = model.getOpenOffer(offer);
if (openOffer != null) {
navigation.navigateToWithData(openOffer, MainView.class, PortfolioView.class, EditOfferView.class);
}
}

private void doRemoveOffer(Offer offer) {
Expand Down
5 changes: 5 additions & 0 deletions desktop/src/main/java/bisq/desktop/main/offer/offerbook/OfferBookViewModel.java
View file
Open in desktop
Expand Up @@ -42,6 +42,7 @@
import bisq.core.offer.Offer;
import bisq.core.offer.OfferDirection;
import bisq.core.offer.OfferFilterService;
import bisq.core.offer.OpenOffer;
import bisq.core.offer.OpenOfferManager;
import bisq.core.payment.PaymentAccount;
import bisq.core.payment.PaymentAccountUtil;
Expand Down Expand Up @@ -711,4 +712,8 @@ private void updateSelectedTradeCurrency() {
}
tradeCurrencyCode.set(selectedTradeCurrency.getCode());
}

public OpenOffer getOpenOffer(Offer offer) {
return openOfferManager.getOpenOfferById(offer.getId()).orElse(null);
}
}
7 changes: 2 additions & 5 deletions desktop/src/main/java/bisq/desktop/main/portfolio/PortfolioView.java
View file
Open in desktop
Expand Up @@ -32,7 +32,6 @@
import bisq.desktop.main.portfolio.pendingtrades.PendingTradesView;

import bisq.core.locale.Res;
import bisq.core.offer.Offer;
import bisq.core.offer.OpenOffer;
import bisq.core.offer.OpenOfferManager;
import bisq.core.offer.bisq_v1.OfferPayload;
Expand Down Expand Up @@ -143,7 +142,6 @@ private void onEditOpenOfferRemoved() {
editOfferView = null;
}

// navigation.navigateToPreviousVisitedView();
navigation.navigateTo(MainView.class, this.getClass(), OpenOffersView.class);
}

Expand Down Expand Up @@ -215,9 +213,8 @@ private void loadView(Class<? extends View> viewClass, @Nullable Object data) {
} else if (view instanceof FailedTradesView) {
currentTab = failedTradesTab;
} else if (view instanceof EditOfferView) {
if (data instanceof Offer) {
Offer offer = (Offer) data;
openOffer = openOfferManager.getOpenOfferById(offer.getId()).orElse(null);
if (data instanceof OpenOffer) {
openOffer = (OpenOffer) data;
}
if (openOffer != null) {
if (editOfferView == null) {
Expand Down