Merge pull request #3442 from chimp1984/fix-vote-result-view-update

Fix bug with not updating vote result table at vote result block
bisq-network · Oct 23, 2019 · e0f0cf3 · e0f0cf3
2 parents 8b9415f + 94f33d2
commit e0f0cf3
Showing 1 changed file with 23 additions and 3 deletions.
diff --git a/desktop/src/main/java/bisq/desktop/main/dao/governance/result/VoteResultView.java b/desktop/src/main/java/bisq/desktop/main/dao/governance/result/VoteResultView.java
@@ -48,6 +48,7 @@
 import bisq.core.dao.state.model.governance.CompensationProposal;
 import bisq.core.dao.state.model.governance.ConfiscateBondProposal;
 import bisq.core.dao.state.model.governance.Cycle;
+import bisq.core.dao.state.model.governance.DaoPhase;
 import bisq.core.dao.state.model.governance.DecryptedBallotsWithMerits;
 import bisq.core.dao.state.model.governance.EvaluatedProposal;
 import bisq.core.dao.state.model.governance.Proposal;
@@ -200,7 +201,10 @@ protected void activate() {
         daoFacade.addBsqStateListener(this);
         cyclesTableView.getSelectionModel().selectedItemProperty().addListener(selectedVoteResultListItemListener);
 
-        fillCycleList();
+        if (daoStateService.isParseBlockChainComplete()) {
+            fillCycleList();
+        }
+
         exportButton.setOnAction(event -> {
             JsonElement cyclesJsonArray = getVotingHistoryJson();
             GUIUtil.exportJSON("voteResultsHistory.json", cyclesJsonArray, (Stage) root.getScene().getWindow());
@@ -234,6 +238,20 @@ protected void deactivate() {
 
     @Override
     public void onParseBlockCompleteAfterBatchProcessing(Block block) {
+        int chainHeight = daoStateService.getChainHeight();
+        if (periodService.getFirstBlockOfPhase(chainHeight, DaoPhase.Phase.RESULT) == chainHeight) {
+            // We had set the cycle initially but at the vote result we want to update it with the actual result.
+            // We remove the empty cycle to make space for the one with the result.
+            Optional<Cycle> optionalCurrentCycle = cyclesAdded.stream()
+                    .filter(cycle -> cycle.isInCycle(chainHeight))
+                    .findAny();
+            optionalCurrentCycle.ifPresent(cyclesAdded::remove);
+            Optional<CycleListItem> optionalCurrentCycleListItem = cycleListItemList.stream()
+                    .filter(cycleListItem -> cycleListItem.getResultsOfCycle().getCycle().isInCycle(chainHeight))
+                    .findAny();
+            optionalCurrentCycleListItem.ifPresent(cycleListItemList::remove);
+        }
+
         fillCycleList();
     }
 
@@ -351,8 +369,10 @@ private void onSelectProposalResultListItem(ProposalListItem item) {
         }
     }
 
-    private void showProposalResultWindow(EvaluatedProposal evaluatedProposal, Ballot ballot,
-                                          boolean isVoteIncludedInResult, SortedList<VoteListItem> sortedVoteListItemList) {
+    private void showProposalResultWindow(EvaluatedProposal evaluatedProposal,
+                                          Ballot ballot,
+                                          boolean isVoteIncludedInResult,
+                                          SortedList<VoteListItem> sortedVoteListItemList) {
         proposalResultsWindow.show(evaluatedProposal, ballot, isVoteIncludedInResult, sortedVoteListItemList);
     }