Extract reusable code to baseService. Add more validation

This commit is contained in:
Manfred Karrer 2018-04-07 12:08:33 -05:00
parent 316a305f53
commit 3003964bf3
No known key found for this signature in database
GPG key ID: 401250966A6B2C46
2 changed files with 2 additions and 2 deletions

View file

@ -131,7 +131,7 @@ public class ProposalListItem implements BsqBlockChain.Listener {
case UNDEFINED: case UNDEFINED:
break; break;
case PROPOSAL: case PROPOSAL:
if (proposalService.isMine(proposal)) { if (proposalService.isMine(proposal.getProposalPayload())) {
actionButton.setVisible(!isTxInPastCycle); actionButton.setVisible(!isTxInPastCycle);
actionButtonIconView.setVisible(actionButton.isVisible()); actionButtonIconView.setVisible(actionButton.isVisible());
actionButton.setText(Res.get("shared.remove")); actionButton.setText(Res.get("shared.remove"));

View file

@ -266,7 +266,7 @@ public class ActiveProposalsView extends BaseProposalView implements BsqBalanceL
final Proposal proposal = selectedProposalListItem.getProposal(); final Proposal proposal = selectedProposalListItem.getProposal();
switch (phase) { switch (phase) {
case PROPOSAL: case PROPOSAL:
if (proposalService.isMine(proposal)) { if (proposalService.isMine(proposal.getProposalPayload())) {
if (removeButton == null) { if (removeButton == null) {
removeButton = addButtonAfterGroup(detailsGridPane, proposalDisplay.incrementAndGetGridRow(), Res.get("dao.proposal.active.remove")); removeButton = addButtonAfterGroup(detailsGridPane, proposalDisplay.incrementAndGetGridRow(), Res.get("dao.proposal.active.remove"));
removeButton.setOnAction(event -> onRemove()); removeButton.setOnAction(event -> onRemove());