Check for result phase at activate method

Fixes bisq-network#3487
chimp1984 · Oct 28, 2019 · 09e68fa · 09e68fa
1 parent b9dbf8f
commit 09e68fa
Showing 1 changed file with 6 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
@@ -202,6 +202,7 @@ protected void activate() {
         cyclesTableView.getSelectionModel().selectedItemProperty().addListener(selectedVoteResultListItemListener);
 
         if (daoStateService.isParseBlockChainComplete()) {
+            checkForResultPhase(daoStateService.getChainHeight());
             fillCycleList();
         }
 
@@ -238,7 +239,11 @@ protected void deactivate() {
 
     @Override
     public void onParseBlockCompleteAfterBatchProcessing(Block block) {
-        int chainHeight = daoStateService.getChainHeight();
+        checkForResultPhase(daoStateService.getChainHeight());
+        fillCycleList();
+    }
+
+    private void checkForResultPhase(int chainHeight) {
         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.
@@ -251,8 +256,6 @@ public void onParseBlockCompleteAfterBatchProcessing(Block block) {
                     .findAny();
             optionalCurrentCycleListItem.ifPresent(cycleListItemList::remove);
         }
-
-        fillCycleList();
     }