From 3003964bf3e94aa08ba2e81a003dccf87012b566 Mon Sep 17 00:00:00 2001 From: Manfred Karrer Date: Sat, 7 Apr 2018 12:08:33 -0500 Subject: [PATCH] Extract reusable code to baseService. Add more validation --- .../java/bisq/desktop/main/dao/proposal/ProposalListItem.java | 2 +- .../desktop/main/dao/proposal/active/ActiveProposalsView.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/bisq/desktop/main/dao/proposal/ProposalListItem.java b/src/main/java/bisq/desktop/main/dao/proposal/ProposalListItem.java index 8d8bedcf22..3d038016c1 100644 --- a/src/main/java/bisq/desktop/main/dao/proposal/ProposalListItem.java +++ b/src/main/java/bisq/desktop/main/dao/proposal/ProposalListItem.java @@ -131,7 +131,7 @@ public class ProposalListItem implements BsqBlockChain.Listener { case UNDEFINED: break; case PROPOSAL: - if (proposalService.isMine(proposal)) { + if (proposalService.isMine(proposal.getProposalPayload())) { actionButton.setVisible(!isTxInPastCycle); actionButtonIconView.setVisible(actionButton.isVisible()); actionButton.setText(Res.get("shared.remove")); diff --git a/src/main/java/bisq/desktop/main/dao/proposal/active/ActiveProposalsView.java b/src/main/java/bisq/desktop/main/dao/proposal/active/ActiveProposalsView.java index 49b0a0c1cb..0140680004 100644 --- a/src/main/java/bisq/desktop/main/dao/proposal/active/ActiveProposalsView.java +++ b/src/main/java/bisq/desktop/main/dao/proposal/active/ActiveProposalsView.java @@ -266,7 +266,7 @@ public class ActiveProposalsView extends BaseProposalView implements BsqBalanceL final Proposal proposal = selectedProposalListItem.getProposal(); switch (phase) { case PROPOSAL: - if (proposalService.isMine(proposal)) { + if (proposalService.isMine(proposal.getProposalPayload())) { if (removeButton == null) { removeButton = addButtonAfterGroup(detailsGridPane, proposalDisplay.incrementAndGetGridRow(), Res.get("dao.proposal.active.remove")); removeButton.setOnAction(event -> onRemove());