From dc015ad83d1674263e8eaab4942fb0734994fae5 Mon Sep 17 00:00:00 2001 From: woodser Date: Sat, 10 Feb 2024 06:06:58 -0500 Subject: [PATCH] show offer funding address entries in receive view --- core/src/main/java/haveno/core/xmr/model/XmrAddressEntry.java | 4 ---- .../java/haveno/desktop/main/funds/deposit/DepositView.java | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/core/src/main/java/haveno/core/xmr/model/XmrAddressEntry.java b/core/src/main/java/haveno/core/xmr/model/XmrAddressEntry.java index 43e007bb..025d6cda 100644 --- a/core/src/main/java/haveno/core/xmr/model/XmrAddressEntry.java +++ b/core/src/main/java/haveno/core/xmr/model/XmrAddressEntry.java @@ -44,10 +44,6 @@ public final class XmrAddressEntry implements PersistablePayload { AVAILABLE, OFFER_FUNDING, TRADE_PAYOUT; - - public boolean isReserved() { - return this == Context.OFFER_FUNDING || this == Context.TRADE_PAYOUT; - } } // keyPair can be null in case the object is created from deserialization as it is transient. diff --git a/desktop/src/main/java/haveno/desktop/main/funds/deposit/DepositView.java b/desktop/src/main/java/haveno/desktop/main/funds/deposit/DepositView.java index 19344b3a..17321b91 100644 --- a/desktop/src/main/java/haveno/desktop/main/funds/deposit/DepositView.java +++ b/desktop/src/main/java/haveno/desktop/main/funds/deposit/DepositView.java @@ -326,7 +326,7 @@ public class DepositView extends ActivatableView { List addressEntries = xmrWalletService.getAddressEntries(); List items = new ArrayList<>(); for (XmrAddressEntry addressEntry : addressEntries) { - if (addressEntry.getContext().isReserved()) continue; + if (addressEntry.isTrade()) continue; // skip reserved for trade items.add(new DepositListItem(addressEntry, xmrWalletService, formatter, txsWithIncomingOutputs, subaddresses)); }