From e3ccb3c895141d2cf692a9e5e28c38e6404be304 Mon Sep 17 00:00:00 2001
From: xyzmaker123 <xyzmaker123@protonmail.com>
Date: Sun, 14 Aug 2022 21:18:11 +0200
Subject: [PATCH] Updating DAO->Governance menu to indicate vote possible

---
 .../main/dao/governance/GovernanceView.java   | 29 +++++++++++--------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/desktop/src/main/java/bisq/desktop/main/dao/governance/GovernanceView.java b/desktop/src/main/java/bisq/desktop/main/dao/governance/GovernanceView.java
index 6d0c6eaa56d..aaf6b0851f2 100644
--- a/desktop/src/main/java/bisq/desktop/main/dao/governance/GovernanceView.java
+++ b/desktop/src/main/java/bisq/desktop/main/dao/governance/GovernanceView.java
@@ -46,7 +46,8 @@
 import javafx.scene.layout.AnchorPane;
 import javafx.scene.layout.VBox;
 
-import javafx.beans.value.ChangeListener;
+import org.fxmisc.easybind.EasyBind;
+import org.fxmisc.easybind.Subscription;
 
 import java.util.Arrays;
 import java.util.List;
@@ -67,7 +68,7 @@ public class GovernanceView extends ActivatableView<AnchorPane, Void> implements
     private AnchorPane content;
 
     private Class<? extends View> selectedViewClass;
-    private ChangeListener<DaoPhase.Phase> phaseChangeListener;
+    private Subscription phaseChangeSubscription;
     private ToggleGroup toggleGroup;
 
     @Inject
@@ -89,13 +90,6 @@ public void initialize() {
             loadView(selectedViewClass);
         };
 
-        phaseChangeListener = (observable, oldValue, newValue) -> {
-            if (newValue == DaoPhase.Phase.BLIND_VOTE)
-                open.setLabelText(Res.get("dao.proposal.menuItem.vote"));
-            else
-                open.setLabelText(Res.get("dao.proposal.menuItem.browse"));
-        };
-
         toggleGroup = new ToggleGroup();
         List<Class<? extends View>> baseNavPath = Arrays.asList(MainView.class, DaoView.class, GovernanceView.class);
         dashboard = new MenuItem(navigation, toggleGroup, Res.get("shared.dashboard"),
@@ -113,7 +107,7 @@ public void initialize() {
     @Override
     protected void activate() {
         if (daoStateService.isParseBlockChainComplete()) {
-            daoFacade.phaseProperty().addListener(phaseChangeListener);
+            phaseChangeSubscription = EasyBind.subscribe(daoFacade.phaseProperty(), this::setupOpenMenuButtonText);
         } else {
             daoStateService.addDaoStateListener(this);
         }
@@ -142,7 +136,10 @@ protected void activate() {
     @SuppressWarnings("Duplicates")
     @Override
     protected void deactivate() {
-        daoFacade.phaseProperty().removeListener(phaseChangeListener);
+        if (phaseChangeSubscription != null) {
+            phaseChangeSubscription.unsubscribe();
+        }
+
         daoStateService.removeDaoStateListener(this);
 
         navigation.removeListener(navigationListener);
@@ -160,7 +157,7 @@ protected void deactivate() {
 
     @Override
     public void onParseBlockChainComplete() {
-        daoFacade.phaseProperty().addListener(phaseChangeListener);
+        phaseChangeSubscription = EasyBind.subscribe(daoFacade.phaseProperty(), this::setupOpenMenuButtonText);
     }
 
 
@@ -177,6 +174,14 @@ private void loadView(Class<? extends View> viewClass) {
         else if (view instanceof ProposalsView) toggleGroup.selectToggle(open);
         else if (view instanceof VoteResultView) toggleGroup.selectToggle(result);
     }
+
+    private void setupOpenMenuButtonText(DaoPhase.Phase phase) {
+        if (phase == DaoPhase.Phase.BLIND_VOTE) {
+            open.setLabelText(Res.get("dao.proposal.menuItem.vote"));
+        } else {
+            open.setLabelText(Res.get("dao.proposal.menuItem.browse"));
+        }
+    }
 }