boldsuck/haveno
1
0
Fork 0
mirror of https://github.com/boldsuck/haveno.git synced 2024-12-23 04:29:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

hide reserved subaddresses in deposit view

Browse source
This commit is contained in:
woodser 2023-11-29 10:28:28 -05:00
parent 84c08e4c36
commit f5d82df477
2 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
core/src/main/java/haveno/core/xmr/model/XmrAddressEntry.java
View file

@ -37,12 +37,17 @@ import java.util.Optional;
@EqualsAndHashCode @EqualsAndHashCode
@Slf4j @Slf4j
public final class XmrAddressEntry implements PersistablePayload { public final class XmrAddressEntry implements PersistablePayload {
public enum Context { public enum Context {
ARBITRATOR, ARBITRATOR,
BASE_ADDRESS, BASE_ADDRESS,
AVAILABLE, AVAILABLE,
OFFER_FUNDING, OFFER_FUNDING,
TRADE_PAYOUT 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. // keyPair can be null in case the object is created from deserialization as it is transient.

8
desktop/src/main/java/haveno/desktop/main/funds/deposit/DepositView.java
View file

@ -320,9 +320,11 @@ public class DepositView extends ActivatableView<VBox, Void> {
observableList.forEach(DepositListItem::cleanup); observableList.forEach(DepositListItem::cleanup);
observableList.clear(); observableList.clear();
// add address entries // add non-reserved address entries
xmrWalletService.getAddressEntries() for (XmrAddressEntry addressEntry : xmrWalletService.getAddressEntries()) {
.forEach(e -> observableList.add(new DepositListItem(e, xmrWalletService, formatter, txsWithIncomingOutputs))); if (addressEntry.getContext().isReserved()) continue;
observableList.add(new DepositListItem(addressEntry, xmrWalletService, formatter, txsWithIncomingOutputs));
}
} }
private Coin getAmount() { private Coin getAmount() {