From 7513d1da491884d69465c2398c4d66d5216e14f3 Mon Sep 17 00:00:00 2001
From: Fim-84 <marcus.stenberg@gmail.com>
Date: Mon, 4 Sep 2023 16:05:25 +0200
Subject: [PATCH 01/10] Started work on voting tab in janus

---
 .../controller/MainWindowController.java      |  9 +++-
 .../janus/controller/VoteController.java      | 42 +++++++++++++++++++
 .../org/unigrid/janus/view/mainWindow.fxml    | 38 ++++++++++++++++-
 .../org/unigrid/janus/view/vote.fxml          | 42 +++++++++++++++++++
 4 files changed, 129 insertions(+), 2 deletions(-)
 create mode 100644 fx/src/main/java/org/unigrid/janus/controller/VoteController.java
 create mode 100644 fx/src/main/resources/org/unigrid/janus/view/vote.fxml

diff --git a/fx/src/main/java/org/unigrid/janus/controller/MainWindowController.java b/fx/src/main/java/org/unigrid/janus/controller/MainWindowController.java
index 66d8de26..b2c0be99 100644
--- a/fx/src/main/java/org/unigrid/janus/controller/MainWindowController.java
+++ b/fx/src/main/java/org/unigrid/janus/controller/MainWindowController.java
@@ -65,12 +65,14 @@ public class MainWindowController implements Initializable, PropertyChangeListen
 	@FXML private ToggleButton btnAddress;
 	@FXML private ToggleButton btnDocs;
 	@FXML private ToggleButton btnSettings;
+	@FXML private ToggleButton btnVote;
 	@FXML private VBox pnlWallet;
 	@FXML private VBox pnlTransactions;
 	@FXML private VBox pnlNodes;
 	@FXML private VBox pnlAddress;
 	@FXML private VBox pnlSettings;
 	@FXML private VBox pnlDocs;
+	@FXML private VBox pnlVote;
 	@FXML private AnchorPane pnlOverlay;
 	@FXML private AnchorPane pnlWarning;
 	@FXML private FontIcon lockBtn;
@@ -142,7 +144,12 @@ private void onSettingsTap(MouseEvent event) {
 		}
 		select(pnlSettings, btnSettings);
 	}
-
+	
+	@FXML
+	private void onVoteClicked(MouseEvent event) {
+		select(pnlVote, btnVote);
+	}
+	
 	@Override
 	public void propertyChange(PropertyChangeEvent event) {
 		if (event.getPropertyName().equals(wallet.BLOCKS_PROPERTY)) {
diff --git a/fx/src/main/java/org/unigrid/janus/controller/VoteController.java b/fx/src/main/java/org/unigrid/janus/controller/VoteController.java
new file mode 100644
index 00000000..75a9385d
--- /dev/null
+++ b/fx/src/main/java/org/unigrid/janus/controller/VoteController.java
@@ -0,0 +1,42 @@
+/*
+	The Janus Wallet
+	Copyright © 2021-2022 The Unigrid Foundation, UGD Software AB
+
+	This program is free software: you can redistribute it and/or modify it under the terms of the
+	addended GNU Affero General Public License as published by the Free Software Foundation, version 3
+	of the License (see COPYING and COPYING.addendum).
+
+	This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
+	even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+	GNU Affero General Public License for more details.
+
+	You should have received an addended copy of the GNU Affero General Public License with this program.
+	If not, see <http://www.gnu.org/licenses/> and <https://github.com/unigrid-project/janus-java>.
+ */
+
+package org.unigrid.janus.controller;
+
+import jakarta.enterprise.context.ApplicationScoped;
+import javafx.event.ActionEvent;
+import javafx.fxml.FXML;
+import javafx.scene.control.Button;
+import javafx.scene.control.Label;
+
+@ApplicationScoped
+public class VoteController {
+
+	@FXML Label lblTitle;
+	@FXML Label lblSummary;
+	@FXML Button btnYes;
+	@FXML Button btnNo;
+
+	@FXML
+	public void OnVoteNo(ActionEvent e) {
+		
+	}
+
+	@FXML
+	public void OnVoteYes(ActionEvent e) {
+		
+	}
+}
diff --git a/fx/src/main/resources/org/unigrid/janus/view/mainWindow.fxml b/fx/src/main/resources/org/unigrid/janus/view/mainWindow.fxml
index 65cb08bd..c9ba366d 100644
--- a/fx/src/main/resources/org/unigrid/janus/view/mainWindow.fxml
+++ b/fx/src/main/resources/org/unigrid/janus/view/mainWindow.fxml
@@ -23,7 +23,7 @@
 <?import org.kordamp.ikonli.javafx.FontIcon?>
 <?import org.kordamp.ikonli.javafx.StackedFontIcon?>
 
-<Stage minHeight="400.0" minWidth="600.0" title="Unigrid Janus Wallet" xmlns="http://javafx.com/javafx/" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.unigrid.janus.controller.MainWindowController">
+<Stage minHeight="400.0" minWidth="600.0" title="Unigrid Janus Wallet" xmlns="http://javafx.com/javafx/18" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.unigrid.janus.controller.MainWindowController">
    <scene>
       <Scene fill="#000024" stylesheets="@main.css">
          <root>
@@ -182,6 +182,37 @@
                                           </FontIcon>
                                        </graphic>
                                     </ToggleButton>
+                                    <ToggleButton fx:id="btnVote" alignment="CENTER_LEFT" mnemonicParsing="false" onMouseClicked="#onVoteClicked" prefWidth="150.0" style="-fx-cursor: hand;" text="Vote">
+                                       <toggleGroup>
+                                          <ToggleGroup fx:id="sidepane121" />
+                                       </toggleGroup>
+                                       <padding>
+                                          <Insets bottom="8.0" left="16.0" right="8.0" top="8.0" />
+                                       </padding>
+                                       <font>
+                                          <Font size="14.0" />
+                                       </font>
+                                       <graphic>
+                                          <FontIcon fx:id="addressIcn21" iconLiteral="far-newspaper" iconSize="20" stroke="BLACK" strokeType="OUTSIDE" strokeWidth="0.5">
+                                             <iconColor>
+                                                <LinearGradient endX="1.0" endY="1.0">
+                                                   <stops>
+                                                      <Stop>
+                                                         <color>
+                                                            <Color red="0.8815789222717285" green="0.4282051920890808" blue="0.004081383813172579" />
+                                                         </color>
+                                                      </Stop>
+                                                      <Stop offset="1.0">
+                                                         <color>
+                                                            <Color red="0.8947368264198303" green="0.6130604147911072" blue="0.049707602709531784" />
+                                                         </color>
+                                                      </Stop>
+                                                   </stops>
+                                                </LinearGradient>
+                                             </iconColor>
+                                          </FontIcon>
+                                       </graphic>
+                                    </ToggleButton>
                                     <VBox alignment="BOTTOM_LEFT" VBox.vgrow="ALWAYS">
                                        <VBox.margin>
                                           <Insets bottom="2.0" />
@@ -339,6 +370,11 @@
                               		<fx:include source="settings.fxml" VBox.vgrow="ALWAYS" />
                               	</children>
                               </VBox>
+                              <VBox fx:id="pnlVote" alignment="CENTER" layoutX="10.0" layoutY="10.0" styleClass="settings" visible="false" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+                                 <children>
+                                    <fx:include source="vote.fxml" />
+                                 </children>
+                              </VBox>
                            </children>
                         </AnchorPane>
                      </center>
diff --git a/fx/src/main/resources/org/unigrid/janus/view/vote.fxml b/fx/src/main/resources/org/unigrid/janus/view/vote.fxml
new file mode 100644
index 00000000..a76dd4be
--- /dev/null
+++ b/fx/src/main/resources/org/unigrid/janus/view/vote.fxml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.layout.AnchorPane?>
+<?import javafx.scene.layout.BorderPane?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.text.Font?>
+
+<AnchorPane prefHeight="300.0" prefWidth="450.0" style="-fx-background-color: linear-gradient(from 75px 75px to 200px 150px, #00001c, #000024);" stylesheets="@main.css" xmlns="http://javafx.com/javafx/18" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.unigrid.janus.controller.WalletController">
+   <children>
+      <BorderPane prefHeight="200.0" prefWidth="200.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+         <top>
+            <Label style="-fx-text-fill: orange;" text="Unigrid Vote" textFill="#ee7722" textOverrun="CLIP" BorderPane.alignment="CENTER">
+               <font>
+                  <Font size="36.0" />
+               </font>
+            </Label>
+         </top>
+         <bottom>
+            <HBox prefHeight="100.0" prefWidth="200.0" BorderPane.alignment="CENTER">
+               <children>
+                  <AnchorPane prefHeight="100.0" prefWidth="449.0">
+                     <children>
+                        <Button fx:id="btnNo" layoutX="125.0" layoutY="36.0" mnemonicParsing="false" text="No" />
+                        <Button fx:id="btnYes" layoutX="271.0" layoutY="36.0" mnemonicParsing="false" text="Yes" />
+                     </children>
+                  </AnchorPane>
+               </children>
+            </HBox>
+         </bottom>
+         <center>
+            <AnchorPane prefHeight="200.0" prefWidth="200.0" BorderPane.alignment="CENTER">
+               <children>
+                  <Label fx:id="lblTitle" layoutX="200.0" layoutY="6.0" text="Label" textAlignment="CENTER" textFill="#ee7722" />
+                  <Label fx:id="lblSummary" layoutX="14.0" layoutY="36.0" text="Summary" textFill="#ee7722" />
+               </children>
+            </AnchorPane>
+         </center>
+      </BorderPane>
+   </children>
+</AnchorPane>

From 99d3e54abf31df03b6cf8029f96b71ff41b9fef1 Mon Sep 17 00:00:00 2001
From: Fim-84 <marcus.stenberg@gmail.com>
Date: Tue, 5 Sep 2023 17:05:02 +0200
Subject: [PATCH 02/10] Added event on new block that should update voting info
 in the voting tab

---
 .../janus/controller/VoteController.java      | 41 +++++++++++++++++-
 .../org/unigrid/janus/model/BudgetInfo.java   | 42 +++++++++++++++++++
 .../java/org/unigrid/janus/model/Wallet.java  |  5 +++
 .../janus/model/rpc/entity/BudgetGetVote.java | 38 +++++++++++++++++
 .../janus/model/rpc/entity/BudgetVote.java    | 37 ++++++++++++++++
 .../unigrid/janus/model/signal/NewBlock.java  | 24 +++++++++++
 .../resources/org/unigrid/janus/view/main.css | 14 +++++++
 .../org/unigrid/janus/view/vote.fxml          | 15 ++++---
 8 files changed, 209 insertions(+), 7 deletions(-)
 create mode 100644 fx/src/main/java/org/unigrid/janus/model/BudgetInfo.java
 create mode 100644 fx/src/main/java/org/unigrid/janus/model/rpc/entity/BudgetGetVote.java
 create mode 100644 fx/src/main/java/org/unigrid/janus/model/rpc/entity/BudgetVote.java
 create mode 100644 fx/src/main/java/org/unigrid/janus/model/signal/NewBlock.java

diff --git a/fx/src/main/java/org/unigrid/janus/controller/VoteController.java b/fx/src/main/java/org/unigrid/janus/controller/VoteController.java
index 75a9385d..32b873e3 100644
--- a/fx/src/main/java/org/unigrid/janus/controller/VoteController.java
+++ b/fx/src/main/java/org/unigrid/janus/controller/VoteController.java
@@ -17,26 +17,63 @@ of the License (see COPYING and COPYING.addendum).
 package org.unigrid.janus.controller;
 
 import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.event.Observes;
+import jakarta.inject.Inject;
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
 import javafx.scene.control.Label;
+import javafx.scene.control.ProgressBar;
+import javafx.scene.layout.AnchorPane;
+import org.unigrid.janus.model.rpc.entity.BudgetGetVote;
+import org.unigrid.janus.model.rpc.entity.BudgetVote;
+import org.unigrid.janus.model.service.RPCService;
+import org.unigrid.janus.model.signal.NewBlock;
 
 @ApplicationScoped
 public class VoteController {
 
+	@Inject private RPCService rpc;
+	
 	@FXML Label lblTitle;
 	@FXML Label lblSummary;
 	@FXML Button btnYes;
 	@FXML Button btnNo;
+	@FXML Button btnAbstain;
+	@FXML Label lblYeas;
+	@FXML Label lblNays;
+	@FXML ProgressBar pgbRatio;
+	@FXML AnchorPane pnlCastVote;
 
 	@FXML
 	public void OnVoteNo(ActionEvent e) {
-		
+		rpc.call(new BudgetVote.Request(new Object[]{"vote-many", "no"}), BudgetVote.class);
 	}
 
 	@FXML
 	public void OnVoteYes(ActionEvent e) {
-		
+		rpc.call(new BudgetVote.Request(new Object[]{"vote-many", "yes"}), BudgetVote.class);
+	}
+
+	@FXML
+	public void OnVoteAbstain(ActionEvent e) {
+		rpc.call(new BudgetVote.Request(new Object[]{"vote-many", "abstain"}), BudgetVote.class);
+	}
+
+	private void onMessage(@Observes NewBlock update) {
+		BudgetGetVote budgetInfo = rpc.call(new BudgetGetVote.Request(new Object[]{"show"}), BudgetGetVote.class);
+
+		if(budgetInfo.getResult() == null) {
+			System.out.println("result was not null");
+			lblTitle.setText(budgetInfo.getResult().getName());
+			lblSummary.setText(budgetInfo.getResult().getUrl());
+			int yes = budgetInfo.getResult().getYeas();
+			int no = budgetInfo.getResult().getNays();
+			lblYeas.setText(Integer.toString(yes));
+			lblNays.setText(Integer.toString(no));
+			float progress = 0.0f;
+			progress = (yes / (yes + no));
+			pgbRatio.setProgress(progress);
+		}
 	}
 }
diff --git a/fx/src/main/java/org/unigrid/janus/model/BudgetInfo.java b/fx/src/main/java/org/unigrid/janus/model/BudgetInfo.java
new file mode 100644
index 00000000..3759a590
--- /dev/null
+++ b/fx/src/main/java/org/unigrid/janus/model/BudgetInfo.java
@@ -0,0 +1,42 @@
+/*
+	The Janus Wallet
+	Copyright © 2021-2022 The Unigrid Foundation, UGD Software AB
+
+	This program is free software: you can redistribute it and/or modify it under the terms of the
+	addended GNU Affero General Public License as published by the Free Software Foundation, version 3
+	of the License (see COPYING and COPYING.addendum).
+
+	This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
+	even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+	GNU Affero General Public License for more details.
+
+	You should have received an addended copy of the GNU Affero General Public License with this program.
+	If not, see <http://www.gnu.org/licenses/> and <https://github.com/unigrid-project/janus-java>.
+ */
+
+package org.unigrid.janus.model;
+
+import lombok.Data;
+
+@Data
+public class BudgetInfo {
+	private String name;
+	private String url;
+	private String hash;
+	private String feeHash;
+	private int blockStart;
+	private int blockEnd;
+	private int totalPaymentCount;
+	private int remainingPaymentCount;
+	private String paymentAddress;
+	private float ratio;
+	private int yeas;
+	private int nays;
+	private int abstains;
+	private int totalPayment;
+	private int monthlyPayment;
+	private boolean isEstablished;
+	private boolean isValid;
+	private String isValidReason;
+	private boolean fValid;
+}
diff --git a/fx/src/main/java/org/unigrid/janus/model/Wallet.java b/fx/src/main/java/org/unigrid/janus/model/Wallet.java
index 0c3821cf..70c0ceda 100644
--- a/fx/src/main/java/org/unigrid/janus/model/Wallet.java
+++ b/fx/src/main/java/org/unigrid/janus/model/Wallet.java
@@ -17,6 +17,7 @@ of the License (see COPYING and COPYING.addendum).
 package org.unigrid.janus.model;
 
 import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.event.Event;
 import jakarta.inject.Inject;
 import jakarta.ws.rs.client.Client;
 import jakarta.ws.rs.client.ClientBuilder;
@@ -32,6 +33,7 @@ of the License (see COPYING and COPYING.addendum).
 import org.unigrid.janus.model.rpc.entity.GetWalletInfo;
 import org.unigrid.janus.model.rpc.entity.StakingStatus;
 import org.unigrid.janus.model.service.DebugService;
+import org.unigrid.janus.model.signal.NewBlock;
 
 @Eager
 @ApplicationScoped
@@ -77,6 +79,7 @@ public class Wallet {
 
 	@Inject private DebugService debug;
 
+	@Inject private Event<NewBlock> newBlockEvent;
 	@AllArgsConstructor
 	public enum LockState {
 		UNLOCKED("unlocked"),
@@ -189,6 +192,8 @@ public void setBlocks(int newValue) {
 		this.blocks = newValue;
 		//System.out.println("setting blocks: " + this.blocks);
 		this.pcs.firePropertyChange(this.BLOCKS_PROPERTY, oldValue, newValue);
+		newBlockEvent.fire(NewBlock.builder().blockCount(newValue).build());
+		
 	}
 
 	public int getConnections() {
diff --git a/fx/src/main/java/org/unigrid/janus/model/rpc/entity/BudgetGetVote.java b/fx/src/main/java/org/unigrid/janus/model/rpc/entity/BudgetGetVote.java
new file mode 100644
index 00000000..2ed7fdb1
--- /dev/null
+++ b/fx/src/main/java/org/unigrid/janus/model/rpc/entity/BudgetGetVote.java
@@ -0,0 +1,38 @@
+/*
+	The Janus Wallet
+	Copyright © 2021-2022 The Unigrid Foundation, UGD Software AB
+
+	This program is free software: you can redistribute it and/or modify it under the terms of the
+	addended GNU Affero General Public License as published by the Free Software Foundation, version 3
+	of the License (see COPYING and COPYING.addendum).
+
+	This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
+	even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+	GNU Affero General Public License for more details.
+
+	You should have received an addended copy of the GNU Affero General Public License with this program.
+	If not, see <http://www.gnu.org/licenses/> and <https://github.com/unigrid-project/janus-java>.
+ */
+
+package org.unigrid.janus.model.rpc.entity;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.unigrid.janus.model.BudgetInfo;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class BudgetGetVote extends BaseResult<BudgetGetVote.Result> {
+	private static final String METHOD = " gnbudget";
+
+	public static class Request extends BaseRequest{
+		public Request(Object[] args) {
+			super(METHOD);
+			this.setParams(args);
+		}
+	}
+
+	public static class Result extends BudgetInfo{
+		/* Empty on purpose */
+	}
+}
diff --git a/fx/src/main/java/org/unigrid/janus/model/rpc/entity/BudgetVote.java b/fx/src/main/java/org/unigrid/janus/model/rpc/entity/BudgetVote.java
new file mode 100644
index 00000000..4cf85343
--- /dev/null
+++ b/fx/src/main/java/org/unigrid/janus/model/rpc/entity/BudgetVote.java
@@ -0,0 +1,37 @@
+/*
+	The Janus Wallet
+	Copyright © 2021-2022 The Unigrid Foundation, UGD Software AB
+
+	This program is free software: you can redistribute it and/or modify it under the terms of the
+	addended GNU Affero General Public License as published by the Free Software Foundation, version 3
+	of the License (see COPYING and COPYING.addendum).
+
+	This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
+	even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+	GNU Affero General Public License for more details.
+
+	You should have received an addended copy of the GNU Affero General Public License with this program.
+	If not, see <http://www.gnu.org/licenses/> and <https://github.com/unigrid-project/janus-java>.
+ */
+
+package org.unigrid.janus.model.rpc.entity;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class BudgetVote {
+	private static final String METHOD = " gnbudget";
+
+	public static class Request extends BaseRequest{
+		public Request(Object[] args) {
+			super(METHOD);
+			this.setParams(args);
+		}
+	}
+
+	public static class Result {
+		
+	}
+}
diff --git a/fx/src/main/java/org/unigrid/janus/model/signal/NewBlock.java b/fx/src/main/java/org/unigrid/janus/model/signal/NewBlock.java
new file mode 100644
index 00000000..231aa50c
--- /dev/null
+++ b/fx/src/main/java/org/unigrid/janus/model/signal/NewBlock.java
@@ -0,0 +1,24 @@
+/*
+	The Janus Wallet
+	Copyright © 2021-2022 The Unigrid Foundation, UGD Software AB
+
+	This program is free software: you can redistribute it and/or modify it under the terms of the
+	addended GNU Affero General Public License as published by the Free Software Foundation, version 3
+	of the License (see COPYING and COPYING.addendum).
+
+	This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
+	even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+	GNU Affero General Public License for more details.
+
+	You should have received an addended copy of the GNU Affero General Public License with this program.
+	If not, see <http://www.gnu.org/licenses/> and <https://github.com/unigrid-project/janus-java>.
+ */
+package org.unigrid.janus.model.signal;
+
+import lombok.Builder;
+import lombok.Data;
+
+@Data @Builder
+public class NewBlock {
+	private int blockCount;
+}
diff --git a/fx/src/main/resources/org/unigrid/janus/view/main.css b/fx/src/main/resources/org/unigrid/janus/view/main.css
index 00395dae..98470f93 100644
--- a/fx/src/main/resources/org/unigrid/janus/view/main.css
+++ b/fx/src/main/resources/org/unigrid/janus/view/main.css
@@ -205,6 +205,20 @@
 	-fx-text-fill: #33d;
 }
 
+.vote-progress-bar > .track {
+        -fx-background-color: "#F74230", "#F74230";
+	-fx-background-radius:0;
+	-fx-background-insets: 0, 1;
+}
+
+.vote-progress-bar > .bar {
+        -fx-padding: 1px; 
+	-fx-accent: "#14B839";
+	-fx-background-insets: 0; 
+	-fx-background-radius: 2;
+	-fx-padding: 0.75em;
+}
+
 .my-progress-bar > .track {
 	-fx-background-color: "#05233d", "#05233d";
 	-fx-background-radius:0;
diff --git a/fx/src/main/resources/org/unigrid/janus/view/vote.fxml b/fx/src/main/resources/org/unigrid/janus/view/vote.fxml
index a76dd4be..e0b932f7 100644
--- a/fx/src/main/resources/org/unigrid/janus/view/vote.fxml
+++ b/fx/src/main/resources/org/unigrid/janus/view/vote.fxml
@@ -2,12 +2,13 @@
 
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.Label?>
+<?import javafx.scene.control.ProgressBar?>
 <?import javafx.scene.layout.AnchorPane?>
 <?import javafx.scene.layout.BorderPane?>
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.text.Font?>
 
-<AnchorPane prefHeight="300.0" prefWidth="450.0" style="-fx-background-color: linear-gradient(from 75px 75px to 200px 150px, #00001c, #000024);" stylesheets="@main.css" xmlns="http://javafx.com/javafx/18" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.unigrid.janus.controller.WalletController">
+<AnchorPane prefHeight="300.0" prefWidth="450.0" style="-fx-background-color: linear-gradient(from 75px 75px to 200px 150px, #00001c, #000024);" stylesheets="@main.css" xmlns="http://javafx.com/javafx/18" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.unigrid.janus.controller.VoteController">
    <children>
       <BorderPane prefHeight="200.0" prefWidth="200.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
          <top>
@@ -18,12 +19,13 @@
             </Label>
          </top>
          <bottom>
-            <HBox prefHeight="100.0" prefWidth="200.0" BorderPane.alignment="CENTER">
+            <HBox prefHeight="48.0" prefWidth="450.0" BorderPane.alignment="CENTER">
                <children>
-                  <AnchorPane prefHeight="100.0" prefWidth="449.0">
+                  <AnchorPane fx:id="pnlCastVote" prefHeight="67.0" prefWidth="449.0">
                      <children>
-                        <Button fx:id="btnNo" layoutX="125.0" layoutY="36.0" mnemonicParsing="false" text="No" />
-                        <Button fx:id="btnYes" layoutX="271.0" layoutY="36.0" mnemonicParsing="false" text="Yes" />
+                        <Button fx:id="btnNo" layoutX="205.0" layoutY="10.0" mnemonicParsing="false" onAction="#OnVoteNo" text="No" />
+                        <Button fx:id="btnYes" layoutX="91.0" layoutY="10.0" mnemonicParsing="false" onAction="#OnVoteYes" text="Yes" />
+                        <Button fx:id="btnAbstain" layoutX="312.0" layoutY="10.0" mnemonicParsing="false" onAction="#OnVoteAbstain" text="Abstain" />
                      </children>
                   </AnchorPane>
                </children>
@@ -34,6 +36,9 @@
                <children>
                   <Label fx:id="lblTitle" layoutX="200.0" layoutY="6.0" text="Label" textAlignment="CENTER" textFill="#ee7722" />
                   <Label fx:id="lblSummary" layoutX="14.0" layoutY="36.0" text="Summary" textFill="#ee7722" />
+                  <Label fx:id="lblNays" layoutX="316.0" layoutY="152.0" text="1" textFill="#f74230" />
+                  <ProgressBar fx:id="pgbRatio" layoutX="125.0" layoutY="174.0" prefWidth="200.0" progress="0.5" styleClass="vote-progress-bar" stylesheets="@main.css" />
+                  <Label fx:id="lblYeas" layoutX="125.0" layoutY="152.0" text="1" textFill="#14b839" />
                </children>
             </AnchorPane>
          </center>

From e56f4ae277227ebd7498eb4b83a2b187b52011b7 Mon Sep 17 00:00:00 2001
From: Fim-84 <marcus.stenberg@gmail.com>
Date: Wed, 6 Sep 2023 16:59:09 +0200
Subject: [PATCH 03/10] fixed json parsing error.

---
 fx/pom.xml                                    |   5 +
 .../controller/MainWindowController.java      |  10 +-
 .../janus/controller/VoteController.java      | 109 ++++++++++++++++--
 .../org/unigrid/janus/model/BudgetInfo.java   |  35 +++---
 .../janus/model/rpc/entity/BudgetGetVote.java |   5 +-
 .../janus/model/rpc/entity/BudgetVote.java    |   2 +-
 .../janus/model/service/RPCService.java       |   5 +-
 .../org/unigrid/janus/view/mainWindow.fxml    |   4 +-
 .../org/unigrid/janus/view/vote.fxml          |  23 ++--
 9 files changed, 151 insertions(+), 47 deletions(-)

diff --git a/fx/pom.xml b/fx/pom.xml
index 0cb711ad..c3b3121b 100644
--- a/fx/pom.xml
+++ b/fx/pom.xml
@@ -229,6 +229,11 @@
 			<artifactId>slf4j-api</artifactId>
 			<version>2.0.0-alpha7</version>
 		</dependency>
+                <dependency>
+                        <groupId>org.unigrid</groupId>
+                        <artifactId>web3jshaded</artifactId>
+                        <version>1.0-SNAPSHOT</version>
+                </dependency>
 		<!--<dependency>
 		    <groupId>com.dustinredmond.fxtrayicon</groupId>
 		    <artifactId>FXTrayIcon</artifactId>
diff --git a/fx/src/main/java/org/unigrid/janus/controller/MainWindowController.java b/fx/src/main/java/org/unigrid/janus/controller/MainWindowController.java
index b2c0be99..afae9f23 100644
--- a/fx/src/main/java/org/unigrid/janus/controller/MainWindowController.java
+++ b/fx/src/main/java/org/unigrid/janus/controller/MainWindowController.java
@@ -65,14 +65,14 @@ public class MainWindowController implements Initializable, PropertyChangeListen
 	@FXML private ToggleButton btnAddress;
 	@FXML private ToggleButton btnDocs;
 	@FXML private ToggleButton btnSettings;
-	@FXML private ToggleButton btnVote;
+	@FXML private ToggleButton btnGovernace;
 	@FXML private VBox pnlWallet;
 	@FXML private VBox pnlTransactions;
 	@FXML private VBox pnlNodes;
 	@FXML private VBox pnlAddress;
 	@FXML private VBox pnlSettings;
 	@FXML private VBox pnlDocs;
-	@FXML private VBox pnlVote;
+	@FXML private VBox pnlGovernace;
 	@FXML private AnchorPane pnlOverlay;
 	@FXML private AnchorPane pnlWarning;
 	@FXML private FontIcon lockBtn;
@@ -106,6 +106,8 @@ private void select(VBox panel, ToggleButton button) {
 		btnAddress.setSelected(false);
 		btnDocs.setSelected(false);
 		pnlDocs.setVisible(false);
+		pnlGovernace.setVisible(false);
+		btnGovernace.setSelected(false);
 
 		panel.setVisible(true);
 		button.setSelected(true);
@@ -146,8 +148,8 @@ private void onSettingsTap(MouseEvent event) {
 	}
 	
 	@FXML
-	private void onVoteClicked(MouseEvent event) {
-		select(pnlVote, btnVote);
+	private void onGovernaceClicked(MouseEvent event) {
+		select(pnlGovernace, btnGovernace);
 	}
 	
 	@Override
diff --git a/fx/src/main/java/org/unigrid/janus/controller/VoteController.java b/fx/src/main/java/org/unigrid/janus/controller/VoteController.java
index 32b873e3..c10e5bb0 100644
--- a/fx/src/main/java/org/unigrid/janus/controller/VoteController.java
+++ b/fx/src/main/java/org/unigrid/janus/controller/VoteController.java
@@ -19,21 +19,33 @@ of the License (see COPYING and COPYING.addendum).
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.enterprise.event.Observes;
 import jakarta.inject.Inject;
+import java.util.ArrayList;
+import java.util.List;
+import javafx.beans.value.ObservableValue;
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
+import javafx.scene.control.Hyperlink;
 import javafx.scene.control.Label;
 import javafx.scene.control.ProgressBar;
+import javafx.scene.control.TableColumn;
+import javafx.scene.control.TableView;
 import javafx.scene.layout.AnchorPane;
+import javafx.util.Callback;
 import org.unigrid.janus.model.rpc.entity.BudgetGetVote;
 import org.unigrid.janus.model.rpc.entity.BudgetVote;
 import org.unigrid.janus.model.service.RPCService;
 import org.unigrid.janus.model.signal.NewBlock;
+import org.unigrid.janus.model.BudgetInfo;
+import org.unigrid.janus.model.service.BrowserService;
 
 @ApplicationScoped
 public class VoteController {
 
 	@Inject private RPCService rpc;
+	@Inject private BrowserService browser;
 	
 	@FXML Label lblTitle;
 	@FXML Label lblSummary;
@@ -44,6 +56,87 @@ public class VoteController {
 	@FXML Label lblNays;
 	@FXML ProgressBar pgbRatio;
 	@FXML AnchorPane pnlCastVote;
+	@FXML TableView tblGoveData;
+	@FXML TableColumn tbcProposal;
+	@FXML TableColumn tbcVotes;
+	@FXML TableColumn tbcYes;
+	@FXML TableColumn tbcNo;
+	@FXML TableColumn tbcAbstain;
+
+	private ObservableList<BudgetGetVote.Result> tableList;
+	private List<BudgetGetVote.Result> listBudgetInfo;
+	
+	private void init() {
+		listBudgetInfo = new ArrayList<>();
+		tableList = FXCollections.observableList(listBudgetInfo);
+		tblGoveData.setItems(tableList);
+
+		tbcProposal.setCellValueFactory(cell -> {
+			String name = ((TableColumn.CellDataFeatures<BudgetGetVote.Result, String>) cell).getValue()
+				.getName();
+			String url = ((TableColumn.CellDataFeatures<BudgetGetVote.Result, String>) cell).getValue()
+				.getUrl();
+			Hyperlink link = new Hyperlink();
+			
+			link.setText(name);
+			link.setOnAction(e -> {
+				browser.navigate("www");
+			});
+			
+			return link;
+		});
+
+		tbcVotes.setCellValueFactory(cell -> {
+			ProgressBar bar = new ProgressBar();
+			int yes = ((TableColumn.CellDataFeatures<BudgetGetVote.Result, Integer>) cell).getValue()
+				.getYeas();
+			int no = ((TableColumn.CellDataFeatures<BudgetGetVote.Result, Integer>) cell).getValue()
+				.getNays();
+
+			float progress = 0.0f;
+			progress = (yes / (yes + no));
+			bar.setProgress(progress);
+			bar.getStylesheets().add("src/main/resources/main.css");
+			
+			bar.getStyleClass().add("vote-progress-bar");
+
+			return bar;
+		});
+		
+		tbcYes.setCellValueFactory(cell -> {
+			Button button = new Button("Yes");
+			String hash = ((TableColumn.CellDataFeatures<BudgetGetVote.Result, Integer>) cell).getValue()
+				.getHash();
+			button.setOnAction(e -> {
+				rpc.call(new BudgetVote.Request(new Object[]{"vote-many", hash, "yes"}),
+					BudgetVote.class);
+			});
+			
+			return button;
+		});
+		
+		tbcNo.setCellValueFactory(cell -> {
+			Button button = new Button("No");
+			String hash = ((TableColumn.CellDataFeatures<BudgetGetVote.Result, Integer>) cell).getValue()
+				.getHash();
+			button.setOnAction(e -> {
+				rpc.call(new BudgetVote.Request(new Object[]{"vote-many", hash, "no"}),
+					BudgetVote.class);
+			});
+			return button;
+		});
+		
+		tbcAbstain.setCellValueFactory(cell -> {
+			Button button = new Button("Abstain");
+			String hash = ((TableColumn.CellDataFeatures<BudgetGetVote.Result, Integer>) cell).getValue()
+				.getHash();
+			button.setOnAction(e -> {
+				rpc.call(new BudgetVote.Request(new Object[]{"vote-many", hash, "abstain"}),
+					BudgetVote.class);
+			});
+			return button;
+		});
+	}
 
 	@FXML
 	public void OnVoteNo(ActionEvent e) {
@@ -63,17 +156,11 @@ public void OnVoteAbstain(ActionEvent e) {
 	private void onMessage(@Observes NewBlock update) {
 		BudgetGetVote budgetInfo = rpc.call(new BudgetGetVote.Request(new Object[]{"show"}), BudgetGetVote.class);
 
-		if(budgetInfo.getResult() == null) {
-			System.out.println("result was not null");
-			lblTitle.setText(budgetInfo.getResult().getName());
-			lblSummary.setText(budgetInfo.getResult().getUrl());
-			int yes = budgetInfo.getResult().getYeas();
-			int no = budgetInfo.getResult().getNays();
-			lblYeas.setText(Integer.toString(yes));
-			lblNays.setText(Integer.toString(no));
-			float progress = 0.0f;
-			progress = (yes / (yes + no));
-			pgbRatio.setProgress(progress);
+		listBudgetInfo = budgetInfo.getResult();
+		
+		for (int i = 0; i < budgetInfo.getResult().size(); i++) {
+			System.out.println(i);
+			System.out.println(budgetInfo.getResult().get(i).getName());
 		}
 	}
 }
diff --git a/fx/src/main/java/org/unigrid/janus/model/BudgetInfo.java b/fx/src/main/java/org/unigrid/janus/model/BudgetInfo.java
index 3759a590..e867be78 100644
--- a/fx/src/main/java/org/unigrid/janus/model/BudgetInfo.java
+++ b/fx/src/main/java/org/unigrid/janus/model/BudgetInfo.java
@@ -16,27 +16,34 @@ of the License (see COPYING and COPYING.addendum).
 
 package org.unigrid.janus.model;
 
+import jakarta.json.bind.annotation.JsonbProperty;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 @Data
 public class BudgetInfo {
+	@JsonbProperty("Name")
 	private String name;
+	@JsonbProperty("URL")
 	private String url;
+	@JsonbProperty("Hash")
 	private String hash;
-	private String feeHash;
-	private int blockStart;
-	private int blockEnd;
-	private int totalPaymentCount;
-	private int remainingPaymentCount;
-	private String paymentAddress;
-	private float ratio;
+	//private String feeHash;
+	//private int blockStart;
+	//private int blockEnd;
+	//private int totalPaymentCount;
+	//private int remainingPaymentCount;
+	//private String paymentAddress;
+	//private double ratio;
+	@JsonbProperty("Yeas")
 	private int yeas;
+	@JsonbProperty("Nays")
 	private int nays;
-	private int abstains;
-	private int totalPayment;
-	private int monthlyPayment;
-	private boolean isEstablished;
-	private boolean isValid;
-	private String isValidReason;
-	private boolean fValid;
+	//private int abstains;
+	//private int totalPayment;
+	//private int monthlyPayment;
+	//private boolean isEstablished;
+	//private boolean isValid;
+	//private String isValidReason;
+	//private boolean fValid;
 }
diff --git a/fx/src/main/java/org/unigrid/janus/model/rpc/entity/BudgetGetVote.java b/fx/src/main/java/org/unigrid/janus/model/rpc/entity/BudgetGetVote.java
index 2ed7fdb1..16202f8b 100644
--- a/fx/src/main/java/org/unigrid/janus/model/rpc/entity/BudgetGetVote.java
+++ b/fx/src/main/java/org/unigrid/janus/model/rpc/entity/BudgetGetVote.java
@@ -16,14 +16,15 @@ of the License (see COPYING and COPYING.addendum).
 
 package org.unigrid.janus.model.rpc.entity;
 
+import java.util.List;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.unigrid.janus.model.BudgetInfo;
 
 @Data
 @EqualsAndHashCode(callSuper = false)
-public class BudgetGetVote extends BaseResult<BudgetGetVote.Result> {
-	private static final String METHOD = " gnbudget";
+public class BudgetGetVote extends BaseResult<List<BudgetGetVote.Result>> {
+	private static final String METHOD = "gnbudget";
 
 	public static class Request extends BaseRequest{
 		public Request(Object[] args) {
diff --git a/fx/src/main/java/org/unigrid/janus/model/rpc/entity/BudgetVote.java b/fx/src/main/java/org/unigrid/janus/model/rpc/entity/BudgetVote.java
index 4cf85343..50398a5e 100644
--- a/fx/src/main/java/org/unigrid/janus/model/rpc/entity/BudgetVote.java
+++ b/fx/src/main/java/org/unigrid/janus/model/rpc/entity/BudgetVote.java
@@ -22,7 +22,7 @@ of the License (see COPYING and COPYING.addendum).
 @Data
 @EqualsAndHashCode(callSuper = false)
 public class BudgetVote {
-	private static final String METHOD = " gnbudget";
+	private static final String METHOD = "gnbudget";
 
 	public static class Request extends BaseRequest{
 		public Request(Object[] args) {
diff --git a/fx/src/main/java/org/unigrid/janus/model/service/RPCService.java b/fx/src/main/java/org/unigrid/janus/model/service/RPCService.java
index b51863a9..91de104a 100644
--- a/fx/src/main/java/org/unigrid/janus/model/service/RPCService.java
+++ b/fx/src/main/java/org/unigrid/janus/model/service/RPCService.java
@@ -43,6 +43,7 @@ of the License (see COPYING and COPYING.addendum).
 import lombok.Getter;
 import lombok.Setter;
 import org.unigrid.janus.model.cdi.Eager;
+import org.unigrid.janus.model.rpc.entity.BudgetGetVote;
 
 @Eager
 @ApplicationScoped
@@ -135,8 +136,8 @@ public void stopPolling() {
 	}
 
 	public <R, T> T call(R request, Class<T> clazz) {
-		//debug.print("RPC call ".concat(request.toString()), RPCService.class.getSimpleName());
-		return target.request().post(Entity.json(request)).readEntity(clazz);
+			//debug.print("RPC call ".concat(request.toString()), RPCService.class.getSimpleName());
+			return target.request().post(Entity.json(request)).readEntity(clazz);
 	}
 
 	public <R> String callToJson(R request) {
diff --git a/fx/src/main/resources/org/unigrid/janus/view/mainWindow.fxml b/fx/src/main/resources/org/unigrid/janus/view/mainWindow.fxml
index c9ba366d..a7277569 100644
--- a/fx/src/main/resources/org/unigrid/janus/view/mainWindow.fxml
+++ b/fx/src/main/resources/org/unigrid/janus/view/mainWindow.fxml
@@ -182,7 +182,7 @@
                                           </FontIcon>
                                        </graphic>
                                     </ToggleButton>
-                                    <ToggleButton fx:id="btnVote" alignment="CENTER_LEFT" mnemonicParsing="false" onMouseClicked="#onVoteClicked" prefWidth="150.0" style="-fx-cursor: hand;" text="Vote">
+                                    <ToggleButton fx:id="btnGovernace" alignment="CENTER_LEFT" mnemonicParsing="false" onMouseClicked="#onGovernaceClicked" prefWidth="150.0" style="-fx-cursor: hand;" text="Governace">
                                        <toggleGroup>
                                           <ToggleGroup fx:id="sidepane121" />
                                        </toggleGroup>
@@ -370,7 +370,7 @@
                               		<fx:include source="settings.fxml" VBox.vgrow="ALWAYS" />
                               	</children>
                               </VBox>
-                              <VBox fx:id="pnlVote" alignment="CENTER" layoutX="10.0" layoutY="10.0" styleClass="settings" visible="false" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+                              <VBox fx:id="pnlGovernace" layoutX="10.0" layoutY="10.0" visible="false" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
                                  <children>
                                     <fx:include source="vote.fxml" />
                                  </children>
diff --git a/fx/src/main/resources/org/unigrid/janus/view/vote.fxml b/fx/src/main/resources/org/unigrid/janus/view/vote.fxml
index e0b932f7..dd6af76f 100644
--- a/fx/src/main/resources/org/unigrid/janus/view/vote.fxml
+++ b/fx/src/main/resources/org/unigrid/janus/view/vote.fxml
@@ -2,13 +2,14 @@
 
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.Label?>
-<?import javafx.scene.control.ProgressBar?>
+<?import javafx.scene.control.TableColumn?>
+<?import javafx.scene.control.TableView?>
 <?import javafx.scene.layout.AnchorPane?>
 <?import javafx.scene.layout.BorderPane?>
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.text.Font?>
 
-<AnchorPane prefHeight="300.0" prefWidth="450.0" style="-fx-background-color: linear-gradient(from 75px 75px to 200px 150px, #00001c, #000024);" stylesheets="@main.css" xmlns="http://javafx.com/javafx/18" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.unigrid.janus.controller.VoteController">
+<AnchorPane style="-fx-background-color: linear-gradient(from 75px 75px to 200px 150px, #00001c, #000024);" stylesheets="@main.css" xmlns="http://javafx.com/javafx/18" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.unigrid.janus.controller.VoteController">
    <children>
       <BorderPane prefHeight="200.0" prefWidth="200.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
          <top>
@@ -32,15 +33,15 @@
             </HBox>
          </bottom>
          <center>
-            <AnchorPane prefHeight="200.0" prefWidth="200.0" BorderPane.alignment="CENTER">
-               <children>
-                  <Label fx:id="lblTitle" layoutX="200.0" layoutY="6.0" text="Label" textAlignment="CENTER" textFill="#ee7722" />
-                  <Label fx:id="lblSummary" layoutX="14.0" layoutY="36.0" text="Summary" textFill="#ee7722" />
-                  <Label fx:id="lblNays" layoutX="316.0" layoutY="152.0" text="1" textFill="#f74230" />
-                  <ProgressBar fx:id="pgbRatio" layoutX="125.0" layoutY="174.0" prefWidth="200.0" progress="0.5" styleClass="vote-progress-bar" stylesheets="@main.css" />
-                  <Label fx:id="lblYeas" layoutX="125.0" layoutY="152.0" text="1" textFill="#14b839" />
-               </children>
-            </AnchorPane>
+            <TableView fx:id="tblGoveData" BorderPane.alignment="CENTER">
+              <columns>
+                  <TableColumn fx:id="tbcProposal" prefWidth="75.0" text="Proposal" />
+                  <TableColumn fx:id="tbcVotes" prefWidth="75.0" text="Vots" />
+                <TableColumn fx:id="tbcYes" prefWidth="75.0" />
+                <TableColumn fx:id="tcbNo" prefWidth="75.0" />
+                  <TableColumn fx:id="tcbAbstain" prefWidth="75.0" />
+              </columns>
+            </TableView>
          </center>
       </BorderPane>
    </children>

From 6fbb2ed033cfe7118d411b248672944a4449d99b Mon Sep 17 00:00:00 2001
From: Fim-84 <marcus.stenberg@gmail.com>
Date: Thu, 7 Sep 2023 16:15:32 +0200
Subject: [PATCH 04/10] Got tableview working

---
 .../janus/controller/VoteController.java      | 88 +++++++++++--------
 .../org/unigrid/janus/model/BudgetInfo.java   |  6 +-
 .../org/unigrid/janus/view/mainWindow.fxml    |  2 +-
 .../org/unigrid/janus/view/vote.fxml          | 18 ++--
 4 files changed, 60 insertions(+), 54 deletions(-)

diff --git a/fx/src/main/java/org/unigrid/janus/controller/VoteController.java b/fx/src/main/java/org/unigrid/janus/controller/VoteController.java
index c10e5bb0..31e7f63c 100644
--- a/fx/src/main/java/org/unigrid/janus/controller/VoteController.java
+++ b/fx/src/main/java/org/unigrid/janus/controller/VoteController.java
@@ -16,22 +16,28 @@ of the License (see COPYING and COPYING.addendum).
 
 package org.unigrid.janus.controller;
 
+import jakarta.annotation.PostConstruct;
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.enterprise.event.Observes;
 import jakarta.inject.Inject;
+import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.ResourceBundle;
+import javafx.beans.property.ReadOnlyObjectWrapper;
 import javafx.beans.value.ObservableValue;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
+import javafx.fxml.Initializable;
 import javafx.scene.control.Button;
 import javafx.scene.control.Hyperlink;
 import javafx.scene.control.Label;
 import javafx.scene.control.ProgressBar;
 import javafx.scene.control.TableColumn;
 import javafx.scene.control.TableView;
+import javafx.scene.control.Tooltip;
 import javafx.scene.layout.AnchorPane;
 import javafx.util.Callback;
 import org.unigrid.janus.model.rpc.entity.BudgetGetVote;
@@ -42,7 +48,7 @@ of the License (see COPYING and COPYING.addendum).
 import org.unigrid.janus.model.service.BrowserService;
 
 @ApplicationScoped
-public class VoteController {
+public class VoteController implements Initializable{
 
 	@Inject private RPCService rpc;
 	@Inject private BrowserService browser;
@@ -64,43 +70,58 @@ public class VoteController {
 	@FXML TableColumn tbcAbstain;
 
 	private ObservableList<BudgetGetVote.Result> tableList;
-	private List<BudgetGetVote.Result> listBudgetInfo;
+	private List<BudgetGetVote.Result> listBudgetInfo = new ArrayList<>();;
 	
-	private void init() {
-		listBudgetInfo = new ArrayList<>();
+	@PostConstruct
+	private void testmethod() {
 		tableList = FXCollections.observableList(listBudgetInfo);
-		tblGoveData.setItems(tableList);
-
+	}
+	
+	@Override
+	public void initialize(URL u, ResourceBundle rb) {
+		//URL cssPath = VoteController.class.getResource("resources/main.css");
+		//tblGoveData.setItems(tableList);
+		tbcProposal.prefWidthProperty().bind(tblGoveData.widthProperty().multiply(0.25));
+		tbcVotes.prefWidthProperty().bind(tblGoveData.widthProperty().multiply(0.3));
+		tbcVotes.setStyle("-fx-alignment: CENTER;");
 		tbcProposal.setCellValueFactory(cell -> {
+			System.out.println("Name");
 			String name = ((TableColumn.CellDataFeatures<BudgetGetVote.Result, String>) cell).getValue()
 				.getName();
 			String url = ((TableColumn.CellDataFeatures<BudgetGetVote.Result, String>) cell).getValue()
 				.getUrl();
 			Hyperlink link = new Hyperlink();
-			
+			System.out.println(link.toString());
+
 			link.setText(name);
 			link.setOnAction(e -> {
-				browser.navigate("www");
+				browser.navigate(url);
 			});
-			
-			return link;
+			System.out.println(link.toString());
+
+			return new ReadOnlyObjectWrapper<Hyperlink>(link);
 		});
 
 		tbcVotes.setCellValueFactory(cell -> {
+			System.out.println("Doing a progbar");
 			ProgressBar bar = new ProgressBar();
-			int yes = ((TableColumn.CellDataFeatures<BudgetGetVote.Result, Integer>) cell).getValue()
-				.getYeas();
+			double progress = ((TableColumn.CellDataFeatures<BudgetGetVote.Result, Integer>) cell).getValue()
+				.getRatio();
 			int no = ((TableColumn.CellDataFeatures<BudgetGetVote.Result, Integer>) cell).getValue()
 				.getNays();
-
-			float progress = 0.0f;
-			progress = (yes / (yes + no));
+			int yes = ((TableColumn.CellDataFeatures<BudgetGetVote.Result, Integer>) cell).getValue()
+				.getYeas();
+			String toolTip = "Yes = " + yes + "         No = " + no;
+			bar.setTooltip(new Tooltip(toolTip));
+			//float progress = 0.0f;
+			//progress = (yes / (yes + no));
 			bar.setProgress(progress);
-			bar.getStylesheets().add("src/main/resources/main.css");
+			bar.setPrefWidth(tblGoveData.widthProperty().multiply(0.3).doubleValue());
+			//bar.getStylesheets().add(cssPath.toString());
 			
-			bar.getStyleClass().add("vote-progress-bar");
+			//bar.getStyleClass().add("vote-progress-bar");
 
-			return bar;
+			return new ReadOnlyObjectWrapper<ProgressBar>(bar);
 		});
 		
 		tbcYes.setCellValueFactory(cell -> {
@@ -112,7 +133,7 @@ private void init() {
 					BudgetVote.class);
 			});
 			
-			return button;
+			return new ReadOnlyObjectWrapper<Button>(button);
 		});
 		
 		tbcNo.setCellValueFactory(cell -> {
@@ -123,7 +144,7 @@ private void init() {
 				rpc.call(new BudgetVote.Request(new Object[]{"vote-many", hash, "no"}),
 					BudgetVote.class);
 			});
-			return button;
+			return new ReadOnlyObjectWrapper<Button>(button);
 		});
 		
 		tbcAbstain.setCellValueFactory(cell -> {
@@ -134,33 +155,22 @@ private void init() {
 				rpc.call(new BudgetVote.Request(new Object[]{"vote-many", hash, "abstain"}),
 					BudgetVote.class);
 			});
-			return button;
+			return new ReadOnlyObjectWrapper<Button>(button);
 		});
 	}
 
-	@FXML
-	public void OnVoteNo(ActionEvent e) {
-		rpc.call(new BudgetVote.Request(new Object[]{"vote-many", "no"}), BudgetVote.class);
-	}
-
-	@FXML
-	public void OnVoteYes(ActionEvent e) {
-		rpc.call(new BudgetVote.Request(new Object[]{"vote-many", "yes"}), BudgetVote.class);
-	}
-
-	@FXML
-	public void OnVoteAbstain(ActionEvent e) {
-		rpc.call(new BudgetVote.Request(new Object[]{"vote-many", "abstain"}), BudgetVote.class);
-	}
-
 	private void onMessage(@Observes NewBlock update) {
 		BudgetGetVote budgetInfo = rpc.call(new BudgetGetVote.Request(new Object[]{"show"}), BudgetGetVote.class);
 
-		listBudgetInfo = budgetInfo.getResult();
+		listBudgetInfo.clear();
+		listBudgetInfo.addAll(budgetInfo.getResult());
+		tblGoveData.setItems(tableList);
 		
+
 		for (int i = 0; i < budgetInfo.getResult().size(); i++) {
-			System.out.println(i);
-			System.out.println(budgetInfo.getResult().get(i).getName());
+			
+			lblTitle.setText(budgetInfo.getResult().get(i).getName());
+			pgbRatio.setProgress(budgetInfo.getResult().get(i).getRatio());
 		}
 	}
 }
diff --git a/fx/src/main/java/org/unigrid/janus/model/BudgetInfo.java b/fx/src/main/java/org/unigrid/janus/model/BudgetInfo.java
index e867be78..151116db 100644
--- a/fx/src/main/java/org/unigrid/janus/model/BudgetInfo.java
+++ b/fx/src/main/java/org/unigrid/janus/model/BudgetInfo.java
@@ -34,12 +34,14 @@ public class BudgetInfo {
 	//private int totalPaymentCount;
 	//private int remainingPaymentCount;
 	//private String paymentAddress;
-	//private double ratio;
+	@JsonbProperty("Ratio")
+	private double ratio;
 	@JsonbProperty("Yeas")
 	private int yeas;
 	@JsonbProperty("Nays")
 	private int nays;
-	//private int abstains;
+	@JsonbProperty("Abstains")
+	private int abstains;
 	//private int totalPayment;
 	//private int monthlyPayment;
 	//private boolean isEstablished;
diff --git a/fx/src/main/resources/org/unigrid/janus/view/mainWindow.fxml b/fx/src/main/resources/org/unigrid/janus/view/mainWindow.fxml
index a7277569..f6b292e6 100644
--- a/fx/src/main/resources/org/unigrid/janus/view/mainWindow.fxml
+++ b/fx/src/main/resources/org/unigrid/janus/view/mainWindow.fxml
@@ -370,7 +370,7 @@
                               		<fx:include source="settings.fxml" VBox.vgrow="ALWAYS" />
                               	</children>
                               </VBox>
-                              <VBox fx:id="pnlGovernace" layoutX="10.0" layoutY="10.0" visible="false" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+                              <VBox fx:id="pnlGovernace" visible="false" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
                                  <children>
                                     <fx:include source="vote.fxml" />
                                  </children>
diff --git a/fx/src/main/resources/org/unigrid/janus/view/vote.fxml b/fx/src/main/resources/org/unigrid/janus/view/vote.fxml
index dd6af76f..5f77c965 100644
--- a/fx/src/main/resources/org/unigrid/janus/view/vote.fxml
+++ b/fx/src/main/resources/org/unigrid/janus/view/vote.fxml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import javafx.scene.control.Button?>
 <?import javafx.scene.control.Label?>
+<?import javafx.scene.control.ProgressBar?>
 <?import javafx.scene.control.TableColumn?>
 <?import javafx.scene.control.TableView?>
 <?import javafx.scene.layout.AnchorPane?>
@@ -22,15 +22,9 @@
          <bottom>
             <HBox prefHeight="48.0" prefWidth="450.0" BorderPane.alignment="CENTER">
                <children>
-                  <AnchorPane fx:id="pnlCastVote" prefHeight="67.0" prefWidth="449.0">
-                     <children>
-                        <Button fx:id="btnNo" layoutX="205.0" layoutY="10.0" mnemonicParsing="false" onAction="#OnVoteNo" text="No" />
-                        <Button fx:id="btnYes" layoutX="91.0" layoutY="10.0" mnemonicParsing="false" onAction="#OnVoteYes" text="Yes" />
-                        <Button fx:id="btnAbstain" layoutX="312.0" layoutY="10.0" mnemonicParsing="false" onAction="#OnVoteAbstain" text="Abstain" />
-                     </children>
-                  </AnchorPane>
-               </children>
-            </HBox>
+                  <Label fx:id="lblTitle" text="Label" textFill="#ee7711" />
+                  <ProgressBar fx:id="pgbRatio" prefWidth="200.0" progress="0.0" />
+               </children></HBox>
          </bottom>
          <center>
             <TableView fx:id="tblGoveData" BorderPane.alignment="CENTER">
@@ -38,8 +32,8 @@
                   <TableColumn fx:id="tbcProposal" prefWidth="75.0" text="Proposal" />
                   <TableColumn fx:id="tbcVotes" prefWidth="75.0" text="Vots" />
                 <TableColumn fx:id="tbcYes" prefWidth="75.0" />
-                <TableColumn fx:id="tcbNo" prefWidth="75.0" />
-                  <TableColumn fx:id="tcbAbstain" prefWidth="75.0" />
+                <TableColumn fx:id="tbcNo" prefWidth="75.0" />
+                  <TableColumn fx:id="tbcAbstain" prefWidth="75.0" />
               </columns>
             </TableView>
          </center>

From 9d73afaf7f03c77e28e788388a41ebb76df17e95 Mon Sep 17 00:00:00 2001
From: Fim-84 <marcus.stenberg@gmail.com>
Date: Fri, 8 Sep 2023 16:06:05 +0200
Subject: [PATCH 05/10] Finished a first draft of governace tab

---
 fx/pom.xml                                    |   5 -
 fx/src/main/java/module-info.java             |   1 -
 fx/src/main/java/org/unigrid/janus/Janus.java |   4 -
 .../controller/MainWindowController.java      |   4 +-
 .../janus/controller/MnemonicController.java  |  26 ----
 .../janus/controller/VoteController.java      | 127 ++++++++++-------
 .../controller/WalletSetupController.java     | 134 ------------------
 .../org/unigrid/janus/model/BudgetInfo.java   |   1 -
 .../org/unigrid/janus/model/FxMnemonic.java   |  60 --------
 .../java/org/unigrid/janus/model/Wallet.java  |   2 +-
 .../janus/model/rpc/entity/BudgetGetVote.java |   4 +-
 .../janus/model/rpc/entity/BudgetVote.java    |   4 +-
 .../janus/model/service/RPCService.java       |   5 +-
 .../unigrid/janus/model/signal/NewBlock.java  |   1 +
 .../unigrid/janus/view/createnewwallet.fxml   |  64 ---------
 .../org/unigrid/janus/view/mainWindow.fxml    |  20 +--
 .../org/unigrid/janus/view/mnemonic.fxml      |  20 ---
 .../org/unigrid/janus/view/promtMnemonic.fxml |  18 ---
 .../unigrid/janus/view/shuffleMnemonic.fxml   |  48 -------
 .../org/unigrid/janus/view/vote.fxml          |  35 +++--
 .../org/unigrid/janus/model/MnemonicTest.java |  76 ----------
 21 files changed, 110 insertions(+), 549 deletions(-)
 delete mode 100644 fx/src/main/java/org/unigrid/janus/controller/MnemonicController.java
 delete mode 100644 fx/src/main/java/org/unigrid/janus/controller/WalletSetupController.java
 delete mode 100644 fx/src/main/java/org/unigrid/janus/model/FxMnemonic.java
 delete mode 100644 fx/src/main/resources/org/unigrid/janus/view/createnewwallet.fxml
 delete mode 100644 fx/src/main/resources/org/unigrid/janus/view/mnemonic.fxml
 delete mode 100644 fx/src/main/resources/org/unigrid/janus/view/promtMnemonic.fxml
 delete mode 100644 fx/src/main/resources/org/unigrid/janus/view/shuffleMnemonic.fxml
 delete mode 100644 fx/src/test/java/org/unigrid/janus/model/MnemonicTest.java

diff --git a/fx/pom.xml b/fx/pom.xml
index c3b3121b..0cb711ad 100644
--- a/fx/pom.xml
+++ b/fx/pom.xml
@@ -229,11 +229,6 @@
 			<artifactId>slf4j-api</artifactId>
 			<version>2.0.0-alpha7</version>
 		</dependency>
-                <dependency>
-                        <groupId>org.unigrid</groupId>
-                        <artifactId>web3jshaded</artifactId>
-                        <version>1.0-SNAPSHOT</version>
-                </dependency>
 		<!--<dependency>
 		    <groupId>com.dustinredmond.fxtrayicon</groupId>
 		    <artifactId>FXTrayIcon</artifactId>
diff --git a/fx/src/main/java/module-info.java b/fx/src/main/java/module-info.java
index 7b699b35..142f848a 100644
--- a/fx/src/main/java/module-info.java
+++ b/fx/src/main/java/module-info.java
@@ -57,7 +57,6 @@ of the License (see COPYING and COPYING.addendum).
 	//requires FXTrayIcon;
 	//requires javafx.swing;
 	requires j8fu;
-	requires web3jshaded;
 
 	uses org.update4j.service.Launcher;
 	provides org.update4j.service.Launcher with org.unigrid.janus.JanusLauncher;
diff --git a/fx/src/main/java/org/unigrid/janus/Janus.java b/fx/src/main/java/org/unigrid/janus/Janus.java
index a4335e02..4dc2bb44 100644
--- a/fx/src/main/java/org/unigrid/janus/Janus.java
+++ b/fx/src/main/java/org/unigrid/janus/Janus.java
@@ -57,7 +57,6 @@ of the License (see COPYING and COPYING.addendum).
 import org.update4j.OS;
 import org.unigrid.janus.model.cdi.Eager;
 import org.unigrid.janus.controller.SplashScreenController;
-import org.unigrid.janus.controller.WalletSetupController;
 import org.unigrid.janus.model.ExternalVersion;
 import org.unigrid.janus.model.JanusModel;
 import org.unigrid.janus.model.UpdateWallet;
@@ -100,8 +99,6 @@ public class Janus extends BaseApplication implements PropertyChangeListener {
 	// @Inject private TrayService tray;
 	@Inject
 	private ExternalVersion externalVersion;
-	@Inject
-	private WalletSetupController walletSetupController;
 
 	private BooleanProperty ready = new SimpleBooleanProperty(false);
 	private int block = -1;
@@ -178,7 +175,6 @@ public void startFromBootstrap(Stage stage) throws Exception {
 
 	public void startupSequence() {
 		startSplashScreen();
-		walletSetupController.show();
 		startDaemon();
 		ready.addListener(new ChangeListener<Boolean>() {
 			@Override
diff --git a/fx/src/main/java/org/unigrid/janus/controller/MainWindowController.java b/fx/src/main/java/org/unigrid/janus/controller/MainWindowController.java
index afae9f23..34594f87 100644
--- a/fx/src/main/java/org/unigrid/janus/controller/MainWindowController.java
+++ b/fx/src/main/java/org/unigrid/janus/controller/MainWindowController.java
@@ -146,12 +146,12 @@ private void onSettingsTap(MouseEvent event) {
 		}
 		select(pnlSettings, btnSettings);
 	}
-	
+
 	@FXML
 	private void onGovernaceClicked(MouseEvent event) {
 		select(pnlGovernace, btnGovernace);
 	}
-	
+
 	@Override
 	public void propertyChange(PropertyChangeEvent event) {
 		if (event.getPropertyName().equals(wallet.BLOCKS_PROPERTY)) {
diff --git a/fx/src/main/java/org/unigrid/janus/controller/MnemonicController.java b/fx/src/main/java/org/unigrid/janus/controller/MnemonicController.java
deleted file mode 100644
index 68f1dcf4..00000000
--- a/fx/src/main/java/org/unigrid/janus/controller/MnemonicController.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
-	The Janus Wallet
-	Copyright © 2021-2022 The Unigrid Foundation, UGD Software AB
-
-	This program is free software: you can redistribute it and/or modify it under the terms of the
-	addended GNU Affero General Public License as published by the Free Software Foundation, version 3
-	of the License (see COPYING and COPYING.addendum).
-
-	This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
-	even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-	GNU Affero General Public License for more details.
-
-	You should have received an addended copy of the GNU Affero General Public License with this program.
-	If not, see <http://www.gnu.org/licenses/> and <https://github.com/unigrid-project/janus-java>.
- */
-
-package org.unigrid.janus.controller;
-
-import javafx.event.ActionEvent;
-import javafx.fxml.FXML;
-import lombok.NoArgsConstructor;
-
-@NoArgsConstructor
-public class MnemonicController {
-
-}
diff --git a/fx/src/main/java/org/unigrid/janus/controller/VoteController.java b/fx/src/main/java/org/unigrid/janus/controller/VoteController.java
index 31e7f63c..7be6c702 100644
--- a/fx/src/main/java/org/unigrid/janus/controller/VoteController.java
+++ b/fx/src/main/java/org/unigrid/janus/controller/VoteController.java
@@ -25,10 +25,9 @@ of the License (see COPYING and COPYING.addendum).
 import java.util.List;
 import java.util.ResourceBundle;
 import javafx.beans.property.ReadOnlyObjectWrapper;
-import javafx.beans.value.ObservableValue;
+import javafx.beans.property.ReadOnlyStringWrapper;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
-import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.fxml.Initializable;
 import javafx.scene.control.Button;
@@ -39,52 +38,58 @@ of the License (see COPYING and COPYING.addendum).
 import javafx.scene.control.TableView;
 import javafx.scene.control.Tooltip;
 import javafx.scene.layout.AnchorPane;
-import javafx.util.Callback;
 import org.unigrid.janus.model.rpc.entity.BudgetGetVote;
 import org.unigrid.janus.model.rpc.entity.BudgetVote;
 import org.unigrid.janus.model.service.RPCService;
 import org.unigrid.janus.model.signal.NewBlock;
-import org.unigrid.janus.model.BudgetInfo;
 import org.unigrid.janus.model.service.BrowserService;
 
 @ApplicationScoped
-public class VoteController implements Initializable{
+public class VoteController implements Initializable {
 
 	@Inject private RPCService rpc;
 	@Inject private BrowserService browser;
-	
-	@FXML Label lblTitle;
-	@FXML Label lblSummary;
-	@FXML Button btnYes;
-	@FXML Button btnNo;
-	@FXML Button btnAbstain;
-	@FXML Label lblYeas;
-	@FXML Label lblNays;
-	@FXML ProgressBar pgbRatio;
-	@FXML AnchorPane pnlCastVote;
-	@FXML TableView tblGoveData;
-	@FXML TableColumn tbcProposal;
-	@FXML TableColumn tbcVotes;
-	@FXML TableColumn tbcYes;
-	@FXML TableColumn tbcNo;
-	@FXML TableColumn tbcAbstain;
+
+	@FXML private Label lblTitle;
+	@FXML private Label lblSummary;
+	@FXML private Button btnYes;
+	@FXML private Button btnNo;
+	@FXML private Button btnAbstain;
+	@FXML private Label lblYeas;
+	@FXML private Label lblNays;
+	@FXML private ProgressBar pgbRatio;
+	@FXML private AnchorPane pnlCastVote;
+	@FXML private TableView tblGoveData;
+	@FXML private TableColumn colProposal;
+	@FXML private TableColumn colVotes;
+	@FXML private TableColumn colYes;
+	@FXML private TableColumn colNo;
+	@FXML private TableColumn colAbstain;
+	@FXML private TableColumn colNumVotes;
+	@FXML private Label lblNoVotes;
 
 	private ObservableList<BudgetGetVote.Result> tableList;
-	private List<BudgetGetVote.Result> listBudgetInfo = new ArrayList<>();;
-	
+	private List<BudgetGetVote.Result> listBudgetInfo = new ArrayList<>();
+
 	@PostConstruct
-	private void testmethod() {
+	private void postConstruct() {
 		tableList = FXCollections.observableList(listBudgetInfo);
 	}
-	
+
 	@Override
 	public void initialize(URL u, ResourceBundle rb) {
-		//URL cssPath = VoteController.class.getResource("resources/main.css");
+		String cssPath = VoteController.class.getResource("/org/unigrid/janus/view/main.css").toExternalForm();
+		String style = "-fx-background-radius: 50;"
+			+ "-fx-border-color: #e72;"
+			+ "-fx-border-radius: 50;"
+			+ "-fx-border-width: 2;"
+			+ "-fx-cursor: hand;";
 		//tblGoveData.setItems(tableList);
-		tbcProposal.prefWidthProperty().bind(tblGoveData.widthProperty().multiply(0.25));
-		tbcVotes.prefWidthProperty().bind(tblGoveData.widthProperty().multiply(0.3));
-		tbcVotes.setStyle("-fx-alignment: CENTER;");
-		tbcProposal.setCellValueFactory(cell -> {
+		colProposal.prefWidthProperty().bind(tblGoveData.widthProperty().multiply(0.25));
+		colVotes.prefWidthProperty().bind(tblGoveData.widthProperty().multiply(0.3));
+		colAbstain.prefWidthProperty().bind(tblGoveData.widthProperty().multiply(0.15));
+		colVotes.setStyle("-fx-alignment: CENTER;");
+		colProposal.setCellValueFactory(cell -> {
 			System.out.println("Name");
 			String name = ((TableColumn.CellDataFeatures<BudgetGetVote.Result, String>) cell).getValue()
 				.getName();
@@ -102,7 +107,18 @@ public void initialize(URL u, ResourceBundle rb) {
 			return new ReadOnlyObjectWrapper<Hyperlink>(link);
 		});
 
-		tbcVotes.setCellValueFactory(cell -> {
+		colNumVotes.setCellValueFactory(cell -> {
+			int yes = ((TableColumn.CellDataFeatures<BudgetGetVote.Result, Integer>) cell).getValue()
+				.getYeas();
+			int no = ((TableColumn.CellDataFeatures<BudgetGetVote.Result, Integer>) cell).getValue()
+				.getNays();
+			int abstain = ((TableColumn.CellDataFeatures<BudgetGetVote.Result, Integer>) cell).getValue()
+				.getAbstains();
+			String output = yes + "/" + no + "/" + abstain;
+			return new ReadOnlyStringWrapper(output);
+		});
+
+		colVotes.setCellValueFactory(cell -> {
 			System.out.println("Doing a progbar");
 			ProgressBar bar = new ProgressBar();
 			double progress = ((TableColumn.CellDataFeatures<BudgetGetVote.Result, Integer>) cell).getValue()
@@ -117,14 +133,14 @@ public void initialize(URL u, ResourceBundle rb) {
 			//progress = (yes / (yes + no));
 			bar.setProgress(progress);
 			bar.setPrefWidth(tblGoveData.widthProperty().multiply(0.3).doubleValue());
-			//bar.getStylesheets().add(cssPath.toString());
-			
-			//bar.getStyleClass().add("vote-progress-bar");
+			bar.getStylesheets().addAll(cssPath);
+
+			bar.getStyleClass().add("vote-progress-bar");
 
 			return new ReadOnlyObjectWrapper<ProgressBar>(bar);
 		});
-		
-		tbcYes.setCellValueFactory(cell -> {
+
+		colYes.setCellValueFactory(cell -> {
 			Button button = new Button("Yes");
 			String hash = ((TableColumn.CellDataFeatures<BudgetGetVote.Result, Integer>) cell).getValue()
 				.getHash();
@@ -132,11 +148,12 @@ public void initialize(URL u, ResourceBundle rb) {
 				rpc.call(new BudgetVote.Request(new Object[]{"vote-many", hash, "yes"}),
 					BudgetVote.class);
 			});
-			
+			button.getStylesheets().addAll(cssPath);
+			button.setStyle(style);
 			return new ReadOnlyObjectWrapper<Button>(button);
 		});
-		
-		tbcNo.setCellValueFactory(cell -> {
+
+		colNo.setCellValueFactory(cell -> {
 			Button button = new Button("No");
 			String hash = ((TableColumn.CellDataFeatures<BudgetGetVote.Result, Integer>) cell).getValue()
 				.getHash();
@@ -144,10 +161,12 @@ public void initialize(URL u, ResourceBundle rb) {
 				rpc.call(new BudgetVote.Request(new Object[]{"vote-many", hash, "no"}),
 					BudgetVote.class);
 			});
+			button.getStylesheets().addAll(cssPath);
+			button.setStyle(style);
 			return new ReadOnlyObjectWrapper<Button>(button);
 		});
-		
-		tbcAbstain.setCellValueFactory(cell -> {
+
+		colAbstain.setCellValueFactory(cell -> {
 			Button button = new Button("Abstain");
 			String hash = ((TableColumn.CellDataFeatures<BudgetGetVote.Result, Integer>) cell).getValue()
 				.getHash();
@@ -155,22 +174,32 @@ public void initialize(URL u, ResourceBundle rb) {
 				rpc.call(new BudgetVote.Request(new Object[]{"vote-many", hash, "abstain"}),
 					BudgetVote.class);
 			});
+			button.getStylesheets().addAll(cssPath);
+			button.setStyle(style);
 			return new ReadOnlyObjectWrapper<Button>(button);
 		});
 	}
 
 	private void onMessage(@Observes NewBlock update) {
 		BudgetGetVote budgetInfo = rpc.call(new BudgetGetVote.Request(new Object[]{"show"}), BudgetGetVote.class);
+		int index = 0;
+		for (int i = 0; i < budgetInfo.getResult().size(); i++) {
+			if (budgetInfo.getResult().get(i).getName().equals("Pickle-DAO")) {
+				index = i;
+			}
+		}
 
-		listBudgetInfo.clear();
-		listBudgetInfo.addAll(budgetInfo.getResult());
-		tblGoveData.setItems(tableList);
-		
+		if (listBudgetInfo.size() == 0) {
+			tblGoveData.setVisible(false);
+			lblNoVotes.setVisible(true);
+		} else {
+			tblGoveData.setVisible(true);
+			lblNoVotes.setVisible(false);
+			budgetInfo.getResult().remove(index);
+			listBudgetInfo.clear();
+			listBudgetInfo.addAll(budgetInfo.getResult());
+			tblGoveData.setItems(tableList);
 
-		for (int i = 0; i < budgetInfo.getResult().size(); i++) {
-			
-			lblTitle.setText(budgetInfo.getResult().get(i).getName());
-			pgbRatio.setProgress(budgetInfo.getResult().get(i).getRatio());
 		}
 	}
 }
diff --git a/fx/src/main/java/org/unigrid/janus/controller/WalletSetupController.java b/fx/src/main/java/org/unigrid/janus/controller/WalletSetupController.java
deleted file mode 100644
index 21c42e8a..00000000
--- a/fx/src/main/java/org/unigrid/janus/controller/WalletSetupController.java
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
-	The Janus Wallet
-	Copyright © 2021-2022 The Unigrid Foundation, UGD Software AB
-
-	This program is free software: you can redistribute it and/or modify it under the terms of the
-	addended GNU Affero General Public License as published by the Free Software Foundation, version 3
-	of the License (see COPYING and COPYING.addendum).
-
-	This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
-	even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-	GNU Affero General Public License for more details.
-
-	You should have received an addended copy of the GNU Affero General Public License with this program.
-	If not, see <http://www.gnu.org/licenses/> and <https://github.com/unigrid-project/janus-java>.
- */
-
-package org.unigrid.janus.controller;
-
-import jakarta.annotation.PostConstruct;
-import jakarta.enterprise.context.ApplicationScoped;
-import javafx.event.ActionEvent;
-import javafx.fxml.FXML;
-import javafx.fxml.FXMLLoader;
-import javafx.scene.layout.AnchorPane;
-import javafx.scene.layout.BorderPane;
-import javafx.stage.Stage;
-import lombok.NoArgsConstructor;
-import org.unigrid.janus.model.cdi.Eager;
-
-@Eager
-@ApplicationScoped
-@NoArgsConstructor
-public class WalletSetupController {
-
-	public enum Window {
-		MNEMONIC,
-		PASSWORD,
-		PROMTMNEMONIC,
-		SHUFFLEMNEMONIC
-	}
-
-	@FXML
-	private Stage createWallet;
-	@FXML
-	private BorderPane centerView;
-	private AnchorPane mnemonic;
-	private AnchorPane password;
-	private AnchorPane promtMnemonic;
-	private AnchorPane shuffleMnemonic;
-
-	private Window currentWindow;
-
-	@PostConstruct
-	public void init() {
-		try {
-			createWallet = FXMLLoader
-				.load(this.getClass().getResource("/org/unigrid/janus/view/createnewwallet.fxml"));
-			//System.out.println("wallet setup init");
-			mnemonic = (AnchorPane) FXMLLoader
-				.load(this.getClass().getResource("/org/unigrid/janus/view/mnemonic.fxml"));
-			password = (AnchorPane) FXMLLoader
-				.load(this.getClass().getResource("/org/unigrid/janus/view/password.fxml"));
-			promtMnemonic = (AnchorPane) FXMLLoader
-				.load(this.getClass().getResource("/org/unigrid/janus/view/promtMnemonic.fxml"));
-			shuffleMnemonic = (AnchorPane) FXMLLoader
-				.load(this.getClass().getResource("/org/unigrid/janus/view/shuffleMnemonic.fxml"));
-			System.out.println("wallet setup initialize");
-
-			if (centerView == null) {
-				centerView = (BorderPane) createWallet.getScene().lookup("#centerView");
-			}
-			mnemonic.setVisible(false);
-			promtMnemonic.setVisible(false);
-			shuffleMnemonic.setVisible(false);
-			centerView.getChildren().addAll(mnemonic, password, promtMnemonic, shuffleMnemonic);
-			password.setVisible(true);
-		} catch (Exception ex) {
-			System.out.println("ERROR: " + ex.getMessage());
-			ex.printStackTrace();
-		}
-	}
-
-	@FXML
-	public void onNext(ActionEvent ev) {
-		if (currentWindow == null) {
-			currentWindow = Window.PASSWORD;
-		}
-		System.out.println(currentWindow);
-		switch (currentWindow) {
-			case PASSWORD:
-				password.setVisible(false);
-				promtMnemonic.setVisible(true);
-				currentWindow = Window.PROMTMNEMONIC;
-			case PROMTMNEMONIC:
-				promtMnemonic.setVisible(false);
-				mnemonic.setVisible(true);
-				currentWindow = Window.MNEMONIC;
-			case MNEMONIC:
-				mnemonic.setVisible(false);
-				shuffleMnemonic.setVisible(true);
-				currentWindow = Window.SHUFFLEMNEMONIC;
-			case SHUFFLEMNEMONIC:
-		}
-	}
-
-	@FXML
-	public void onBack(ActionEvent ev) {
-		switch (currentWindow) {
-			case PASSWORD:
-			case PROMTMNEMONIC:
-			case MNEMONIC:
-			case SHUFFLEMNEMONIC:
-		}
-	}
-
-	public void show() {
-		createWallet.show();
-	}
-
-	@FXML
-	public void onWriteByHand(ActionEvent ev) {
-		//
-	}
-
-	@FXML
-	public void onPrint(ActionEvent ev) {
-		//
-	}
-
-	@FXML
-	public void onHardwareWallet(ActionEvent ev) {
-		//
-	}
-}
diff --git a/fx/src/main/java/org/unigrid/janus/model/BudgetInfo.java b/fx/src/main/java/org/unigrid/janus/model/BudgetInfo.java
index 151116db..a0d6f752 100644
--- a/fx/src/main/java/org/unigrid/janus/model/BudgetInfo.java
+++ b/fx/src/main/java/org/unigrid/janus/model/BudgetInfo.java
@@ -18,7 +18,6 @@ of the License (see COPYING and COPYING.addendum).
 
 import jakarta.json.bind.annotation.JsonbProperty;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 
 @Data
 public class BudgetInfo {
diff --git a/fx/src/main/java/org/unigrid/janus/model/FxMnemonic.java b/fx/src/main/java/org/unigrid/janus/model/FxMnemonic.java
deleted file mode 100644
index 427da553..00000000
--- a/fx/src/main/java/org/unigrid/janus/model/FxMnemonic.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
-	The Janus Wallet
-	Copyright © 2021-2022 The Unigrid Foundation, UGD Software AB
-
-	This program is free software: you can redistribute it and/or modify it under the terms of the
-	addended GNU Affero General Public License as published by the Free Software Foundation, version 3
-	of the License (see COPYING and COPYING.addendum).
-
-	This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
-	even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-	GNU Affero General Public License for more details.
-
-	You should have received an addended copy of the GNU Affero General Public License with this program.
-	If not, see <http://www.gnu.org/licenses/> and <https://github.com/unigrid-project/janus-java>.
- */
-
-package org.unigrid.janus.model;
-
-import jakarta.enterprise.context.ApplicationScoped;
-import java.io.File;
-import java.io.IOException;
-import java.security.SecureRandom;
-import lombok.NoArgsConstructor;
-import org.web3j.crypto.MnemonicUtils;
-import org.web3j.crypto.Bip39Wallet;
-import org.web3j.crypto.Bip44WalletUtils;
-import org.web3j.crypto.CipherException;
-
-@ApplicationScoped
-@NoArgsConstructor
-public class FxMnemonic {
-
-	public String generateWallet(String password, boolean testnet) throws CipherException, IOException {
-		String dataDir = DataDirectory.get() + "/ugdcos/";
-		File file = new File(dataDir);
-		if (!file.exists()) {
-			file.mkdir();
-		}
-		Bip39Wallet wallet = Bip44WalletUtils.generateBip44Wallet(password, file, testnet);
-
-		return wallet.getMnemonic();
-	}
-
-	public String generateMnemonic() {
-		byte[] initialEntropy = new byte[32];
-		SecureRandom serRandom = new SecureRandom();
-		serRandom.nextBytes(initialEntropy);
-		String mnemonic = MnemonicUtils.generateMnemonic(initialEntropy);
-		return mnemonic;
-	}
-
-	public void generateKeyring(String mnemonic, String password) {
-		if (!MnemonicUtils.validateMnemonic(mnemonic)) {
-			return;
-		}
-
-		byte[] seed = MnemonicUtils.generateSeed(mnemonic, password);
-		//HDWallet hdWallet = HDWallet.create(seed);
-	}
-}
diff --git a/fx/src/main/java/org/unigrid/janus/model/Wallet.java b/fx/src/main/java/org/unigrid/janus/model/Wallet.java
index 70c0ceda..2481e27a 100644
--- a/fx/src/main/java/org/unigrid/janus/model/Wallet.java
+++ b/fx/src/main/java/org/unigrid/janus/model/Wallet.java
@@ -80,6 +80,7 @@ public class Wallet {
 	@Inject private DebugService debug;
 
 	@Inject private Event<NewBlock> newBlockEvent;
+
 	@AllArgsConstructor
 	public enum LockState {
 		UNLOCKED("unlocked"),
@@ -193,7 +194,6 @@ public void setBlocks(int newValue) {
 		//System.out.println("setting blocks: " + this.blocks);
 		this.pcs.firePropertyChange(this.BLOCKS_PROPERTY, oldValue, newValue);
 		newBlockEvent.fire(NewBlock.builder().blockCount(newValue).build());
-		
 	}
 
 	public int getConnections() {
diff --git a/fx/src/main/java/org/unigrid/janus/model/rpc/entity/BudgetGetVote.java b/fx/src/main/java/org/unigrid/janus/model/rpc/entity/BudgetGetVote.java
index 16202f8b..4c43c36f 100644
--- a/fx/src/main/java/org/unigrid/janus/model/rpc/entity/BudgetGetVote.java
+++ b/fx/src/main/java/org/unigrid/janus/model/rpc/entity/BudgetGetVote.java
@@ -26,14 +26,14 @@ of the License (see COPYING and COPYING.addendum).
 public class BudgetGetVote extends BaseResult<List<BudgetGetVote.Result>> {
 	private static final String METHOD = "gnbudget";
 
-	public static class Request extends BaseRequest{
+	public static class Request extends BaseRequest {
 		public Request(Object[] args) {
 			super(METHOD);
 			this.setParams(args);
 		}
 	}
 
-	public static class Result extends BudgetInfo{
+	public static class Result extends BudgetInfo {
 		/* Empty on purpose */
 	}
 }
diff --git a/fx/src/main/java/org/unigrid/janus/model/rpc/entity/BudgetVote.java b/fx/src/main/java/org/unigrid/janus/model/rpc/entity/BudgetVote.java
index 50398a5e..016c2680 100644
--- a/fx/src/main/java/org/unigrid/janus/model/rpc/entity/BudgetVote.java
+++ b/fx/src/main/java/org/unigrid/janus/model/rpc/entity/BudgetVote.java
@@ -24,7 +24,7 @@ of the License (see COPYING and COPYING.addendum).
 public class BudgetVote {
 	private static final String METHOD = "gnbudget";
 
-	public static class Request extends BaseRequest{
+	public static class Request extends BaseRequest {
 		public Request(Object[] args) {
 			super(METHOD);
 			this.setParams(args);
@@ -32,6 +32,6 @@ public Request(Object[] args) {
 	}
 
 	public static class Result {
-		
+		/* Empty on purpose */
 	}
 }
diff --git a/fx/src/main/java/org/unigrid/janus/model/service/RPCService.java b/fx/src/main/java/org/unigrid/janus/model/service/RPCService.java
index 91de104a..b51863a9 100644
--- a/fx/src/main/java/org/unigrid/janus/model/service/RPCService.java
+++ b/fx/src/main/java/org/unigrid/janus/model/service/RPCService.java
@@ -43,7 +43,6 @@ of the License (see COPYING and COPYING.addendum).
 import lombok.Getter;
 import lombok.Setter;
 import org.unigrid.janus.model.cdi.Eager;
-import org.unigrid.janus.model.rpc.entity.BudgetGetVote;
 
 @Eager
 @ApplicationScoped
@@ -136,8 +135,8 @@ public void stopPolling() {
 	}
 
 	public <R, T> T call(R request, Class<T> clazz) {
-			//debug.print("RPC call ".concat(request.toString()), RPCService.class.getSimpleName());
-			return target.request().post(Entity.json(request)).readEntity(clazz);
+		//debug.print("RPC call ".concat(request.toString()), RPCService.class.getSimpleName());
+		return target.request().post(Entity.json(request)).readEntity(clazz);
 	}
 
 	public <R> String callToJson(R request) {
diff --git a/fx/src/main/java/org/unigrid/janus/model/signal/NewBlock.java b/fx/src/main/java/org/unigrid/janus/model/signal/NewBlock.java
index 231aa50c..c70b94b8 100644
--- a/fx/src/main/java/org/unigrid/janus/model/signal/NewBlock.java
+++ b/fx/src/main/java/org/unigrid/janus/model/signal/NewBlock.java
@@ -13,6 +13,7 @@ of the License (see COPYING and COPYING.addendum).
 	You should have received an addended copy of the GNU Affero General Public License with this program.
 	If not, see <http://www.gnu.org/licenses/> and <https://github.com/unigrid-project/janus-java>.
  */
+
 package org.unigrid.janus.model.signal;
 
 import lombok.Builder;
diff --git a/fx/src/main/resources/org/unigrid/janus/view/createnewwallet.fxml b/fx/src/main/resources/org/unigrid/janus/view/createnewwallet.fxml
deleted file mode 100644
index 8d60fe96..00000000
--- a/fx/src/main/resources/org/unigrid/janus/view/createnewwallet.fxml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?import javafx.geometry.Insets?>
-<?import javafx.scene.Scene?>
-<?import javafx.scene.control.Button?>
-<?import javafx.scene.control.Label?>
-<?import javafx.scene.layout.AnchorPane?>
-<?import javafx.scene.layout.BorderPane?>
-<?import javafx.scene.layout.ColumnConstraints?>
-<?import javafx.scene.layout.GridPane?>
-<?import javafx.scene.layout.RowConstraints?>
-<?import javafx.scene.text.Font?>
-<?import javafx.stage.Stage?>
-
-<Stage fx:id="createWallet" xmlns="http://javafx.com/javafx/18" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.unigrid.janus.controller.WalletSetupController">
-    <scene>
-        <Scene stylesheets="@main.css">
-            <AnchorPane prefHeight="400.0" prefWidth="600.0">
-            <children>
-               <BorderPane fx:id="centerView" prefHeight="200.0" prefWidth="200.0" style="-fx-background-color: linear-gradient(from 75px 75px to 200px 150px, #00001c, #000024);" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
-                  <top>
-                     <Label style="-fx-text-fill: orange;" text="Create new unigrid wallet" BorderPane.alignment="CENTER">
-                        <padding>
-                           <Insets top="5.0" />
-                        </padding>
-                        <font>
-                           <Font size="19.0" />
-                        </font>
-                     </Label>
-                  </top>
-                  <bottom>
-                     <GridPane BorderPane.alignment="CENTER">
-                       <columnConstraints>
-                         <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
-                         <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
-                       </columnConstraints>
-                       <rowConstraints>
-                         <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-                       </rowConstraints>
-                        <padding>
-                           <Insets bottom="15.0" />
-                        </padding>
-                        <children>
-                           <Button mnemonicParsing="false" onAction="#onBack" prefHeight="40.0" prefWidth="140.0" text="Back" GridPane.halignment="CENTER">
-                              <font>
-                                 <Font size="19.0" />
-                              </font>
-                           </Button>
-                           <Button mnemonicParsing="false" onAction="#onNext" prefHeight="40.0" prefWidth="140.0" text="Next" GridPane.columnIndex="1" GridPane.halignment="CENTER">
-                              <font>
-                                 <Font size="19.0" />
-                              </font>
-                           </Button>
-                        </children>
-                     </GridPane>
-                  </bottom>
-                  <center>
-                     <AnchorPane prefHeight="200.0" prefWidth="200.0" BorderPane.alignment="CENTER" />
-                  </center>
-               </BorderPane>
-            </children></AnchorPane>
-        </Scene>
-    </scene>
-</Stage>
diff --git a/fx/src/main/resources/org/unigrid/janus/view/mainWindow.fxml b/fx/src/main/resources/org/unigrid/janus/view/mainWindow.fxml
index f6b292e6..3645738d 100644
--- a/fx/src/main/resources/org/unigrid/janus/view/mainWindow.fxml
+++ b/fx/src/main/resources/org/unigrid/janus/view/mainWindow.fxml
@@ -22,6 +22,7 @@
 <?import javafx.stage.Stage?>
 <?import org.kordamp.ikonli.javafx.FontIcon?>
 <?import org.kordamp.ikonli.javafx.StackedFontIcon?>
+<?import org.unigrid.janus.view.component.WindowBarButton?>
 
 <Stage minHeight="400.0" minWidth="600.0" title="Unigrid Janus Wallet" xmlns="http://javafx.com/javafx/18" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.unigrid.janus.controller.MainWindowController">
    <scene>
@@ -193,24 +194,7 @@
                                           <Font size="14.0" />
                                        </font>
                                        <graphic>
-                                          <FontIcon fx:id="addressIcn21" iconLiteral="far-newspaper" iconSize="20" stroke="BLACK" strokeType="OUTSIDE" strokeWidth="0.5">
-                                             <iconColor>
-                                                <LinearGradient endX="1.0" endY="1.0">
-                                                   <stops>
-                                                      <Stop>
-                                                         <color>
-                                                            <Color red="0.8815789222717285" green="0.4282051920890808" blue="0.004081383813172579" />
-                                                         </color>
-                                                      </Stop>
-                                                      <Stop offset="1.0">
-                                                         <color>
-                                                            <Color red="0.8947368264198303" green="0.6130604147911072" blue="0.049707602709531784" />
-                                                         </color>
-                                                      </Stop>
-                                                   </stops>
-                                                </LinearGradient>
-                                             </iconColor>
-                                          </FontIcon>
+                                          <WindowBarButton prefHeight="20.0" prefWidth="20.0" style="-fx-shape: &quot;M243.4 2.6l-224 96c-14 6-21.8 21-18.7 35.8S16.8 160 32 160v8c0 13.3 10.7 24 24 24H456c13.3 0 24-10.7 24-24v-8c15.2 0 28.3-10.7 31.3-25.6s-4.8-29.9-18.7-35.8l-224-96c-8-3.4-17.2-3.4-25.2 0zM128 224H64V420.3c-.6 .3-1.2 .7-1.8 1.1l-48 32c-11.7 7.8-17 22.4-12.9 35.9S17.9 512 32 512H480c14.1 0 26.5-9.2 30.6-22.7s-1.1-28.1-12.9-35.9l-48-32c-.6-.4-1.2-.7-1.8-1.1V224H384V416H344V224H280V416H232V224H168V416H128V224zM256 64a32 32 0 1 1 0 64 32 32 0 1 1 0-64z&quot;; -fx-background-size: 20px; -fx-background-color: orange; -fx-cursor: hand;" />
                                        </graphic>
                                     </ToggleButton>
                                     <VBox alignment="BOTTOM_LEFT" VBox.vgrow="ALWAYS">
diff --git a/fx/src/main/resources/org/unigrid/janus/view/mnemonic.fxml b/fx/src/main/resources/org/unigrid/janus/view/mnemonic.fxml
deleted file mode 100644
index 79ae04ec..00000000
--- a/fx/src/main/resources/org/unigrid/janus/view/mnemonic.fxml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?import javafx.scene.control.Button?>
-<?import javafx.scene.control.Label?>
-<?import javafx.scene.layout.AnchorPane?>
-<?import javafx.scene.text.Font?>
-
-<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" style="-fx-background-color: linear-gradient(from 75px 75px to 200px 150px, #00001c, #000024);" stylesheets="@main.css" xmlns="http://javafx.com/javafx/18" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.unigrid.janus.controller.WalletSetupController">
-   <children>
-      <Label fx:id="lblMenmonic" alignment="TOP_CENTER" layoutX="18.0" layoutY="64.0" prefHeight="136.0" prefWidth="564.0" style="-fx-text-fill: orange;" text="Label" wrapText="true" AnchorPane.leftAnchor="18.0" AnchorPane.rightAnchor="18.0">
-         <font>
-            <Font size="20.0" />
-         </font>
-      </Label>
-      <Button fx:id="btnByHand" layoutX="83.0" layoutY="324.0" mnemonicParsing="false" onAction="#onWriteByHand" text="Write by hand" />
-      <Button fx:id="btnPrint" layoutX="274.0" layoutY="324.0" mnemonicParsing="false" onAction="#onPrint" text="Print" />
-      <Button fx:id="btnHardwareWallet" layoutX="371.0" layoutY="324.0" mnemonicParsing="false" onAction="#onHardwareWallet" text="Save to hardware wallet" />
-      <Label layoutX="140.0" layoutY="277.0" style="-fx-text-fill: orange;" text="Choose atleast one option below before proceding" />
-   </children>
-</AnchorPane>
diff --git a/fx/src/main/resources/org/unigrid/janus/view/promtMnemonic.fxml b/fx/src/main/resources/org/unigrid/janus/view/promtMnemonic.fxml
deleted file mode 100644
index 2b18656d..00000000
--- a/fx/src/main/resources/org/unigrid/janus/view/promtMnemonic.fxml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?import javafx.scene.control.CheckBox?>
-<?import javafx.scene.control.Label?>
-<?import javafx.scene.layout.AnchorPane?>
-<?import javafx.scene.text.Font?>
-
-<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" style="-fx-background-color: linear-gradient(from 75px 75px to 200px 150px, #00001c, #000024);" stylesheets="@main.css" xmlns="http://javafx.com/javafx/18" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.unigrid.janus.controller.WalletSetupController">
-   <children>
-      <Label alignment="CENTER" layoutX="228.0" layoutY="32.0" style="-fx-text-fill: orange;" text="Mnemonic" AnchorPane.leftAnchor="18.0" AnchorPane.rightAnchor="18.0" AnchorPane.topAnchor="30.0">
-         <font>
-            <Font size="28.0" />
-         </font>
-      </Label>
-      <Label layoutX="18.0" layoutY="50.0" prefHeight="183.0" prefWidth="566.0" style="-fx-text-fill: orange;" text="Saving your mnemonic is crucial for cryptocurrency security. It acts as a key to recover your wallet and access funds. Losing the mnemonic means permanent loss of funds. Save it securely to prevent data loss, enable wallet recovery, create redundancy, plan for inheritance, and protect against unauthorized access. Treat it as valuable, use offline or encrypted storage, and consider sharing instructions with trusted individuals. Safeguarding your mnemonic ensures control over your financial assets and peace of mind." wrapText="true" AnchorPane.leftAnchor="18.0" AnchorPane.rightAnchor="18.0" />
-      <CheckBox fx:id="chkUserConsent" layoutX="135.0" layoutY="284.0" mnemonicParsing="false" prefHeight="20.0" prefWidth="331.0" style="-fx-text-fill: orange;" text="I have read and understood the text" AnchorPane.leftAnchor="135.0" AnchorPane.rightAnchor="134.0" />
-   </children>
-</AnchorPane>
diff --git a/fx/src/main/resources/org/unigrid/janus/view/shuffleMnemonic.fxml b/fx/src/main/resources/org/unigrid/janus/view/shuffleMnemonic.fxml
deleted file mode 100644
index 6c4b55fb..00000000
--- a/fx/src/main/resources/org/unigrid/janus/view/shuffleMnemonic.fxml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?import javafx.scene.control.Label?>
-<?import javafx.scene.control.TextArea?>
-<?import javafx.scene.layout.AnchorPane?>
-<?import javafx.scene.layout.ColumnConstraints?>
-<?import javafx.scene.layout.GridPane?>
-<?import javafx.scene.layout.RowConstraints?>
-
-
-<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" style="-fx-background-color: linear-gradient(from 75px 75px to 200px 150px, #00001c, #000024);" stylesheets="@main.css" xmlns="http://javafx.com/javafx/18" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.unigrid.janus.controller.WalletSetupController">
-   <children>
-      <GridPane layoutX="217.0" layoutY="163.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
-        <columnConstraints>
-          <ColumnConstraints hgrow="SOMETIMES" maxWidth="94.0" minWidth="10.0" prefWidth="44.0" />
-          <ColumnConstraints hgrow="SOMETIMES" maxWidth="156.0" minWidth="10.0" prefWidth="123.0" />
-            <ColumnConstraints hgrow="SOMETIMES" maxWidth="133.0" minWidth="10.0" prefWidth="133.0" />
-            <ColumnConstraints hgrow="SOMETIMES" maxWidth="139.0" minWidth="10.0" prefWidth="132.0" />
-            <ColumnConstraints hgrow="SOMETIMES" maxWidth="171.0" minWidth="10.0" prefWidth="130.0" />
-            <ColumnConstraints hgrow="SOMETIMES" maxWidth="101.0" minWidth="10.0" prefWidth="38.0" />
-        </columnConstraints>
-        <rowConstraints>
-          <RowConstraints maxHeight="61.0" minHeight="10.0" prefHeight="32.0" vgrow="SOMETIMES" />
-          <RowConstraints maxHeight="95.0" minHeight="10.0" prefHeight="33.0" vgrow="SOMETIMES" />
-          <RowConstraints maxHeight="141.0" minHeight="10.0" prefHeight="32.0" vgrow="SOMETIMES" />
-            <RowConstraints maxHeight="221.0" minHeight="10.0" prefHeight="78.0" vgrow="SOMETIMES" />
-            <RowConstraints maxHeight="199.0" minHeight="10.0" prefHeight="154.0" vgrow="SOMETIMES" />
-            <RowConstraints maxHeight="63.0" minHeight="10.0" prefHeight="63.0" vgrow="SOMETIMES" />
-        </rowConstraints>
-         <children>
-            <Label fx:id="lblWord0" style="-fx-text-fill: orange;" text="Label" GridPane.columnIndex="1" GridPane.halignment="CENTER" />
-            <Label fx:id="lblWord1" style="-fx-text-fill: orange;" text="Label" GridPane.columnIndex="2" GridPane.halignment="CENTER" />
-            <Label fx:id="lblWord2" style="-fx-text-fill: orange;" text="Label" GridPane.columnIndex="3" GridPane.halignment="CENTER" />
-            <Label fx:id="lblWord3" style="-fx-text-fill: orange;" text="Label" GridPane.columnIndex="4" GridPane.halignment="CENTER" />
-            <Label fx:id="lblWord4" style="-fx-text-fill: orange;" text="Label" GridPane.columnIndex="1" GridPane.halignment="CENTER" GridPane.rowIndex="1" />
-            <Label fx:id="lblWord5" style="-fx-text-fill: orange;" text="Label" GridPane.columnIndex="2" GridPane.halignment="CENTER" GridPane.rowIndex="1" />
-            <Label fx:id="lblWord6" style="-fx-text-fill: orange;" text="Label" GridPane.columnIndex="3" GridPane.halignment="CENTER" GridPane.rowIndex="1" />
-            <Label fx:id="lblWord7" style="-fx-text-fill: orange;" text="Label" GridPane.columnIndex="4" GridPane.halignment="CENTER" GridPane.rowIndex="1" />
-            <Label fx:id="lblWord8" style="-fx-text-fill: orange;" text="Label" GridPane.columnIndex="1" GridPane.halignment="CENTER" GridPane.rowIndex="2" />
-            <Label fx:id="lblWord9" style="-fx-text-fill: orange;" text="Label" GridPane.columnIndex="2" GridPane.halignment="CENTER" GridPane.rowIndex="2" />
-            <Label fx:id="lblWord10" style="-fx-text-fill: orange;" text="Label" GridPane.columnIndex="3" GridPane.halignment="CENTER" GridPane.rowIndex="2" />
-            <Label fx:id="lblWord11" style="-fx-text-fill: orange;" text="Label" GridPane.columnIndex="4" GridPane.halignment="CENTER" GridPane.rowIndex="2" />
-            <Label style="-fx-text-fill: orange;" text="Input your mnemonic agien in the correct order" GridPane.columnIndex="1" GridPane.columnSpan="4" GridPane.halignment="CENTER" GridPane.rowIndex="3" />
-            <TextArea prefHeight="200.0" prefWidth="200.0" GridPane.columnIndex="1" GridPane.columnSpan="4" GridPane.rowIndex="4" />
-         </children>
-      </GridPane>
-   </children>
-</AnchorPane>
diff --git a/fx/src/main/resources/org/unigrid/janus/view/vote.fxml b/fx/src/main/resources/org/unigrid/janus/view/vote.fxml
index 5f77c965..057416d8 100644
--- a/fx/src/main/resources/org/unigrid/janus/view/vote.fxml
+++ b/fx/src/main/resources/org/unigrid/janus/view/vote.fxml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <?import javafx.scene.control.Label?>
-<?import javafx.scene.control.ProgressBar?>
 <?import javafx.scene.control.TableColumn?>
 <?import javafx.scene.control.TableView?>
 <?import javafx.scene.layout.AnchorPane?>
@@ -20,22 +19,28 @@
             </Label>
          </top>
          <bottom>
-            <HBox prefHeight="48.0" prefWidth="450.0" BorderPane.alignment="CENTER">
-               <children>
-                  <Label fx:id="lblTitle" text="Label" textFill="#ee7711" />
-                  <ProgressBar fx:id="pgbRatio" prefWidth="200.0" progress="0.0" />
-               </children></HBox>
+            <HBox prefHeight="48.0" prefWidth="450.0" BorderPane.alignment="CENTER" />
          </bottom>
          <center>
-            <TableView fx:id="tblGoveData" BorderPane.alignment="CENTER">
-              <columns>
-                  <TableColumn fx:id="tbcProposal" prefWidth="75.0" text="Proposal" />
-                  <TableColumn fx:id="tbcVotes" prefWidth="75.0" text="Vots" />
-                <TableColumn fx:id="tbcYes" prefWidth="75.0" />
-                <TableColumn fx:id="tbcNo" prefWidth="75.0" />
-                  <TableColumn fx:id="tbcAbstain" prefWidth="75.0" />
-              </columns>
-            </TableView>
+            <AnchorPane BorderPane.alignment="CENTER">
+               <children>
+                  <Label fx:id="lblNoVotes" text="There are no Unigrid proposals at this time" textFill="#ee7722">
+                     <font>
+                        <Font size="24.0" />
+                     </font>
+                  </Label>
+                  <TableView fx:id="tblGoveData" prefHeight="200.0" prefWidth="200.0" visible="false" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+                    <columns>
+                      <TableColumn fx:id="colProposal" prefWidth="75.0" text="Proposal" />
+                      <TableColumn fx:id="colNumVotes" prefWidth="75.0" text="Yes/No/Abstain" />
+                        <TableColumn fx:id="colVotes" prefWidth="75.0" text="Votes" />
+                        <TableColumn fx:id="colYes" prefWidth="75.0" />
+                        <TableColumn fx:id="colNo" prefWidth="75.0" />
+                        <TableColumn fx:id="colAbstain" prefWidth="75.0" />
+                    </columns>
+                  </TableView>
+               </children>
+            </AnchorPane>
          </center>
       </BorderPane>
    </children>
diff --git a/fx/src/test/java/org/unigrid/janus/model/MnemonicTest.java b/fx/src/test/java/org/unigrid/janus/model/MnemonicTest.java
deleted file mode 100644
index e1ea0869..00000000
--- a/fx/src/test/java/org/unigrid/janus/model/MnemonicTest.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
-	The Janus Wallet
-	Copyright © 2021-2022 The Unigrid Foundation, UGD Software AB
-
-	This program is free software: you can redistribute it and/or modify it under the terms of the
-	addended GNU Affero General Public License as published by the Free Software Foundation, version 3
-	of the License (see COPYING and COPYING.addendum).
-
-	This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
-	even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-	GNU Affero General Public License for more details.
-
-	You should have received an addended copy of the GNU Affero General Public License with this program.
-	If not, see <http://www.gnu.org/licenses/> and <https://github.com/unigrid-project/janus-java>.
- */
-
-package org.unigrid.janus.model;
-
-//import com.sun.jna.platform.win32.KnownFolders;
-//import com.sun.jna.platform.win32.Shell32Util;
-import jakarta.inject.Inject;
-//import java.nio.file.Paths;
-import org.unigrid.janus.jqwik.BaseMockedWeldTest;
-import org.unigrid.janus.jqwik.WeldSetup;
-import net.jqwik.api.Example;
-//import mockit.Mock;
-//import mockit.MockUp;
-//import org.apache.commons.lang3.SystemUtils;
-
-@WeldSetup(DeprecatedUpdateWalletModel.class)
-public class MnemonicTest extends BaseMockedWeldTest {
-
-	@Inject
-	private FxMnemonic mnemonic;
-
-	@Example
-	public void shouldMakeANewWallet() {
-		/*new Mockup<DataDirectory>() {
-			private static final String APPLICATION_NAME = "UNIGRID";
-			public static final String CONFIG_FILE = "unigrid.conf";
-			public static final String GRIDNODE_FILE = "gridnode.conf";
-			public static final String DEBUG_LOG = "debug.log";
-			private static final String OSX_SUPPORT_DIR = "Library/Application Support";
-
-			public static final String DATADIR_CONFIG_RPCUSER_KEY = "rpcuser";
-			public static final String DATADIR_CONFIG_RPCPASSWORD_KEY = "rpcpassword";
-
-			@Mock
-			public static String get() {
-				String head;
-				String tail;
-
-				if (SystemUtils.IS_OS_WINDOWS) {
-					head = Shell32Util.getKnownFolderPath(KnownFolders.FOLDERID_RoamingAppData);
-					tail = APPLICATION_NAME;
-					System.out.println("OS is windows");
-				} else {
-					head = SystemUtils.getUserHome().getAbsolutePath();
-
-					if (SystemUtils.IS_OS_MAC_OSX) {
-						head = Paths.get(head, OSX_SUPPORT_DIR).toString();
-						tail = APPLICATION_NAME;
-					} else {
-						tail = Paths.get(".".concat(APPLICATION_NAME).toLowerCase()).toString();
-					}
-				}
-
-				return Paths.get(head, tail).toString();
-			}
-		};*/
-
-		//String mnemonic = mnemonic.generateWallet("123456", true);
-
-		System.out.println(mnemonic);
-	}
-}

From 082060e58ab8ac9a39797e72929c838015463635 Mon Sep 17 00:00:00 2001
From: Fim-84 <marcus.stenberg@gmail.com>
Date: Fri, 8 Sep 2023 16:20:28 +0200
Subject: [PATCH 06/10] Changed gradient color on gov icon

---
 .../main/resources/org/unigrid/janus/view/mainWindow.fxml  | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/fx/src/main/resources/org/unigrid/janus/view/mainWindow.fxml b/fx/src/main/resources/org/unigrid/janus/view/mainWindow.fxml
index 3645738d..f0d79bc7 100644
--- a/fx/src/main/resources/org/unigrid/janus/view/mainWindow.fxml
+++ b/fx/src/main/resources/org/unigrid/janus/view/mainWindow.fxml
@@ -141,6 +141,11 @@
                                                             <Color red="0.8815789222717285" green="0.4282051920890808" blue="0.004081383813172579" />
                                                          </color>
                                                       </Stop>
+                                                      <Stop offset="0.006711409395973154">
+                                                         <color>
+                                                            <Color red="0.8815789222717285" green="0.4282051920890808" blue="0.004081383813172579" />
+                                                         </color>
+                                                      </Stop>
                                                       <Stop offset="1.0">
                                                          <color>
                                                             <Color red="0.8947368264198303" green="0.6130604147911072" blue="0.049707602709531784" />
@@ -194,7 +199,7 @@
                                           <Font size="14.0" />
                                        </font>
                                        <graphic>
-                                          <WindowBarButton prefHeight="20.0" prefWidth="20.0" style="-fx-shape: &quot;M243.4 2.6l-224 96c-14 6-21.8 21-18.7 35.8S16.8 160 32 160v8c0 13.3 10.7 24 24 24H456c13.3 0 24-10.7 24-24v-8c15.2 0 28.3-10.7 31.3-25.6s-4.8-29.9-18.7-35.8l-224-96c-8-3.4-17.2-3.4-25.2 0zM128 224H64V420.3c-.6 .3-1.2 .7-1.8 1.1l-48 32c-11.7 7.8-17 22.4-12.9 35.9S17.9 512 32 512H480c14.1 0 26.5-9.2 30.6-22.7s-1.1-28.1-12.9-35.9l-48-32c-.6-.4-1.2-.7-1.8-1.1V224H384V416H344V224H280V416H232V224H168V416H128V224zM256 64a32 32 0 1 1 0 64 32 32 0 1 1 0-64z&quot;; -fx-background-size: 20px; -fx-background-color: orange; -fx-cursor: hand;" />
+                                          <WindowBarButton prefHeight="20.0" prefWidth="20.0" style="-fx-shape: &quot;M243.4 2.6l-224 96c-14 6-21.8 21-18.7 35.8S16.8 160 32 160v8c0 13.3 10.7 24 24 24H456c13.3 0 24-10.7 24-24v-8c15.2 0 28.3-10.7 31.3-25.6s-4.8-29.9-18.7-35.8l-224-96c-8-3.4-17.2-3.4-25.2 0zM128 224H64V420.3c-.6 .3-1.2 .7-1.8 1.1l-48 32c-11.7 7.8-17 22.4-12.9 35.9S17.9 512 32 512H480c14.1 0 26.5-9.2 30.6-22.7s-1.1-28.1-12.9-35.9l-48-32c-.6-.4-1.2-.7-1.8-1.1V224H384V416H344V224H280V416H232V224H168V416H128V224zM256 64a32 32 0 1 1 0 64 32 32 0 1 1 0-64z&quot;; -fx-background-size: 20px; -fx-background-color: linear-gradient(to bottom, #e16d01, #e49c0d); -fx-cursor: hand;" />
                                        </graphic>
                                     </ToggleButton>
                                     <VBox alignment="BOTTOM_LEFT" VBox.vgrow="ALWAYS">

From 24e2977ebd093092e566240304ca8156e3f18782 Mon Sep 17 00:00:00 2001
From: dekm <gevan73@gmail.com>
Date: Sat, 9 Sep 2023 11:40:02 +0200
Subject: [PATCH 07/10] fix the filtering for the governance so it works.
 Update some of the styling to be a little less stressful on the eyes.

---
 .../janus/controller/VoteController.java      | 171 ++++++++++--------
 .../janus/view/backing/GridnodeListModel.java |   6 +-
 .../org/unigrid/janus/view/vote.fxml          |  55 +++---
 3 files changed, 136 insertions(+), 96 deletions(-)

diff --git a/fx/src/main/java/org/unigrid/janus/controller/VoteController.java b/fx/src/main/java/org/unigrid/janus/controller/VoteController.java
index 7be6c702..43fddca1 100644
--- a/fx/src/main/java/org/unigrid/janus/controller/VoteController.java
+++ b/fx/src/main/java/org/unigrid/janus/controller/VoteController.java
@@ -24,6 +24,8 @@ of the License (see COPYING and COPYING.addendum).
 import java.util.ArrayList;
 import java.util.List;
 import java.util.ResourceBundle;
+import java.util.stream.Collectors;
+
 import javafx.beans.property.ReadOnlyObjectWrapper;
 import javafx.beans.property.ReadOnlyStringWrapper;
 import javafx.collections.FXCollections;
@@ -43,30 +45,51 @@ of the License (see COPYING and COPYING.addendum).
 import org.unigrid.janus.model.service.RPCService;
 import org.unigrid.janus.model.signal.NewBlock;
 import org.unigrid.janus.model.service.BrowserService;
+import org.unigrid.janus.model.service.DebugService;
 
 @ApplicationScoped
 public class VoteController implements Initializable {
-
-	@Inject private RPCService rpc;
-	@Inject private BrowserService browser;
-
-	@FXML private Label lblTitle;
-	@FXML private Label lblSummary;
-	@FXML private Button btnYes;
-	@FXML private Button btnNo;
-	@FXML private Button btnAbstain;
-	@FXML private Label lblYeas;
-	@FXML private Label lblNays;
-	@FXML private ProgressBar pgbRatio;
-	@FXML private AnchorPane pnlCastVote;
-	@FXML private TableView tblGoveData;
-	@FXML private TableColumn colProposal;
-	@FXML private TableColumn colVotes;
-	@FXML private TableColumn colYes;
-	@FXML private TableColumn colNo;
-	@FXML private TableColumn colAbstain;
-	@FXML private TableColumn colNumVotes;
-	@FXML private Label lblNoVotes;
+	@Inject
+	private DebugService debug;
+	@Inject
+	private RPCService rpc;
+	@Inject
+	private BrowserService browser;
+
+	@FXML
+	private Label lblTitle;
+	@FXML
+	private Label lblSummary;
+	@FXML
+	private Button btnYes;
+	@FXML
+	private Button btnNo;
+	@FXML
+	private Button btnAbstain;
+	@FXML
+	private Label lblYeas;
+	@FXML
+	private Label lblNays;
+	@FXML
+	private ProgressBar pgbRatio;
+	@FXML
+	private AnchorPane pnlCastVote;
+	@FXML
+	private TableView tblGoveData;
+	@FXML
+	private TableColumn colProposal;
+	@FXML
+	private TableColumn colVotes;
+	@FXML
+	private TableColumn colYes;
+	@FXML
+	private TableColumn colNo;
+	@FXML
+	private TableColumn colAbstain;
+	@FXML
+	private TableColumn colNumVotes;
+	@FXML
+	private Label lblNoVotes;
 
 	private ObservableList<BudgetGetVote.Result> tableList;
 	private List<BudgetGetVote.Result> listBudgetInfo = new ArrayList<>();
@@ -78,23 +101,21 @@ private void postConstruct() {
 
 	@Override
 	public void initialize(URL u, ResourceBundle rb) {
-		String cssPath = VoteController.class.getResource("/org/unigrid/janus/view/main.css").toExternalForm();
-		String style = "-fx-background-radius: 50;"
-			+ "-fx-border-color: #e72;"
-			+ "-fx-border-radius: 50;"
-			+ "-fx-border-width: 2;"
-			+ "-fx-cursor: hand;";
-		//tblGoveData.setItems(tableList);
+		String cssPath = VoteController.class
+				.getResource("/org/unigrid/janus/view/main.css").toExternalForm();
+		String style = "-fx-background-radius: 50;" + "-fx-border-color: #e72;"
+				+ "-fx-border-radius: 50;" + "-fx-border-width: 2;" + "-fx-cursor: hand;";
+		// tblGoveData.setItems(tableList);
 		colProposal.prefWidthProperty().bind(tblGoveData.widthProperty().multiply(0.25));
 		colVotes.prefWidthProperty().bind(tblGoveData.widthProperty().multiply(0.3));
 		colAbstain.prefWidthProperty().bind(tblGoveData.widthProperty().multiply(0.15));
 		colVotes.setStyle("-fx-alignment: CENTER;");
 		colProposal.setCellValueFactory(cell -> {
 			System.out.println("Name");
-			String name = ((TableColumn.CellDataFeatures<BudgetGetVote.Result, String>) cell).getValue()
-				.getName();
-			String url = ((TableColumn.CellDataFeatures<BudgetGetVote.Result, String>) cell).getValue()
-				.getUrl();
+			String name = ((TableColumn.CellDataFeatures<BudgetGetVote.Result, String>) cell)
+					.getValue().getName();
+			String url = ((TableColumn.CellDataFeatures<BudgetGetVote.Result, String>) cell)
+					.getValue().getUrl();
 			Hyperlink link = new Hyperlink();
 			System.out.println(link.toString());
 
@@ -108,12 +129,12 @@ public void initialize(URL u, ResourceBundle rb) {
 		});
 
 		colNumVotes.setCellValueFactory(cell -> {
-			int yes = ((TableColumn.CellDataFeatures<BudgetGetVote.Result, Integer>) cell).getValue()
-				.getYeas();
-			int no = ((TableColumn.CellDataFeatures<BudgetGetVote.Result, Integer>) cell).getValue()
-				.getNays();
-			int abstain = ((TableColumn.CellDataFeatures<BudgetGetVote.Result, Integer>) cell).getValue()
-				.getAbstains();
+			int yes = ((TableColumn.CellDataFeatures<BudgetGetVote.Result, Integer>) cell)
+					.getValue().getYeas();
+			int no = ((TableColumn.CellDataFeatures<BudgetGetVote.Result, Integer>) cell)
+					.getValue().getNays();
+			int abstain = ((TableColumn.CellDataFeatures<BudgetGetVote.Result, Integer>) cell)
+					.getValue().getAbstains();
 			String output = yes + "/" + no + "/" + abstain;
 			return new ReadOnlyStringWrapper(output);
 		});
@@ -121,16 +142,16 @@ public void initialize(URL u, ResourceBundle rb) {
 		colVotes.setCellValueFactory(cell -> {
 			System.out.println("Doing a progbar");
 			ProgressBar bar = new ProgressBar();
-			double progress = ((TableColumn.CellDataFeatures<BudgetGetVote.Result, Integer>) cell).getValue()
-				.getRatio();
-			int no = ((TableColumn.CellDataFeatures<BudgetGetVote.Result, Integer>) cell).getValue()
-				.getNays();
-			int yes = ((TableColumn.CellDataFeatures<BudgetGetVote.Result, Integer>) cell).getValue()
-				.getYeas();
+			double progress = ((TableColumn.CellDataFeatures<BudgetGetVote.Result, Integer>) cell)
+					.getValue().getRatio();
+			int no = ((TableColumn.CellDataFeatures<BudgetGetVote.Result, Integer>) cell)
+					.getValue().getNays();
+			int yes = ((TableColumn.CellDataFeatures<BudgetGetVote.Result, Integer>) cell)
+					.getValue().getYeas();
 			String toolTip = "Yes = " + yes + "         No = " + no;
 			bar.setTooltip(new Tooltip(toolTip));
-			//float progress = 0.0f;
-			//progress = (yes / (yes + no));
+			// float progress = 0.0f;
+			// progress = (yes / (yes + no));
 			bar.setProgress(progress);
 			bar.setPrefWidth(tblGoveData.widthProperty().multiply(0.3).doubleValue());
 			bar.getStylesheets().addAll(cssPath);
@@ -142,11 +163,12 @@ public void initialize(URL u, ResourceBundle rb) {
 
 		colYes.setCellValueFactory(cell -> {
 			Button button = new Button("Yes");
-			String hash = ((TableColumn.CellDataFeatures<BudgetGetVote.Result, Integer>) cell).getValue()
-				.getHash();
+			String hash = ((TableColumn.CellDataFeatures<BudgetGetVote.Result, Integer>) cell)
+					.getValue().getHash();
 			button.setOnAction(e -> {
-				rpc.call(new BudgetVote.Request(new Object[]{"vote-many", hash, "yes"}),
-					BudgetVote.class);
+				rpc.call(
+						new BudgetVote.Request(new Object[] { "vote-many", hash, "yes" }),
+						BudgetVote.class);
 			});
 			button.getStylesheets().addAll(cssPath);
 			button.setStyle(style);
@@ -155,11 +177,11 @@ public void initialize(URL u, ResourceBundle rb) {
 
 		colNo.setCellValueFactory(cell -> {
 			Button button = new Button("No");
-			String hash = ((TableColumn.CellDataFeatures<BudgetGetVote.Result, Integer>) cell).getValue()
-				.getHash();
+			String hash = ((TableColumn.CellDataFeatures<BudgetGetVote.Result, Integer>) cell)
+					.getValue().getHash();
 			button.setOnAction(e -> {
-				rpc.call(new BudgetVote.Request(new Object[]{"vote-many", hash, "no"}),
-					BudgetVote.class);
+				rpc.call(new BudgetVote.Request(new Object[] { "vote-many", hash, "no" }),
+						BudgetVote.class);
 			});
 			button.getStylesheets().addAll(cssPath);
 			button.setStyle(style);
@@ -168,11 +190,13 @@ public void initialize(URL u, ResourceBundle rb) {
 
 		colAbstain.setCellValueFactory(cell -> {
 			Button button = new Button("Abstain");
-			String hash = ((TableColumn.CellDataFeatures<BudgetGetVote.Result, Integer>) cell).getValue()
-				.getHash();
+			String hash = ((TableColumn.CellDataFeatures<BudgetGetVote.Result, Integer>) cell)
+					.getValue().getHash();
 			button.setOnAction(e -> {
-				rpc.call(new BudgetVote.Request(new Object[]{"vote-many", hash, "abstain"}),
-					BudgetVote.class);
+				rpc.call(
+						new BudgetVote.Request(
+								new Object[] { "vote-many", hash, "abstain" }),
+						BudgetVote.class);
 			});
 			button.getStylesheets().addAll(cssPath);
 			button.setStyle(style);
@@ -181,25 +205,30 @@ public void initialize(URL u, ResourceBundle rb) {
 	}
 
 	private void onMessage(@Observes NewBlock update) {
-		BudgetGetVote budgetInfo = rpc.call(new BudgetGetVote.Request(new Object[]{"show"}), BudgetGetVote.class);
-		int index = 0;
-		for (int i = 0; i < budgetInfo.getResult().size(); i++) {
-			if (budgetInfo.getResult().get(i).getName().equals("Pickle-DAO")) {
-				index = i;
-			}
+		BudgetGetVote budgetInfo = rpc.call(
+				new BudgetGetVote.Request(new Object[] { "show" }), BudgetGetVote.class);
+		List<BudgetGetVote.Result> result = budgetInfo.getResult();
+
+		if (result == null) {
+			// Handle the case when result is null, maybe log an error or return from the
+			// method
+			return;
 		}
-
-		if (listBudgetInfo.size() == 0) {
+		listBudgetInfo.clear();
+		listBudgetInfo.addAll(result);
+		// Filter out "Pickle-DAO" using Java Streams
+		listBudgetInfo = result.stream()
+				.filter(item -> !item.getName().equals("Pickle-DAO"))
+				.collect(Collectors.toList());
+
+		if (listBudgetInfo.isEmpty()) {
 			tblGoveData.setVisible(false);
 			lblNoVotes.setVisible(true);
 		} else {
 			tblGoveData.setVisible(true);
 			lblNoVotes.setVisible(false);
-			budgetInfo.getResult().remove(index);
-			listBudgetInfo.clear();
-			listBudgetInfo.addAll(budgetInfo.getResult());
-			tblGoveData.setItems(tableList);
-
+			tblGoveData.setItems(FXCollections.observableList(listBudgetInfo));
 		}
 	}
+
 }
diff --git a/fx/src/main/java/org/unigrid/janus/view/backing/GridnodeListModel.java b/fx/src/main/java/org/unigrid/janus/view/backing/GridnodeListModel.java
index 117faae9..d1c95442 100644
--- a/fx/src/main/java/org/unigrid/janus/view/backing/GridnodeListModel.java
+++ b/fx/src/main/java/org/unigrid/janus/view/backing/GridnodeListModel.java
@@ -35,8 +35,10 @@ public class GridnodeListModel {
 	public void setGridnodes(GridnodeList list) {
 		gridnodes.clear();
 
-		for (Gridnode g : list.getResult()) {
-			gridnodes.add(g);
+		if (list != null && list.getResult() != null) {
+			for (Gridnode g : list.getResult()) {
+				gridnodes.add(g);
+			}
 		}
 	}
 }
diff --git a/fx/src/main/resources/org/unigrid/janus/view/vote.fxml b/fx/src/main/resources/org/unigrid/janus/view/vote.fxml
index 057416d8..bea8a483 100644
--- a/fx/src/main/resources/org/unigrid/janus/view/vote.fxml
+++ b/fx/src/main/resources/org/unigrid/janus/view/vote.fxml
@@ -1,47 +1,56 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import javafx.geometry.Insets?>
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.control.TableColumn?>
 <?import javafx.scene.control.TableView?>
 <?import javafx.scene.layout.AnchorPane?>
 <?import javafx.scene.layout.BorderPane?>
 <?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.StackPane?>
 <?import javafx.scene.text.Font?>
 
-<AnchorPane style="-fx-background-color: linear-gradient(from 75px 75px to 200px 150px, #00001c, #000024);" stylesheets="@main.css" xmlns="http://javafx.com/javafx/18" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.unigrid.janus.controller.VoteController">
+<AnchorPane style="-fx-background-color: linear-gradient(from 75px 75px to 200px 150px, #00001c, #000024);" stylesheets="@main.css" xmlns="http://javafx.com/javafx/19" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.unigrid.janus.controller.VoteController">
    <children>
       <BorderPane prefHeight="200.0" prefWidth="200.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
          <top>
-            <Label style="-fx-text-fill: orange;" text="Unigrid Vote" textFill="#ee7722" textOverrun="CLIP" BorderPane.alignment="CENTER">
+            <Label style="-fx-text-fill: orange;" text="Unigrid Governance" textFill="#ee7722" textOverrun="CLIP" BorderPane.alignment="CENTER">
                <font>
                   <Font size="36.0" />
                </font>
+               <BorderPane.margin>
+                  <Insets top="20.0" />
+               </BorderPane.margin>
             </Label>
          </top>
          <bottom>
             <HBox prefHeight="48.0" prefWidth="450.0" BorderPane.alignment="CENTER" />
          </bottom>
-         <center>
-            <AnchorPane BorderPane.alignment="CENTER">
-               <children>
-                  <Label fx:id="lblNoVotes" text="There are no Unigrid proposals at this time" textFill="#ee7722">
-                     <font>
-                        <Font size="24.0" />
-                     </font>
-                  </Label>
-                  <TableView fx:id="tblGoveData" prefHeight="200.0" prefWidth="200.0" visible="false" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
-                    <columns>
-                      <TableColumn fx:id="colProposal" prefWidth="75.0" text="Proposal" />
-                      <TableColumn fx:id="colNumVotes" prefWidth="75.0" text="Yes/No/Abstain" />
-                        <TableColumn fx:id="colVotes" prefWidth="75.0" text="Votes" />
-                        <TableColumn fx:id="colYes" prefWidth="75.0" />
-                        <TableColumn fx:id="colNo" prefWidth="75.0" />
-                        <TableColumn fx:id="colAbstain" prefWidth="75.0" />
-                    </columns>
-                  </TableView>
-               </children>
-            </AnchorPane>
-         </center>
       </BorderPane>
+      <StackPane prefHeight="400.0" prefWidth="600.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+         <children>
+            <Label fx:id="lblNoVotes" alignment="CENTER" contentDisplay="CENTER" text="There are no Unigrid proposals at this time" textFill="#ee7722">
+               <font>
+                  <Font size="24.0" />
+               </font>
+               <padding>
+                  <Insets left="20.0" right="20.0" top="30.0" />
+               </padding>
+            </Label>
+            <TableView fx:id="tblGoveData" visible="false">
+              <columns>
+                <TableColumn fx:id="colProposal" prefWidth="75.0" text="Proposal" />
+                <TableColumn fx:id="colNumVotes" prefWidth="75.0" text="Yes/No/Abstain" />
+                  <TableColumn fx:id="colVotes" prefWidth="75.0" text="Votes" />
+                  <TableColumn fx:id="colYes" prefWidth="75.0" />
+                  <TableColumn fx:id="colNo" prefWidth="75.0" />
+                  <TableColumn fx:id="colAbstain" prefWidth="75.0" />
+              </columns>
+               <padding>
+                  <Insets top="70.0" />
+               </padding>
+            </TableView>
+         </children>
+      </StackPane>
    </children>
 </AnchorPane>

From 5a5472d7e1400a6f56f50c41eea39434d665556e Mon Sep 17 00:00:00 2001
From: dekm <gevan73@gmail.com>
Date: Mon, 11 Sep 2023 13:35:47 +0200
Subject: [PATCH 08/10] version bump for release

---
 fx/pom.xml                                    |  6 +--
 .../janus/controller/VoteController.java      | 46 +++++++++----------
 .../controller/MainWindowControllerTest.java  |  8 ++--
 .../unigrid/janus/model/UpdateWalletTest.java |  2 +-
 .../org/unigrid/janus/model/cdi/Invoke.java   |  6 +--
 5 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/fx/pom.xml b/fx/pom.xml
index 0cb711ad..c57baf54 100644
--- a/fx/pom.xml
+++ b/fx/pom.xml
@@ -12,12 +12,12 @@
 		<artifactId>parent</artifactId>
 		<version>1.0.12</version>
 	</parent>
-	<version>1.0.17</version>
+	<version>1.0.18</version>
 	<properties>
 		<mainClass>org.unigrid.janus.Janus</mainClass>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<release.tag>1.0.17</release.tag>
-		<current.tag>1.0.17</current.tag>
+		<release.tag>1.0.18</release.tag>
+		<current.tag>1.0.18</current.tag>
 		<config.opens>
 			fx=jakarta.xml.bind/jakarta.xml.bind-api@jakarta.xml.bind
                         fx=org.eclipse/yasson@org.eclipse.yasson
diff --git a/fx/src/main/java/org/unigrid/janus/controller/VoteController.java b/fx/src/main/java/org/unigrid/janus/controller/VoteController.java
index 43fddca1..bcaa9c03 100644
--- a/fx/src/main/java/org/unigrid/janus/controller/VoteController.java
+++ b/fx/src/main/java/org/unigrid/janus/controller/VoteController.java
@@ -102,9 +102,9 @@ private void postConstruct() {
 	@Override
 	public void initialize(URL u, ResourceBundle rb) {
 		String cssPath = VoteController.class
-				.getResource("/org/unigrid/janus/view/main.css").toExternalForm();
+			.getResource("/org/unigrid/janus/view/main.css").toExternalForm();
 		String style = "-fx-background-radius: 50;" + "-fx-border-color: #e72;"
-				+ "-fx-border-radius: 50;" + "-fx-border-width: 2;" + "-fx-cursor: hand;";
+			+ "-fx-border-radius: 50;" + "-fx-border-width: 2;" + "-fx-cursor: hand;";
 		// tblGoveData.setItems(tableList);
 		colProposal.prefWidthProperty().bind(tblGoveData.widthProperty().multiply(0.25));
 		colVotes.prefWidthProperty().bind(tblGoveData.widthProperty().multiply(0.3));
@@ -113,9 +113,9 @@ public void initialize(URL u, ResourceBundle rb) {
 		colProposal.setCellValueFactory(cell -> {
 			System.out.println("Name");
 			String name = ((TableColumn.CellDataFeatures<BudgetGetVote.Result, String>) cell)
-					.getValue().getName();
+				.getValue().getName();
 			String url = ((TableColumn.CellDataFeatures<BudgetGetVote.Result, String>) cell)
-					.getValue().getUrl();
+				.getValue().getUrl();
 			Hyperlink link = new Hyperlink();
 			System.out.println(link.toString());
 
@@ -130,11 +130,11 @@ public void initialize(URL u, ResourceBundle rb) {
 
 		colNumVotes.setCellValueFactory(cell -> {
 			int yes = ((TableColumn.CellDataFeatures<BudgetGetVote.Result, Integer>) cell)
-					.getValue().getYeas();
+				.getValue().getYeas();
 			int no = ((TableColumn.CellDataFeatures<BudgetGetVote.Result, Integer>) cell)
-					.getValue().getNays();
+				.getValue().getNays();
 			int abstain = ((TableColumn.CellDataFeatures<BudgetGetVote.Result, Integer>) cell)
-					.getValue().getAbstains();
+				.getValue().getAbstains();
 			String output = yes + "/" + no + "/" + abstain;
 			return new ReadOnlyStringWrapper(output);
 		});
@@ -143,11 +143,11 @@ public void initialize(URL u, ResourceBundle rb) {
 			System.out.println("Doing a progbar");
 			ProgressBar bar = new ProgressBar();
 			double progress = ((TableColumn.CellDataFeatures<BudgetGetVote.Result, Integer>) cell)
-					.getValue().getRatio();
+				.getValue().getRatio();
 			int no = ((TableColumn.CellDataFeatures<BudgetGetVote.Result, Integer>) cell)
-					.getValue().getNays();
+				.getValue().getNays();
 			int yes = ((TableColumn.CellDataFeatures<BudgetGetVote.Result, Integer>) cell)
-					.getValue().getYeas();
+				.getValue().getYeas();
 			String toolTip = "Yes = " + yes + "         No = " + no;
 			bar.setTooltip(new Tooltip(toolTip));
 			// float progress = 0.0f;
@@ -164,11 +164,11 @@ public void initialize(URL u, ResourceBundle rb) {
 		colYes.setCellValueFactory(cell -> {
 			Button button = new Button("Yes");
 			String hash = ((TableColumn.CellDataFeatures<BudgetGetVote.Result, Integer>) cell)
-					.getValue().getHash();
+				.getValue().getHash();
 			button.setOnAction(e -> {
 				rpc.call(
-						new BudgetVote.Request(new Object[] { "vote-many", hash, "yes" }),
-						BudgetVote.class);
+					new BudgetVote.Request(new Object[]{"vote-many", hash, "yes"}),
+					BudgetVote.class);
 			});
 			button.getStylesheets().addAll(cssPath);
 			button.setStyle(style);
@@ -178,10 +178,10 @@ public void initialize(URL u, ResourceBundle rb) {
 		colNo.setCellValueFactory(cell -> {
 			Button button = new Button("No");
 			String hash = ((TableColumn.CellDataFeatures<BudgetGetVote.Result, Integer>) cell)
-					.getValue().getHash();
+				.getValue().getHash();
 			button.setOnAction(e -> {
-				rpc.call(new BudgetVote.Request(new Object[] { "vote-many", hash, "no" }),
-						BudgetVote.class);
+				rpc.call(new BudgetVote.Request(new Object[]{"vote-many", hash, "no"}),
+					BudgetVote.class);
 			});
 			button.getStylesheets().addAll(cssPath);
 			button.setStyle(style);
@@ -191,12 +191,12 @@ public void initialize(URL u, ResourceBundle rb) {
 		colAbstain.setCellValueFactory(cell -> {
 			Button button = new Button("Abstain");
 			String hash = ((TableColumn.CellDataFeatures<BudgetGetVote.Result, Integer>) cell)
-					.getValue().getHash();
+				.getValue().getHash();
 			button.setOnAction(e -> {
 				rpc.call(
-						new BudgetVote.Request(
-								new Object[] { "vote-many", hash, "abstain" }),
-						BudgetVote.class);
+					new BudgetVote.Request(
+						new Object[]{"vote-many", hash, "abstain"}),
+					BudgetVote.class);
 			});
 			button.getStylesheets().addAll(cssPath);
 			button.setStyle(style);
@@ -206,7 +206,7 @@ public void initialize(URL u, ResourceBundle rb) {
 
 	private void onMessage(@Observes NewBlock update) {
 		BudgetGetVote budgetInfo = rpc.call(
-				new BudgetGetVote.Request(new Object[] { "show" }), BudgetGetVote.class);
+			new BudgetGetVote.Request(new Object[]{"show"}), BudgetGetVote.class);
 		List<BudgetGetVote.Result> result = budgetInfo.getResult();
 
 		if (result == null) {
@@ -218,8 +218,8 @@ private void onMessage(@Observes NewBlock update) {
 		listBudgetInfo.addAll(result);
 		// Filter out "Pickle-DAO" using Java Streams
 		listBudgetInfo = result.stream()
-				.filter(item -> !item.getName().equals("Pickle-DAO"))
-				.collect(Collectors.toList());
+			.filter(item -> !item.getName().equals("Pickle-DAO"))
+			.collect(Collectors.toList());
 
 		if (listBudgetInfo.isEmpty()) {
 			tblGoveData.setVisible(false);
diff --git a/fx/src/test/java/org/unigrid/janus/controller/MainWindowControllerTest.java b/fx/src/test/java/org/unigrid/janus/controller/MainWindowControllerTest.java
index 6e6c0286..3ebd91d8 100644
--- a/fx/src/test/java/org/unigrid/janus/controller/MainWindowControllerTest.java
+++ b/fx/src/test/java/org/unigrid/janus/controller/MainWindowControllerTest.java
@@ -199,7 +199,7 @@ public void shouldSwitchTabs() {
 	@Example
 	public void shouldShowIsStaking() {
 		isStaking = true;
-		rpc.pollForInfo(100000);
+		rpc.pollForInfo(200000);
 
 		await().until(() -> wallet != null && wallet.getStakingStatus() != null
 			&& wallet.getStakingStatus().equals(true));
@@ -210,7 +210,7 @@ public void shouldShowIsStaking() {
 	@Example
 	public void shouldShowIsNotStaking() {
 		isStaking = false;
-		rpc.pollForInfo(100000);
+		rpc.pollForInfo(200000);
 
 		await().until(() -> wallet != null && wallet.getStakingStatus() != null
 			&& wallet.getStakingStatus().equals(false));
@@ -221,7 +221,7 @@ public void shouldShowIsNotStaking() {
 	@Example
 	public void shouldUnlock() {
 		isLocked = true;
-		rpc.pollForInfo(100000);
+		rpc.pollForInfo(200000);
 
 		await().until(() -> wallet != null && wallet.getLocked() != null && wallet.getLocked());
 
@@ -242,7 +242,7 @@ public void shouldUnlock() {
 	@Example
 	public void shouldLock() {
 		isLocked = false;
-		rpc.pollForInfo(100000);
+		rpc.pollForInfo(200000);
 		await().until(() -> wallet != null && wallet.getLocked() != null && !wallet.getLocked());
 
 		verifyThat("#unlockedBtn", n -> n.isVisible());
diff --git a/fx/src/test/java/org/unigrid/janus/model/UpdateWalletTest.java b/fx/src/test/java/org/unigrid/janus/model/UpdateWalletTest.java
index 88b3497e..b0fad239 100644
--- a/fx/src/test/java/org/unigrid/janus/model/UpdateWalletTest.java
+++ b/fx/src/test/java/org/unigrid/janus/model/UpdateWalletTest.java
@@ -78,7 +78,7 @@ public boolean checkUpdateIsTrue() {
 			@Mock
 			public void run(Invocation invocation) {
 				System.out.println(invocation);
-				if (Invoke.invoke("checkUpdate", invocation)) {
+				if ((boolean) Invoke.invoke("checkUpdate", invocation)) {
 					testUpdateTrue = true;
 					System.out.println("Testing testing");
 				}
diff --git a/fx/src/test/java/org/unigrid/janus/model/cdi/Invoke.java b/fx/src/test/java/org/unigrid/janus/model/cdi/Invoke.java
index 709a7daa..1910606d 100644
--- a/fx/src/test/java/org/unigrid/janus/model/cdi/Invoke.java
+++ b/fx/src/test/java/org/unigrid/janus/model/cdi/Invoke.java
@@ -23,7 +23,7 @@ of the License (see COPYING and COPYING.addendum).
 
 public class Invoke {
 
-	public static <T, R> R invoke(String name, Invocation invocation, Object... args) {
+	public static <T, R> boolean invoke(String name, Invocation invocation, Object... args) {
 		try {
 			final List<Class> paramterTypes = new ArrayList<>();
 			for (Object arg : args) {
@@ -33,10 +33,10 @@ public static <T, R> R invoke(String name, Invocation invocation, Object... args
 			final Method method = invocation.getInvokedInstance().getClass()
 				.getDeclaredMethod(name, paramterTypes.toArray(new Class[0]));
 			method.setAccessible(true);
-			return (R) method.invoke(invocationInstance, args);
+			return (boolean) method.invoke(invocationInstance, args);
 		} catch (Exception e) {
 			System.out.println(e.getMessage());
-			return null;
+			return (Boolean) null;
 		}
 	}
 }

From 657644fb860a101dd410e66e2b95c7871d482736 Mon Sep 17 00:00:00 2001
From: dekm <gevan73@gmail.com>
Date: Fri, 15 Sep 2023 15:14:17 +0200
Subject: [PATCH 09/10] Added the ability to merge inputs with a one click
 button. This feature takes an address, amount, and will attempt to merge all
 small inputs to the address added. It uses raw transactions by creating one
 after getting a list of unspent tokens. It will create a group of txids to
 add to one raw transaction, then continues to sign and send them.

---
 .../controller/MainWindowController.java      |  15 +-
 .../janus/controller/OverlayController.java   |  85 +-
 .../janus/controller/SettingsController.java  | 532 +++++++++--
 .../model/rpc/entity/AutoMergeInputs.java     |  41 +
 .../janus/model/rpc/entity/BudgetGetVote.java |   2 +-
 .../rpc/entity/CreateRawTransaction.java      |  33 +
 .../janus/model/rpc/entity/ListUnspent.java   |  47 +
 .../model/rpc/entity/SendRawTransaction.java  |  33 +
 .../model/rpc/entity/SendTransaction.java     |   2 +-
 .../model/rpc/entity/SignRawTransaction.java  |  39 +
 .../model/signal/MergeInputsRequest.java      |  41 +
 .../janus/model/signal/UnlockRequest.java     |  49 +-
 .../org/unigrid/janus/view/mainWindow.fxml    |   2 +-
 .../org/unigrid/janus/view/settings.fxml      | 851 ++++++++++--------
 .../controller/SettingsControllerTest.java    |   3 +
 15 files changed, 1266 insertions(+), 509 deletions(-)
 create mode 100644 fx/src/main/java/org/unigrid/janus/model/rpc/entity/AutoMergeInputs.java
 create mode 100644 fx/src/main/java/org/unigrid/janus/model/rpc/entity/CreateRawTransaction.java
 create mode 100644 fx/src/main/java/org/unigrid/janus/model/rpc/entity/ListUnspent.java
 create mode 100644 fx/src/main/java/org/unigrid/janus/model/rpc/entity/SendRawTransaction.java
 create mode 100644 fx/src/main/java/org/unigrid/janus/model/rpc/entity/SignRawTransaction.java
 create mode 100644 fx/src/main/java/org/unigrid/janus/model/signal/MergeInputsRequest.java

diff --git a/fx/src/main/java/org/unigrid/janus/controller/MainWindowController.java b/fx/src/main/java/org/unigrid/janus/controller/MainWindowController.java
index 34594f87..651297f4 100644
--- a/fx/src/main/java/org/unigrid/janus/controller/MainWindowController.java
+++ b/fx/src/main/java/org/unigrid/janus/controller/MainWindowController.java
@@ -41,6 +41,8 @@ of the License (see COPYING and COPYING.addendum).
 import org.kordamp.ikonli.javafx.FontIcon;
 import org.unigrid.janus.model.ExternalVersion;
 import org.unigrid.janus.model.signal.Navigate;
+import org.unigrid.janus.model.signal.OverlayRequest;
+
 import static org.unigrid.janus.model.signal.Navigate.Location.*;
 import org.unigrid.janus.model.signal.UnlockRequest;
 
@@ -51,7 +53,8 @@ public class MainWindowController implements Initializable, PropertyChangeListen
 	@Inject private Wallet wallet;
 	@Inject private ExternalVersion externalVersion;
 	@Inject private Event<ExternalVersion> versionEvent;
-
+	@Inject
+	private Event<OverlayRequest> overlayRequest;
 	@Inject private Event<UnlockRequest> unlockRequestEvent;
 
 	// @FXML private Label lblBlockCount;
@@ -266,7 +269,7 @@ private void onLockPressed(MouseEvent event) {
 		}
 
 		unlockRequestEvent.fire(UnlockRequest.builder().type(UnlockRequest.Type.ORDINARY).build());
-		pnlOverlay.setVisible(true);
+		overlayRequest.fire(OverlayRequest.OPEN);
 	}
 
 	@FXML
@@ -289,13 +292,15 @@ private void onCoinsPressed(MouseEvent event) {
 		}
 
 		unlockRequestEvent.fire(UnlockRequest.builder().type(UnlockRequest.Type.FOR_STAKING).build());
-		pnlOverlay.setVisible(true);
+		overlayRequest.fire(OverlayRequest.OPEN);
 	}
 
 	private void eventNavigate(@Observes Navigate navigate) {
 		switch (navigate.getLocation()) {
-			case ADDRESS_TAB -> select(pnlAddress, btnAddress);
-			case WALLET_TAB -> select(pnlWallet, btnWallet);
+			case ADDRESS_TAB ->
+				select(pnlAddress, btnAddress);
+			case WALLET_TAB ->
+				select(pnlWallet, btnWallet);
 		}
 	}
 
diff --git a/fx/src/main/java/org/unigrid/janus/controller/OverlayController.java b/fx/src/main/java/org/unigrid/janus/controller/OverlayController.java
index a458591a..8876c587 100644
--- a/fx/src/main/java/org/unigrid/janus/controller/OverlayController.java
+++ b/fx/src/main/java/org/unigrid/janus/controller/OverlayController.java
@@ -39,6 +39,7 @@ of the License (see COPYING and COPYING.addendum).
 import org.unigrid.janus.model.service.RPCService;
 import org.unigrid.janus.model.Wallet;
 import org.unigrid.janus.model.rpc.entity.UnlockWallet;
+import org.unigrid.janus.model.signal.MergeInputsRequest;
 import org.unigrid.janus.model.signal.NodeRequest;
 import org.unigrid.janus.model.signal.OverlayRequest;
 import org.unigrid.janus.model.signal.State;
@@ -48,20 +49,34 @@ of the License (see COPYING and COPYING.addendum).
 
 @ApplicationScoped
 public class OverlayController implements Initializable {
-	@Inject private DebugService debug;
-	@Inject private RPCService rpc;
-	@Inject private Wallet wallet;
-
-	@Inject private Event<NodeRequest> nodeRequestEvent;
-	@Inject private Event<WalletRequest> walletRequestEvent;
-	@Inject private Event<State> stateEvent;
-
-	@FXML private GridPane pnlUnlock;
-	@FXML private PasswordField passphraseInput;
-	@FXML private Text errorTxt;
-	@FXML private ImageView spinnerIcon;
-	@FXML private Button submitBtn;
-	@FXML private Text unlockCopy;
+	@Inject
+	private DebugService debug;
+	@Inject
+	private RPCService rpc;
+	@Inject
+	private Wallet wallet;
+
+	@Inject
+	private Event<NodeRequest> nodeRequestEvent;
+	@Inject
+	private Event<WalletRequest> walletRequestEvent;
+	@Inject
+	private Event<State> stateEvent;
+	@Inject
+	private Event<MergeInputsRequest> mergeInputsEvent;
+	@FXML
+	private GridPane pnlUnlock;
+	@FXML
+	private PasswordField passphraseInput;
+	@FXML
+	private Text errorTxt;
+	@FXML
+	private ImageView spinnerIcon;
+	@FXML
+	private Button submitBtn;
+	@FXML
+	private Text unlockCopy;
+	private UnlockRequest currentUnlockRequest; // Instance variable to store the current UnlockRequest
 
 	@Override
 	public void initialize(URL url, ResourceBundle rb) {
@@ -69,14 +84,15 @@ public void initialize(URL url, ResourceBundle rb) {
 	}
 
 	private void eventUnlockRequest(@Observes UnlockRequest unlockRequest) {
-		debug.log("Unlock request fired");
+		debug.print("Unlock request fired", OverlayController.class.getSimpleName());
 
 		submitBtn.setText(unlockRequest.getType().getAction());
-		wallet.setUnlockState(unlockRequest.getType().getState());
+		//wallet.setUnlockState(unlockRequest.getType().getState());
 		unlockCopy.setText(unlockRequest.getType().getDescription());
 		pnlUnlock.setVisible(true);
 
 		Platform.runLater(() -> passphraseInput.requestFocus());
+		currentUnlockRequest = unlockRequest;
 	}
 
 	@FXML
@@ -104,18 +120,19 @@ private void submit() {
 		long stakingStartTime = wallet.getStakingStartTime();
 		stateEvent.fire(State.builder().working(true).build());
 
-		// TODO: What exactly do these numbers mean ? Please change this to an enum and explain it.
-		switch (wallet.getUnlockState()) {
-			case 1:
+		UnlockRequest.Type unlockType = currentUnlockRequest.getType();
+		switch (unlockType) {
+			case FOR_STAKING:
 				sendArgs = new Object[]{passphraseInput.getText(), stakingStartTime, true};
 				break;
-			case 2:
+			case ORDINARY:
+			case FOR_MERGING:
 				sendArgs = new Object[]{passphraseInput.getText(), 0};
 				break;
-			case 3:
-			case 4:
-			case 5:
-				// unlock for 30 seconds only
+			case FOR_SEND:
+			case FOR_GRIDNODE:
+			case FOR_DUMP:
+				// Unlock for 30 seconds only
 				sendArgs = new Object[]{passphraseInput.getText(), 30};
 				break;
 			default:
@@ -128,7 +145,8 @@ private void submit() {
 			stateEvent.fire(State.builder().working(false).build());
 		} else {
 			try {
-				final UnlockWallet call = rpc.call(new UnlockWallet.Request(sendArgs), UnlockWallet.class);
+				final UnlockWallet call = rpc.call(new UnlockWallet.Request(sendArgs),
+					UnlockWallet.class);
 				Jsonb jsonb = JsonbBuilder.create();
 
 				if (call.getError() != null) {
@@ -140,15 +158,15 @@ private void submit() {
 						passphraseInput.setText("");
 
 						debug.print("Error unlocking wallet: ".concat(result),
-							OverlayController.class.getSimpleName()
-						);
+							OverlayController.class.getSimpleName());
 					}
 				} else {
 					errorTxt.setText("Wallet unlocked!");
-					debug.print("Successfuly unlocked wallet", OverlayController.class.getSimpleName());
+					debug.print("Successfuly unlocked wallet",
+						OverlayController.class.getSimpleName());
 					passphraseInput.setText("");
 
-					//TODO: Get rid of these numbers and use an enum instead!
+					// TODO: Get rid of these numbers and use an enum instead!
 					if (wallet.getUnlockState() == 3) {
 						walletRequestEvent.fire(WalletRequest.SEND_TRANSACTION);
 					} else if (wallet.getUnlockState() == 4) {
@@ -157,6 +175,15 @@ private void submit() {
 						walletRequestEvent.fire(WalletRequest.DUMP_KEYS);
 					}
 
+					if (currentUnlockRequest.getType() == UnlockRequest.Type.FOR_MERGING) {
+						mergeInputsEvent.fire(MergeInputsRequest.builder()
+							.type(MergeInputsRequest.Type.MERGE)
+							.address(currentUnlockRequest.getAddress())
+							.amount(currentUnlockRequest.getAmount())
+							.utxos(currentUnlockRequest.getUtxos())
+							.build());
+					}
+
 					if (wallet.getUnlockState() != 1) {
 						wallet.setLocked(Boolean.FALSE);
 					}
diff --git a/fx/src/main/java/org/unigrid/janus/controller/SettingsController.java b/fx/src/main/java/org/unigrid/janus/controller/SettingsController.java
index ac73c236..696af9db 100644
--- a/fx/src/main/java/org/unigrid/janus/controller/SettingsController.java
+++ b/fx/src/main/java/org/unigrid/janus/controller/SettingsController.java
@@ -25,15 +25,26 @@ of the License (see COPYING and COPYING.addendum).
 import java.net.URL;
 import java.io.File;
 import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 import java.util.ResourceBundle;
 import java.util.Optional;
 import javafx.application.HostServices;
 import javafx.application.Platform;
+import javafx.beans.property.BooleanProperty;
+import javafx.beans.property.SimpleBooleanProperty;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.fxml.FXML;
 import javafx.fxml.Initializable;
+import javafx.geometry.Insets;
+import javafx.geometry.Orientation;
+import javafx.geometry.Pos;
+import javafx.scene.Cursor;
 import javafx.scene.control.Alert;
 import javafx.stage.FileChooser;
 import javafx.stage.FileChooser.ExtensionFilter;
@@ -48,6 +59,9 @@ of the License (see COPYING and COPYING.addendum).
 import javafx.scene.control.Label;
 import javafx.scene.control.ListView;
 import javafx.scene.control.PasswordField;
+import javafx.scene.control.ProgressIndicator;
+import javafx.scene.control.ScrollPane;
+import javafx.scene.control.Separator;
 import javafx.scene.layout.VBox;
 import javafx.scene.layout.Border;
 import javafx.scene.layout.BorderWidths;
@@ -66,10 +80,12 @@ of the License (see COPYING and COPYING.addendum).
 import org.unigrid.janus.model.service.RPCService;
 import org.unigrid.janus.model.rpc.entity.DumpWallet;
 import org.unigrid.janus.model.rpc.entity.BackupWallet;
+import org.unigrid.janus.model.rpc.entity.CreateRawTransaction;
 import org.unigrid.janus.model.Wallet;
 import org.unigrid.janus.model.rpc.entity.EncryptWallet;
 import org.unigrid.janus.model.rpc.entity.ImportWallet;
 import org.unigrid.janus.model.rpc.entity.UpdatePassphrase;
+import org.unigrid.janus.model.rpc.entity.ValidateAddress;
 import org.unigrid.janus.model.signal.DebugMessage;
 import org.unigrid.janus.model.signal.Navigate;
 import static org.unigrid.janus.model.signal.Navigate.Location.*;
@@ -78,75 +94,181 @@ of the License (see COPYING and COPYING.addendum).
 import org.unigrid.janus.model.signal.WalletRequest;
 import org.unigrid.janus.view.AlertDialog;
 import org.unigrid.janus.view.backing.OsxUtils;
+import org.unigrid.janus.model.rpc.entity.ListUnspent;
+import org.unigrid.janus.model.rpc.entity.SignRawTransaction;
+
+import javafx.scene.control.TableView;
+import javafx.scene.control.TextArea;
+import javafx.scene.control.TableColumn;
+import javafx.scene.control.cell.PropertyValueFactory;
+import javafx.scene.control.TextField;
+import javafx.scene.input.Clipboard;
+import javafx.scene.input.ClipboardContent;
+import javafx.scene.layout.AnchorPane;
+import javafx.scene.layout.HBox;
+import javafx.scene.layout.Priority;
+import javafx.scene.layout.Region;
+import javafx.scene.layout.StackPane;
+import org.unigrid.janus.model.rpc.entity.SendRawTransaction;
+import org.unigrid.janus.model.signal.MergeInputsRequest;
 
 @ApplicationScoped
-public class SettingsController implements Initializable, PropertyChangeListener, Showable {
+public class SettingsController
+	implements Initializable, PropertyChangeListener, Showable {
 	private Stage stage;
 	private ObservableList<String> debugItems = FXCollections.observableArrayList();
 
-	@Inject private DebugService debug;
-	@Inject private HostServices hostServices;
-	@Inject private JanusModel janusModel;
-	@Inject private RPCService rpc;
-	@Inject private Wallet wallet;
+	@Inject
+	private DebugService debug;
+	@Inject
+	private HostServices hostServices;
+	@Inject
+	private JanusModel janusModel;
+	@Inject
+	private RPCService rpc;
+	@Inject
+	private Wallet wallet;
 	private BootstrapModel bootStrap;
-	@Inject private ExternalVersion externalVersion;
-
-	@Inject private Event<Navigate> navigateEvent;
-	@Inject private Event<OverlayRequest> overlayRequest;
-	@Inject private Event<UnlockRequest> unlockRequestEvent;
-	@Inject private Event<WalletRequest> walletRequestEvent;
+	@Inject
+	private ExternalVersion externalVersion;
+
+	@Inject
+	private Event<Navigate> navigateEvent;
+	@Inject
+	private Event<OverlayRequest> overlayRequest;
+	@Inject
+	private Event<UnlockRequest> unlockRequestEvent;
+	@Inject
+	private Event<WalletRequest> walletRequestEvent;
+	@Inject
+	private Event<MergeInputsRequest> mergeInputsEvent;
+	@FXML
+	private AnchorPane pnlOverlay;
 
 	private static final int TAB_SETTINGS_GENERAL = 1;
 	private static final int TAB_SETTINGS_DISPLAY = 2;
 	private static final int TAB_SETTINGS_PASSPHRASE = 3;
 	private static final int TAB_SETTINGS_EXPORT = 4;
 	private static final int TAB_SETTINGS_DEBUG = 5;
+	private static final int TAB_SETTINGS_MAINTENANCE = 6;
 
 	private OsxUtils osxUtils = new OsxUtils();
 
-	@FXML private ListView lstDebug;
+	@FXML
+	private ListView lstDebug;
 
-	@FXML private Label verLbl;
+	@FXML
+	private Label verLbl;
 	// settings navigation
-	@FXML private VBox pnlSetGeneral;
-	@FXML private VBox pnlSetDisplay;
-	@FXML private VBox pnlSetPassphrase;
-	@FXML private VBox pnlSetExport;
-	@FXML private VBox pnlSetDebug;
+	@FXML
+	private VBox pnlSetGeneral;
+	@FXML
+	private VBox pnlSetDisplay;
+	@FXML
+	private VBox pnlSetPassphrase;
+	@FXML
+	private VBox pnlSetExport;
+	@FXML
+	private VBox pnlSetDebug;
+	@FXML
+	private StackPane maintenanceStack;
 	// passphrase
-	@FXML private Button btnUpdatePassphrase;
-	@FXML private PasswordField taPassphrase;
-	@FXML private PasswordField taRepeatPassphrase;
-	@FXML private Label txtPassphraseOne;
-	@FXML private Label txtPassphraseTwo;
-	@FXML private Label txtPassWarningOne;
-	@FXML private Label txtPassWarningTwo;
-	@FXML private Label txtErrorMessage;
-	@FXML private CheckBox chkNotifications;
-	@FXML private Label txtFxVersion;
-	@FXML private Label txtBootstrapVersion;
-	@FXML private Label txtDaemonVersion;
-	@FXML private Label txtHedgehogVersion;
+	@FXML
+	private Button btnUpdatePassphrase;
+	@FXML
+	private PasswordField taPassphrase;
+	@FXML
+	private PasswordField taRepeatPassphrase;
+	@FXML
+	private Label txtPassphraseOne;
+	@FXML
+	private Label txtPassphraseTwo;
+	@FXML
+	private Label txtPassWarningOne;
+	@FXML
+	private Label txtPassWarningTwo;
+	@FXML
+	private Label txtErrorMessage;
+	@FXML
+	private CheckBox chkNotifications;
+	@FXML
+	private Label txtFxVersion;
+	@FXML
+	private Label txtBootstrapVersion;
+	@FXML
+	private Label txtDaemonVersion;
+	@FXML
+	private Label txtHedgehogVersion;
+	@FXML
+	private TextField txtAddress;
+
+	@FXML
+	private TableView<ListUnspent.Result> unspentTable;
+	@FXML
+	private TableColumn<ListUnspent.Result, String> txidColumn;
+	@FXML
+	private TableColumn<ListUnspent.Result, Integer> voutColumn;
+	@FXML
+	private TableColumn<ListUnspent.Result, String> addressColumn;
+	@FXML
+	private TableColumn<ListUnspent.Result, String> scriptPubKeyColumn;
+	@FXML
+	private TableColumn<ListUnspent.Result, Double> amountColumn;
+	@FXML
+	private TableColumn<ListUnspent.Result, Integer> confirmationsColumn;
+	@FXML
+	private Button btnListUnspent;
+	@FXML
+	private Button btnMergeInputs;
+	private TextArea progressLog = new TextArea();
+	private Button closeButton = new Button("Close");
+	private ProgressIndicator progressIndicator = new ProgressIndicator();
+
+	private String address;
+	private double amount;
+	private List<ListUnspent.Result> utxos;
+	private BooleanProperty userConfirmed = new SimpleBooleanProperty(false);
+	private Region placeholder = new Region();
+	private Separator separator;
+	private TextArea txidArea;
+	private Button copyButton;
+	private Label completionLabel;
+	@FXML
+	private VBox pnlSetMaintenance;
+
+	@FXML
+	private VBox mergeInputsOverlay;
+	@FXML
+	private TextField txtMergeAmount;
 
 	@Override
 	public void initialize(URL url, ResourceBundle rb) {
 		System.out.println("Initilize settingsController!!!");
 		lstDebug.setItems(debugItems);
 		lstDebug.setPrefWidth(500);
-		lstDebug.setPrefHeight(500); //TODO: Put these constants in a model perhaps?
+		lstDebug.setPrefHeight(500); // TODO: Put these constants in a model perhaps?
 		lstDebug.scrollTo(debugItems.size());
 		verLbl.setText("version: ".concat(janusModel.getVersion()));
 		txtFxVersion.setText(janusModel.getVersion());
 		txtBootstrapVersion.setText(bootStrap.getInstance().getBootstrapVer());
 		wallet.addPropertyChangeListener(this);
 		chkNotifications.setSelected(Preferences.get().getBoolean("notifications", true));
+
+		txidColumn.setCellValueFactory(new PropertyValueFactory<>("txid"));
+		voutColumn.setCellValueFactory(new PropertyValueFactory<>("vout"));
+		addressColumn.setCellValueFactory(new PropertyValueFactory<>("address"));
+		scriptPubKeyColumn
+			.setCellValueFactory(new PropertyValueFactory<>("scriptPubKey"));
+		amountColumn.setCellValueFactory(new PropertyValueFactory<>("amount"));
+		confirmationsColumn
+			.setCellValueFactory(new PropertyValueFactory<>("confirmations"));
 	}
 
 	public void propertyChange(PropertyChangeEvent event) {
 		if (event.getPropertyName().equals(wallet.ENCRYPTED_STATUS)) {
 			if (wallet.getEncrypted()) {
-				debug.log(String.format("wallet.getEncrypted(): %s", wallet.getEncrypted()));
+				debug.log(String.format("wallet.getEncrypted(): %s",
+					wallet.getEncrypted()));
 				txtPassphraseOne.setText("Old Passphrase");
 				txtPassphraseTwo.setText("New Passphrase");
 				txtPassWarningOne.setText("Update and change your wallets passphrase.");
@@ -155,8 +277,8 @@ public void propertyChange(PropertyChangeEvent event) {
 			} else {
 				txtPassphraseOne.setText("Passphrase");
 				txtPassphraseTwo.setText("Repeat passphrase");
-				txtPassWarningOne.setText("Warning! This will encrypt your "
-					+ "wallet with a passphrase. "
+				txtPassWarningOne.setText(
+					"Warning! This will encrypt your " + "wallet with a passphrase. "
 					+ "Write down your passphrase and keep it safe.");
 				txtPassWarningTwo.setText("If you have not backed up your "
 					+ "wallet yet please do so first. An automatic wallet restart "
@@ -166,11 +288,13 @@ public void propertyChange(PropertyChangeEvent event) {
 	}
 
 	private void settingSelected(int tab) {
+		System.out.println("Setting tab: " + tab);
 		pnlSetGeneral.setVisible(false);
 		pnlSetDisplay.setVisible(false);
 		pnlSetPassphrase.setVisible(false);
 		pnlSetExport.setVisible(false);
 		pnlSetDebug.setVisible(false);
+		maintenanceStack.setVisible(false);
 		switch (tab) {
 			case TAB_SETTINGS_GENERAL:
 				pnlSetGeneral.setVisible(true);
@@ -190,13 +314,17 @@ private void settingSelected(int tab) {
 				break;
 			case TAB_SETTINGS_DEBUG:
 				pnlSetDebug.setVisible(true);
+				System.out.println("debug visable");
+				break;
+			case TAB_SETTINGS_MAINTENANCE:
+				maintenanceStack.setVisible(true);
+				System.out.println("maintenance visable");
 				break;
 			default:
 				pnlSetDebug.setVisible(true);
 				System.out.println("debug visable");
 				break;
 		}
-
 	}
 
 	@FXML
@@ -224,6 +352,12 @@ private void onSetDebugTap(MouseEvent event) {
 		settingSelected(TAB_SETTINGS_DEBUG);
 	}
 
+	@FXML
+	private void onSetMaintenanceTap(MouseEvent event) {
+		System.out.println("Maintenance tab clicked");
+		settingSelected(TAB_SETTINGS_MAINTENANCE);
+	}
+
 	@FXML
 	private void onOpenConf(MouseEvent event) throws NullPointerException {
 		File conf = DataDirectory.getConfigFile();
@@ -253,7 +387,8 @@ private void onOpenGridnode(MouseEvent event) throws NullPointerException {
 	}
 
 	@FXML
-	private void onOpenUnigrid(MouseEvent event) throws NullPointerException, IOException {
+	private void onOpenUnigrid(MouseEvent event)
+		throws NullPointerException, IOException {
 		String directory = DataDirectory.get();
 		try {
 			if (SystemUtils.IS_OS_MAC_OSX) {
@@ -271,14 +406,16 @@ private void onLock(MouseEvent event) {
 		try {
 			Dialog<ButtonType> dialog = new Dialog<ButtonType>();
 			dialog.setTitle("Confirmation");
-			dialog.setHeaderText("Be sure that you have saved the passphrase somewhere secure.\n"
+			dialog.setHeaderText(
+				"Be sure that you have saved the passphrase somewhere secure.\n"
 				+ "A wallet restart will be performed to encrypt your wallet.\n"
 				+ "This cannot be undone without your passphrase.");
 			ButtonType btnYes = new ButtonType("Yes", ButtonData.YES);
 			ButtonType btnNo = new ButtonType("No", ButtonData.NO);
 			dialog.getDialogPane().getButtonTypes().add(btnYes);
 			dialog.getDialogPane().getButtonTypes().add(btnNo);
-			dialog.getDialogPane().getStylesheets().add("/org/unigrid/janus/view/main.css");
+			dialog.getDialogPane().getStylesheets()
+				.add("/org/unigrid/janus/view/main.css");
 			Optional<ButtonType> response = dialog.showAndWait();
 			if (response.isPresent()) {
 				if (response.get() == btnYes) {
@@ -290,34 +427,31 @@ private void onLock(MouseEvent event) {
 						final UpdatePassphrase update = rpc.call(
 							new UpdatePassphrase.Request(taPassphrase.getText(),
 								taRepeatPassphrase.getText()),
-							UpdatePassphrase.class
-						);
+							UpdatePassphrase.class);
 
 					} else {
 						final EncryptWallet encrypt = rpc.call(
-							new EncryptWallet.Request(new Object[]{taPassphrase.getText()}),
-							EncryptWallet.class
-						);
-
-						//TODO: Fix this section
-						//THIS IS ONLY NEEDED FOR THE INITIAL ENCRYPTION
-						//SHOW LOAD SCREEN WHILE DAEMON STOPS
-						//PAUSE CALLS TO THE DAEMON
-						//CALL unigridd TO RESTART AGAIN
-						//window.getMainWindowController().showSplash();
+							new EncryptWallet.Request(
+								new Object[]{taPassphrase.getText()}),
+							EncryptWallet.class);
+
+						// TODO: Fix this section
+						// THIS IS ONLY NEEDED FOR THE INITIAL ENCRYPTION
+						// SHOW LOAD SCREEN WHILE DAEMON STOPS
+						// PAUSE CALLS TO THE DAEMON
+						// CALL unigridd TO RESTART AGAIN
+						// window.getMainWindowController().showSplash();
 					}
 					taPassphrase.setText("");
 					taRepeatPassphrase.setText("");
 
-					taRepeatPassphrase.setBorder(new Border(new BorderStroke(Color.TRANSPARENT,
-						BorderStrokeStyle.SOLID,
-						new CornerRadii(3),
-						new BorderWidths(1)
-					)));
+					taRepeatPassphrase.setBorder(new Border(
+						new BorderStroke(Color.TRANSPARENT, BorderStrokeStyle.SOLID,
+							new CornerRadii(3), new BorderWidths(1))));
 
 					navigateEvent.fire(Navigate.builder().location(WALLET_TAB).build());
 					janusModel.setAppState(JanusModel.AppState.RESTARTING);
-					//wallet.setLocked(true);
+					// wallet.setLocked(true);
 				}
 			}
 		} catch (Exception e) {
@@ -332,18 +466,15 @@ private void onRepeatPassphraseChange(KeyEvent event) {
 				btnUpdatePassphrase.setDisable(false);
 			} else {
 				if (taPassphrase.getText().equals(taRepeatPassphrase.getText())) {
-					taRepeatPassphrase.setBorder(new Border(
-						new BorderStroke(Color.web("#1dab00"),
-							BorderStrokeStyle.SOLID,
-							new CornerRadii(3),
+					taRepeatPassphrase
+						.setBorder(new Border(new BorderStroke(Color.web("#1dab00"),
+							BorderStrokeStyle.SOLID, new CornerRadii(3),
 							new BorderWidths(1))));
 					btnUpdatePassphrase.setDisable(false);
 				} else {
 					taRepeatPassphrase.setBorder(new Border(
-						new BorderStroke(Color.RED,
-							BorderStrokeStyle.SOLID,
-							new CornerRadii(3),
-							new BorderWidths(1))));
+						new BorderStroke(Color.RED, BorderStrokeStyle.SOLID,
+							new CornerRadii(3), new BorderWidths(1))));
 					btnUpdatePassphrase.setDisable(true);
 				}
 			}
@@ -357,7 +488,8 @@ private void onImportWallet(MouseEvent event) {
 		debug.log("Import wallet clicked!");
 		FileChooser fileChooser = new FileChooser();
 		fileChooser.setTitle("Import");
-		fileChooser.getExtensionFilters().addAll(new ExtensionFilter("Wallet file", "*.txt"));
+		fileChooser.getExtensionFilters()
+			.addAll(new ExtensionFilter("Wallet file", "*.txt"));
 		fileChooser.setInitialFileName("wallet.txt");
 		File file = fileChooser.showOpenDialog(stage);
 		debug.log(String.format("File chosen: %s", file.getAbsolutePath()));
@@ -369,7 +501,8 @@ private void onDumpWallet(MouseEvent event) {
 		debug.log("Dump wallet clicked!");
 
 		if (wallet.getLocked()) {
-			unlockRequestEvent.fire(UnlockRequest.builder().type(UnlockRequest.Type.FOR_DUMP).build());
+			unlockRequestEvent.fire(
+				UnlockRequest.builder().type(UnlockRequest.Type.FOR_DUMP).build());
 			overlayRequest.fire(OverlayRequest.OPEN);
 		} else {
 			eventWalletRequest(WalletRequest.DUMP_KEYS);
@@ -381,7 +514,8 @@ private void onBackupWallet(MouseEvent event) {
 		debug.log("Backup wallet clicked!");
 		FileChooser fileChooser = new FileChooser();
 		fileChooser.setTitle("Backup");
-		fileChooser.getExtensionFilters().addAll(new ExtensionFilter("Walet file", "*.dat"));
+		fileChooser.getExtensionFilters()
+			.addAll(new ExtensionFilter("Walet file", "*.dat"));
 		fileChooser.setInitialFileName("wallet.dat");
 		File file = fileChooser.showSaveDialog(stage);
 		if (file == null) {
@@ -391,14 +525,16 @@ private void onBackupWallet(MouseEvent event) {
 		debug.log(String.format("File chosen: %s", file.getAbsolutePath()));
 		// debug.log(rpc.callToJson(new BackupWallet.Request(file.getAbsolutePath())));
 
-		final BackupWallet result = rpc.call(new BackupWallet.Request(file.getAbsolutePath()), BackupWallet.class);
+		final BackupWallet result = rpc.call(
+			new BackupWallet.Request(file.getAbsolutePath()), BackupWallet.class);
 		AlertDialog.open(result, Alert.AlertType.ERROR);
 		debug.log(String.format("Backup wallet result: %s", rpc.resultToJson(result)));
 	}
 
 	@FXML
 	private void onNotificationsShown(MouseEvent event) {
-		Preferences.get().put("notifications", String.valueOf(chkNotifications.isSelected()));
+		Preferences.get().put("notifications",
+			String.valueOf(chkNotifications.isSelected()));
 	}
 
 	@Override
@@ -415,15 +551,15 @@ public void eventWalletRequest(@Observes WalletRequest walletRequest) {
 		if (walletRequest == WalletRequest.DUMP_KEYS) {
 			FileChooser fileChooser = new FileChooser();
 			fileChooser.setTitle("Export");
-			fileChooser.getExtensionFilters().addAll(new ExtensionFilter("Walet file", "*.txt"));
+			fileChooser.getExtensionFilters()
+				.addAll(new ExtensionFilter("Walet file", "*.txt"));
 			fileChooser.setInitialFileName("wallet.txt");
 			File file = fileChooser.showSaveDialog(stage);
 
 			debug.log(String.format("File chosen: %s", file.getAbsolutePath()));
 
-			final DumpWallet result = rpc.call(new DumpWallet.Request(file.getAbsolutePath()),
-				DumpWallet.class
-			);
+			final DumpWallet result = rpc.call(
+				new DumpWallet.Request(file.getAbsolutePath()), DumpWallet.class);
 
 			AlertDialog.open(result, Alert.AlertType.ERROR);
 			debug.log(String.format("Dump wallet result: %s", rpc.resultToJson(result)));
@@ -452,4 +588,250 @@ public void run() {
 			}
 		});
 	}
+
+	@FXML
+	private void fetchAndDisplayUnspent() {
+		ListUnspent listUnspent = rpc.call(new ListUnspent.Request(), ListUnspent.class);
+		List<ListUnspent.Result> utxos = listUnspent.getResult();
+
+		unspentTable.setItems(FXCollections.observableArrayList(utxos));
+	}
+
+	@FXML
+	private void mergeUnspentTokens() {
+		ListUnspent listUnspent = rpc.call(new ListUnspent.Request(), ListUnspent.class);
+		List<ListUnspent.Result> utxos = listUnspent.getResult();
+
+		amount = Double.parseDouble(txtMergeAmount.getText());
+		if (wallet.getLocked()) {
+			unlockRequestEvent.fire(UnlockRequest.builder()
+				.type(UnlockRequest.Type.FOR_MERGING).address(txtAddress.getText())
+				.amount(amount)
+				.utxos(utxos)
+				.build());
+			overlayRequest.fire(OverlayRequest.OPEN);
+		} else {
+			// fire event to merge inputs
+			mergeInputsEvent.fire(MergeInputsRequest.builder()
+				.type(MergeInputsRequest.Type.MERGE).address(txtAddress.getText())
+				.amount(amount)
+				.utxos(utxos)
+				.build());
+		}
+	}
+
+	/* MERGE UTXO LOGIC */
+	public boolean isMyAddress(String address) {
+		ValidateAddress validateAddress = rpc.call(new ValidateAddress.Request(address),
+			ValidateAddress.class);
+		return validateAddress.getResult().isValid();
+	}
+
+	private void initProgressDisplay() {
+		separator = new Separator(Orientation.HORIZONTAL);
+		// Add a label to inform the user
+		completionLabel = new Label("Transactions have been completed. You can check each TXID on the explorer:");
+		completionLabel.setStyle("-fx-text-fill: white; -fx-font-weight: bold;");
+
+		txidArea = new TextArea();
+		txidArea.setEditable(false);
+		txidArea.setWrapText(true);
+
+		copyButton = new Button("Copy to Clipboard");
+		copyButton.setOnAction(e -> {
+			final Clipboard clipboard = Clipboard.getSystemClipboard();
+			final ClipboardContent content = new ClipboardContent();
+			content.putString(txidArea.getText());
+			clipboard.setContent(content);
+		});
+		mergeInputsOverlay.getChildren().clear();
+		progressLog.clear();
+		progressLog.setEditable(false);
+		progressLog.setPrefHeight(350);
+		progressLog.setPrefWidth(500);
+
+		ScrollPane scrollPane = new ScrollPane(progressLog);
+		scrollPane.setFitToWidth(true);
+		scrollPane.setFitToHeight(true);
+		scrollPane.setStyle("-fx-background-color: transparent;");
+		closeButton.setDisable(true);
+		closeButton.setOnAction(e -> hideOverlay());
+
+		mergeInputsOverlay.getChildren().addAll(scrollPane, progressIndicator, closeButton);
+		progressIndicator.setVisible(true);
+		mergeInputsOverlay.setSpacing(10);
+		mergeInputsOverlay.setAlignment(Pos.CENTER);
+
+		// Add a confirmation button and label to the mergeInputsOverlay
+		Label confirmationLabel = new Label();
+		confirmationLabel.setWrapText(true);
+		confirmationLabel.setStyle("-fx-text-fill: white;");
+		// Create an HBox to hold the buttons
+		HBox buttonBox = new HBox(10);
+		buttonBox.setAlignment(Pos.CENTER); // Center the buttons horizontally
+		VBox.setVgrow(buttonBox, Priority.ALWAYS);
+		Button confirmButton = new Button("Confirm");
+		Button cancelButton = new Button("Cancel");
+		confirmButton.setCursor(Cursor.HAND); // Add pointer cursor
+		cancelButton.setCursor(Cursor.HAND); // Add pointer cursor
+		// Set the preferred height of the placeholder
+		placeholder.setPrefHeight(confirmationLabel.getHeight() + buttonBox.getHeight());
+
+		// Initially set the visibility of confirmationLabel and buttonBox to true
+		confirmationLabel.setVisible(true);
+		buttonBox.setVisible(true);
+
+		confirmButton.setOnAction(e -> {
+			userConfirmed.set(true);
+			// Remove the confirmationLabel and buttons
+			mergeInputsOverlay.getChildren().removeAll(confirmationLabel, buttonBox);
+			mergeUTXOs(address, utxos);
+		});
+
+		cancelButton.setOnAction(e -> {
+			// Add back the confirmationLabel and buttons
+			if (!mergeInputsOverlay.getChildren().contains(confirmationLabel)) {
+				mergeInputsOverlay.getChildren().addAll(confirmationLabel, buttonBox);
+			}
+			hideOverlay();
+		});
+
+		if (isMyAddress(address)) {
+			confirmationLabel.setText("The address " + address
+				+ " belongs to your wallet. Are you positive you want to merge "
+				+ "these inputs to this address?");
+		} else {
+			confirmationLabel.setText("WARNING: The address " + address
+				+ " does not belong to the wallet. Are you certain you want to "
+				+ "merge inputs to this address outside this wallet?");
+		}
+		// Add confirmationLabel and buttons to the HBox
+		buttonBox.getChildren().addAll(confirmButton, cancelButton);
+		// Add confirmationLabel, confirmButton, and cancelButton to the VBox
+		HBox.setMargin(buttonBox, new Insets(0, 10, 0, 0));
+		VBox.setMargin(confirmationLabel, new Insets(0, 20, 0, 20));
+		mergeInputsOverlay.getChildren().addAll(confirmationLabel, buttonBox);
+	}
+
+	private void logProgress(String message, boolean isComplete) {
+		Platform.runLater(() -> {
+			progressLog.appendText(message + "\n");
+			if (isComplete) {
+				closeButton.setDisable(false);
+				progressIndicator.setVisible(false);
+			}
+		});
+	}
+
+	private void eventMergeInputsRequest(@Observes MergeInputsRequest mergeRequest) {
+		debug.print("Merge request fired", SettingsController.class.getSimpleName());
+
+		address = mergeRequest.getAddress();
+		amount = mergeRequest.getAmount();
+		utxos = mergeRequest.getUtxos();
+
+		// Initialize progress display
+		initProgressDisplay();
+
+		showOverlay();
+	}
+
+	public void mergeUTXOs(String destinationAddress, List<ListUnspent.Result> utxos) {
+		if (!userConfirmed.get()) {
+			return; // Exit if the user does not confirm
+		}
+
+		final double maxAmount = amount;
+		List<List<ListUnspent.Result>> groups = new ArrayList<>();
+		double currentTotal = 0;
+		List<ListUnspent.Result> currentGroup = new ArrayList<>();
+		utxos.sort(Comparator.comparingDouble(ListUnspent.Result::getAmount));
+
+		for (int i = 0; i < utxos.size(); i++) {
+			ListUnspent.Result utxo = utxos.get(i);
+			double amount = utxo.getAmount();
+			currentTotal += amount;
+
+			if (currentTotal <= maxAmount || currentGroup.isEmpty()) {
+				currentGroup.add(utxo);
+			} else {
+				groups.add(new ArrayList<>(currentGroup));
+				currentGroup.clear();
+				currentTotal = amount;
+				currentGroup.add(utxo);
+			}
+
+			// If it's the last UTXO, add the currentGroup to groups
+			if (i == utxos.size() - 1 && !currentGroup.isEmpty()) {
+				groups.add(currentGroup);
+			}
+		}
+
+		List<String> allTxids = new ArrayList<>();
+
+		for (List<ListUnspent.Result> group : groups) {
+			List<Map<String, Object>> inputs = new ArrayList<>();
+			for (ListUnspent.Result utxo : group) {
+				Map<String, Object> input = new HashMap<>();
+				input.put("txid", utxo.getTxid());
+				input.put("vout", utxo.getVout());
+				inputs.add(input);
+			}
+
+			// Calculate the total amount for the current group
+			double groupTotal = group.stream().mapToDouble(ListUnspent.Result::getAmount)
+				.sum();
+
+			Map<String, Double> outputs = new HashMap<>();
+			outputs.put(destinationAddress, groupTotal);
+
+			// Use groupTotal in the logProgress method instead of currentTotal
+			logProgress(String.format("Processing group %d of %d with total value: %.2f",
+				groups.indexOf(group) + 1, groups.size(), groupTotal), false);
+
+			logProgress("Constructing raw transaction...", false);
+			CreateRawTransaction rawTransaction = rpc.call(
+				new CreateRawTransaction.Request(new Object[]{inputs, outputs}),
+				CreateRawTransaction.class);
+			String rawTx = rawTransaction.getResult();
+
+			logProgress("Signing raw transaction...", false);
+			SignRawTransaction signedTransaction = rpc.call(
+				new SignRawTransaction.Request(new Object[]{rawTx}),
+				SignRawTransaction.class);
+			String signedTx = signedTransaction.getResult().getHex();
+
+			logProgress("Broadcasting transaction...", false);
+			SendRawTransaction txHash = rpc.call(
+				new SendRawTransaction.Request(new Object[]{signedTx}),
+				SendRawTransaction.class);
+			allTxids.add(txHash.getResult());
+			logProgress("Transaction broadcasted with hash: ", true);
+		}
+
+		txidArea = new TextArea(String.join("\n", allTxids));
+		copyButton.setOnAction(e -> {
+			final Clipboard clipboard = Clipboard.getSystemClipboard();
+			final ClipboardContent content = new ClipboardContent();
+			content.putString(String.join("\n", allTxids));
+			clipboard.setContent(content);
+		});
+		copyButton.setCursor(Cursor.HAND);
+		VBox.setMargin(copyButton, new Insets(0, 0, 10, 0));
+		mergeInputsOverlay.getChildren().addAll(separator, completionLabel, txidArea, copyButton);
+		mergeInputsOverlay.setVisible(true);
+	}
+
+	public void showOverlay() {
+		pnlSetMaintenance.setVisible(false); // Hide the maintenance view
+		mergeInputsOverlay.setVisible(true); // Show the overlay
+	}
+
+	public void hideOverlay() {
+		mergeInputsOverlay.getChildren().removeAll(separator, txidArea, copyButton, completionLabel);
+
+		mergeInputsOverlay.setVisible(false); // Hide the overlay
+		pnlSetMaintenance.setVisible(true); // Show the maintenance view
+	}
+	/* MERGE UTXO LOGIC */
 }
diff --git a/fx/src/main/java/org/unigrid/janus/model/rpc/entity/AutoMergeInputs.java b/fx/src/main/java/org/unigrid/janus/model/rpc/entity/AutoMergeInputs.java
new file mode 100644
index 00000000..bb7f34a1
--- /dev/null
+++ b/fx/src/main/java/org/unigrid/janus/model/rpc/entity/AutoMergeInputs.java
@@ -0,0 +1,41 @@
+/*
+	The Janus Wallet
+	Copyright © 2021-2023 The Unigrid Foundation, UGD Software AB
+
+	This program is free software: you can redistribute it and/or modify it under the terms of the
+	addended GNU Affero General Public License as published by the Free Software Foundation, version 3
+	of the License (see COPYING and COPYING.addendum).
+
+	This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
+	even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+	GNU Affero General Public License for more details.
+
+	You should have received an addended copy of the GNU Affero General Public License with this program.
+	If not, see <http://www.gnu.org/licenses/> and <https://github.com/unigrid-project/janus-java>.
+ */
+
+package org.unigrid.janus.model.rpc.entity;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class AutoMergeInputs extends BaseResult<AutoMergeInputs.Result> {
+	private static final String METHOD = "autocombinerewards";
+
+	// autocombinerewards true 200
+	// Object[] sendArgs;
+	// sendArgs = new Object[]{true, 200};
+	public static class Request extends BaseRequest {
+		public Request(Object[] args) {
+			super(METHOD);
+			this.setParams(args);
+		}
+	}
+
+	@Data
+	public static class Result {
+		/* Empty on purpose */
+	}
+}
diff --git a/fx/src/main/java/org/unigrid/janus/model/rpc/entity/BudgetGetVote.java b/fx/src/main/java/org/unigrid/janus/model/rpc/entity/BudgetGetVote.java
index 4c43c36f..db91df37 100644
--- a/fx/src/main/java/org/unigrid/janus/model/rpc/entity/BudgetGetVote.java
+++ b/fx/src/main/java/org/unigrid/janus/model/rpc/entity/BudgetGetVote.java
@@ -1,6 +1,6 @@
 /*
 	The Janus Wallet
-	Copyright © 2021-2022 The Unigrid Foundation, UGD Software AB
+	Copyright © 2021-2023 The Unigrid Foundation, UGD Software AB
 
 	This program is free software: you can redistribute it and/or modify it under the terms of the
 	addended GNU Affero General Public License as published by the Free Software Foundation, version 3
diff --git a/fx/src/main/java/org/unigrid/janus/model/rpc/entity/CreateRawTransaction.java b/fx/src/main/java/org/unigrid/janus/model/rpc/entity/CreateRawTransaction.java
new file mode 100644
index 00000000..fbafad60
--- /dev/null
+++ b/fx/src/main/java/org/unigrid/janus/model/rpc/entity/CreateRawTransaction.java
@@ -0,0 +1,33 @@
+/*
+	The Janus Wallet
+	Copyright © 2021-2023 The Unigrid Foundation, UGD Software AB
+
+	This program is free software: you can redistribute it and/or modify it under the terms of the
+	addended GNU Affero General Public License as published by the Free Software Foundation, version 3
+	of the License (see COPYING and COPYING.addendum).
+
+	This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
+	even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+	GNU Affero General Public License for more details.
+
+	You should have received an addended copy of the GNU Affero General Public License with this program.
+	If not, see <http://www.gnu.org/licenses/> and <https://github.com/unigrid-project/janus-java>.
+ */
+
+package org.unigrid.janus.model.rpc.entity;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class CreateRawTransaction extends BaseResult<String> {
+	private static final String METHOD = "createrawtransaction";
+
+	public static class Request extends BaseRequest {
+		public Request(Object[] args) {
+			super(METHOD);
+			this.setParams(args);
+		}
+	}
+}
diff --git a/fx/src/main/java/org/unigrid/janus/model/rpc/entity/ListUnspent.java b/fx/src/main/java/org/unigrid/janus/model/rpc/entity/ListUnspent.java
new file mode 100644
index 00000000..36587f16
--- /dev/null
+++ b/fx/src/main/java/org/unigrid/janus/model/rpc/entity/ListUnspent.java
@@ -0,0 +1,47 @@
+/*
+	The Janus Wallet
+	Copyright © 2021-2023 The Unigrid Foundation, UGD Software AB
+
+	This program is free software: you can redistribute it and/or modify it under the terms of the
+	addended GNU Affero General Public License as published by the Free Software Foundation, version 3
+	of the License (see COPYING and COPYING.addendum).
+
+	This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
+	even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+	GNU Affero General Public License for more details.
+
+	You should have received an addended copy of the GNU Affero General Public License with this program.
+	If not, see <http://www.gnu.org/licenses/> and <https://github.com/unigrid-project/janus-java>.
+ */
+
+package org.unigrid.janus.model.rpc.entity;
+
+import java.util.List;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class ListUnspent extends BaseResult<List<ListUnspent.Result>> {
+	private static final String METHOD = "listunspent";
+	// final ListUnspent listUnspent = rpc.call(new ListUnspent.Request(),
+	// ListUnspent.class);
+	// List<ListUnspent.Result> utxos = listUnspent.getResult();
+
+	public static class Request extends BaseRequest {
+		public Request() {
+			super(METHOD);
+		}
+	}
+
+	@Data
+	public static class Result extends BaseResult {
+		private String txid;
+		private int vout;
+		private String address;
+		private String scriptPubKey;
+		private double amount;
+		private int confirmations;
+		private boolean spendable;
+	}
+}
diff --git a/fx/src/main/java/org/unigrid/janus/model/rpc/entity/SendRawTransaction.java b/fx/src/main/java/org/unigrid/janus/model/rpc/entity/SendRawTransaction.java
new file mode 100644
index 00000000..663c7ed2
--- /dev/null
+++ b/fx/src/main/java/org/unigrid/janus/model/rpc/entity/SendRawTransaction.java
@@ -0,0 +1,33 @@
+/*
+	The Janus Wallet
+	Copyright © 2021-2023 The Unigrid Foundation, UGD Software AB
+
+	This program is free software: you can redistribute it and/or modify it under the terms of the
+	addended GNU Affero General Public License as published by the Free Software Foundation, version 3
+	of the License (see COPYING and COPYING.addendum).
+
+	This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
+	even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+	GNU Affero General Public License for more details.
+
+	You should have received an addended copy of the GNU Affero General Public License with this program.
+	If not, see <http://www.gnu.org/licenses/> and <https://github.com/unigrid-project/janus-java>.
+ */
+
+package org.unigrid.janus.model.rpc.entity;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class SendRawTransaction extends BaseResult<String> {
+	private static final String METHOD = "sendrawtransaction";
+
+	public static class Request extends BaseRequest {
+		public Request(Object[] args) {
+			super(METHOD);
+			this.setParams(args);
+		}
+	}
+}
diff --git a/fx/src/main/java/org/unigrid/janus/model/rpc/entity/SendTransaction.java b/fx/src/main/java/org/unigrid/janus/model/rpc/entity/SendTransaction.java
index bd3b35d3..79260916 100644
--- a/fx/src/main/java/org/unigrid/janus/model/rpc/entity/SendTransaction.java
+++ b/fx/src/main/java/org/unigrid/janus/model/rpc/entity/SendTransaction.java
@@ -12,7 +12,7 @@ of the License (see COPYING and COPYING.addendum).
 
 	You should have received an addended copy of the GNU Affero General Public License with this program.
 	If not, see <http://www.gnu.org/licenses/> and <https://github.com/unigrid-project/janus-java>.
-*/
+ */
 
 package org.unigrid.janus.model.rpc.entity;
 
diff --git a/fx/src/main/java/org/unigrid/janus/model/rpc/entity/SignRawTransaction.java b/fx/src/main/java/org/unigrid/janus/model/rpc/entity/SignRawTransaction.java
new file mode 100644
index 00000000..d4bd19cc
--- /dev/null
+++ b/fx/src/main/java/org/unigrid/janus/model/rpc/entity/SignRawTransaction.java
@@ -0,0 +1,39 @@
+/*
+	The Janus Wallet
+	Copyright © 2021-2023 The Unigrid Foundation, UGD Software AB
+
+	This program is free software: you can redistribute it and/or modify it under the terms of the
+	addended GNU Affero General Public License as published by the Free Software Foundation, version 3
+	of the License (see COPYING and COPYING.addendum).
+
+	This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
+	even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+	GNU Affero General Public License for more details.
+
+	You should have received an addended copy of the GNU Affero General Public License with this program.
+	If not, see <http://www.gnu.org/licenses/> and <https://github.com/unigrid-project/janus-java>.
+ */
+
+package org.unigrid.janus.model.rpc.entity;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class SignRawTransaction extends BaseResult<SignRawTransaction.Result> {
+	private static final String METHOD = "signrawtransaction";
+
+	public static class Request extends BaseRequest {
+		public Request(Object[] args) {
+			super(METHOD);
+			this.setParams(args);
+		}
+	}
+
+	@Data
+	public static class Result {
+		private String hex;
+		private boolean complete;
+	}
+}
diff --git a/fx/src/main/java/org/unigrid/janus/model/signal/MergeInputsRequest.java b/fx/src/main/java/org/unigrid/janus/model/signal/MergeInputsRequest.java
new file mode 100644
index 00000000..a7015859
--- /dev/null
+++ b/fx/src/main/java/org/unigrid/janus/model/signal/MergeInputsRequest.java
@@ -0,0 +1,41 @@
+/*
+    The Janus Wallet
+    Copyright © 2021-2023 The Unigrid Foundation, UGD Software AB
+
+    This program is free software: you can redistribute it and/or modify it under the terms of the
+    addended GNU Affero General Public License as published by the Free Software Foundation, version 3
+    of the License (see COPYING and COPYING.addendum).
+
+    This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
+    even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+    GNU Affero General Public License for more details.
+
+    You should have received an addended copy of the GNU Affero General Public License with this program.
+    If not, see <http://www.gnu.org/licenses/> and <https://github.com/unigrid-project/janus-java>.
+ */
+
+package org.unigrid.janus.model.signal;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.Getter;
+import org.unigrid.janus.model.rpc.entity.ListUnspent;
+import java.util.List;
+
+@Data @Builder
+public class MergeInputsRequest {
+	private String address;
+	private double amount;
+	private List<ListUnspent.Result> utxos;
+
+	@AllArgsConstructor
+	public enum Type {
+		MERGE("MERGE", "Merge your UTXOs by entering the necessary details and pressing the MERGE button.");
+
+		@Getter private final String action;
+		@Getter private final String description;
+	}
+
+	private Type type;
+}
diff --git a/fx/src/main/java/org/unigrid/janus/model/signal/UnlockRequest.java b/fx/src/main/java/org/unigrid/janus/model/signal/UnlockRequest.java
index 3b478498..c6410f34 100644
--- a/fx/src/main/java/org/unigrid/janus/model/signal/UnlockRequest.java
+++ b/fx/src/main/java/org/unigrid/janus/model/signal/UnlockRequest.java
@@ -12,41 +12,50 @@ of the License (see COPYING and COPYING.addendum).
 
     You should have received an addended copy of the GNU Affero General Public License with this program.
     If not, see <http://www.gnu.org/licenses/> and <https://github.com/unigrid-project/janus-java>.
-*/
+ */
 
 package org.unigrid.janus.model.signal;
 
+import java.util.List;
+
+import org.unigrid.janus.model.rpc.entity.ListUnspent;
+
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.Getter;
 
 @Data @Builder
+@AllArgsConstructor
 public class UnlockRequest {
-	@AllArgsConstructor
 	public enum Type {
-		ORDINARY("UNLOCK", 2, "Unlock your wallet by entering your passphrase "
-			+ "and pressing the UNLOCK button."),
-
-		TIMED("UNLOCK", 4, "Please enter your passphrase in order to perform "
-			+ "this task. The wallet will automatically lock itself after 30 seconds."),
-
-		FOR_DUMP("EXPORT", 5, "Please enter your passphrase to export your private keys. If your "
-			+ "wallet was staking you will need to enable again after the task completes."),
-
-		FOR_GRIDNODE("START", 4, "Please enter your passphrase to enable your gridnodes. If your "
-			+ "wallet was staking you will need to enable again after the task completes."),
-
-		FOR_SEND("SEND", 3, "Please enter your passphrase to send Unigrid tokens. If your wallet "
-			+ "was staking you will need to enable again after the transaction completes."),
-
-		FOR_STAKING("STAKE", 1, "Enable staking in your wallet by entering your passphrase and "
-			+ "pressing the STAKE button.");
+		ORDINARY("UNLOCK", "Unlock your wallet by entering your passphrase and "
+			+ "pressing the UNLOCK button."),
+		TIMED("UNLOCK", "Please enter your passphrase in order to perform this task. "
+			+ "The wallet will automatically lock itself after 30 seconds."),
+		FOR_DUMP("EXPORT", "Please enter your passphrase to export your private keys. "
+			+ "If your wallet was staking, you will need to enable it again after the task completes."),
+		FOR_GRIDNODE("START", "Please enter your passphrase to enable your grid nodes. "
+			+ "If your wallet was staking, you will need to enable it again after the task completes."),
+		FOR_SEND("SEND", "Please enter your passphrase to send Unigrid tokens. If your "
+			+ "wallet was staking, you will need to enable it again after the transaction completes."),
+		FOR_STAKING("STAKE", "Enable staking in your wallet by entering your passphrase "
+			+ "and pressing the STAKE button."),
+		FOR_MERGING("MERGE", "Enable auto-merging inputs in your wallet by entering your "
+			+ "passphrase and pressing the MERGE button.");
 
 		@Getter private final String action;
-		@Getter private final int state;
 		@Getter private final String description;
+
+		Type(String action, String description) {
+			this.action = action;
+			this.description = description;
+		}
 	}
 
+	private String address;
+	private double amount;
+	private List<ListUnspent.Result> utxos;
+
 	private Type type;
 }
diff --git a/fx/src/main/resources/org/unigrid/janus/view/mainWindow.fxml b/fx/src/main/resources/org/unigrid/janus/view/mainWindow.fxml
index f0d79bc7..4ee1f0bd 100644
--- a/fx/src/main/resources/org/unigrid/janus/view/mainWindow.fxml
+++ b/fx/src/main/resources/org/unigrid/janus/view/mainWindow.fxml
@@ -24,7 +24,7 @@
 <?import org.kordamp.ikonli.javafx.StackedFontIcon?>
 <?import org.unigrid.janus.view.component.WindowBarButton?>
 
-<Stage minHeight="400.0" minWidth="600.0" title="Unigrid Janus Wallet" xmlns="http://javafx.com/javafx/18" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.unigrid.janus.controller.MainWindowController">
+<Stage minHeight="400.0" minWidth="600.0" title="Unigrid Janus Wallet" xmlns="http://javafx.com/javafx/19" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.unigrid.janus.controller.MainWindowController">
    <scene>
       <Scene fill="#000024" stylesheets="@main.css">
          <root>
diff --git a/fx/src/main/resources/org/unigrid/janus/view/settings.fxml b/fx/src/main/resources/org/unigrid/janus/view/settings.fxml
index 601687b6..c3a42692 100644
--- a/fx/src/main/resources/org/unigrid/janus/view/settings.fxml
+++ b/fx/src/main/resources/org/unigrid/janus/view/settings.fxml
@@ -6,6 +6,9 @@
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.control.ListView?>
 <?import javafx.scene.control.PasswordField?>
+<?import javafx.scene.control.TableColumn?>
+<?import javafx.scene.control.TableView?>
+<?import javafx.scene.control.TextField?>
 <?import javafx.scene.control.ToggleButton?>
 <?import javafx.scene.control.ToggleGroup?>
 <?import javafx.scene.image.Image?>
@@ -14,384 +17,478 @@
 <?import javafx.scene.layout.BorderPane?>
 <?import javafx.scene.layout.FlowPane?>
 <?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.StackPane?>
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.text.Font?>
 
-<AnchorPane prefHeight="450.0" prefWidth="600.0" style="-fx-background-color: linear-gradient(from 75px 75px to 200px 150px, #00001c, #000024);" styleClass="settings" stylesheets="@main.css" xmlns="http://javafx.com/javafx/19" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.unigrid.janus.controller.SettingsController">
-   <children>
-      <BorderPane AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
-         <center>
-            <AnchorPane>
-               <children>
-                  <VBox fx:id="pnlSetGeneral" prefHeight="200.0" prefWidth="100.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
-                     <children>
-                        <FlowPane alignment="TOP_RIGHT" prefHeight="10.0" prefWidth="200.0" rowValignment="TOP">
-                           <children>
-                              <Label fx:id="verLbl" text="version:" textFill="#b5b5b5">
-                                 <font>
-                                    <Font size="9.0" />
-                                 </font>
-                              </Label>
-                           </children>
-                        </FlowPane>
-                        <AnchorPane>
-                           <children>
-                              <Label text="Configuration file" textFill="#ee7722">
-                                 <font>
-                                    <Font size="18.0" />
-                                 </font>
-                              </Label>
-                              <Label layoutY="27.0" text="Edit settings for your wallet (after saving the wallet must be restarted)." textFill="#ccccff" wrapText="true" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0">
-                                 <padding>
-                                    <Insets bottom="10.0" />
-                                 </padding>
-                              </Label>
-                              <HBox layoutY="48.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0">
-                                 <children>
-                                    <Button fx:id="btnSetGeneralConf" mnemonicParsing="false" onMouseClicked="#onOpenConf" style="-fx-cursor: hand;" text="OPEN">
-                                       <HBox.margin>
-                                          <Insets bottom="8.0" />
-                                       </HBox.margin>
-                                    </Button>
-                                 </children>
-                                 <padding>
-                                    <Insets top="15.0" />
-                                 </padding>
-                              </HBox>
-                           </children>
-                           <VBox.margin>
-                              <Insets />
-                           </VBox.margin>
-                           <padding>
-                              <Insets bottom="15.0" />
-                           </padding>
-                        </AnchorPane>
-                        <AnchorPane>
-                           <children>
-                              <Label text="Gridnode file" textFill="#ee7722">
-                                 <font>
-                                    <Font size="18.0" />
-                                 </font>
-                              </Label>
-                              <Label layoutY="27.0" text="Add / Edit gridnodes (after saving the wallet must be restarted)." textFill="#ccccff" wrapText="true" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0">
-                                 <opaqueInsets>
-                                    <Insets bottom="10.0" />
-                                 </opaqueInsets>
-                              </Label>
-                              <HBox layoutY="48.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" />
-                           </children>
-                           <opaqueInsets>
-                              <Insets />
-                           </opaqueInsets>
-                           <VBox.margin>
-                              <Insets />
-                           </VBox.margin>
-                           <padding>
-                              <Insets bottom="15.0" />
-                           </padding>
-                        </AnchorPane>
-                        <Button fx:id="btnSetGeneralGridnode" mnemonicParsing="false" onMouseClicked="#onOpenGridnode" style="-fx-cursor: hand;" text="OPEN">
-                           <opaqueInsets>
-                              <Insets top="20.0" />
-                           </opaqueInsets>
-                           <VBox.margin>
-                              <Insets bottom="20.0" />
-                           </VBox.margin>
-                        </Button>
-                        <AnchorPane>
-                           <children>
-                              <Label text="Blockchain data" textFill="#ee7722">
-                                 <font>
-                                    <Font size="18.0" />
-                                 </font>
-                              </Label>
-                              <Label layoutY="27.0" text="This will open the directory of your locally stored blockchain where your wallet.dat, logs, and configuration files are stored." textFill="#ccccff" wrapText="true" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0">
-                                 <padding>
-                                    <Insets bottom="10.0" />
-                                 </padding>
-                              </Label>
-                              <HBox layoutY="48.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0">
-                                 <children>
-                                    <Button fx:id="btnSetGeneralUnigrid" mnemonicParsing="false" onMouseClicked="#onOpenUnigrid" style="-fx-cursor: hand;" text="OPEN">
-                                       <HBox.margin>
-                                          <Insets bottom="8.0" />
-                                       </HBox.margin>
-                                    </Button>
-                                 </children>
-                                 <padding>
-                                    <Insets top="15.0" />
-                                 </padding>
-                              </HBox>
-                           </children>
-                           <padding>
-                              <Insets bottom="15.0" />
-                           </padding>
-                           <VBox.margin>
-                              <Insets top="10.0" />
-                           </VBox.margin>
-                        </AnchorPane>
-                        <CheckBox fx:id="chkNotifications" mnemonicParsing="false" onMouseClicked="#onNotificationsShown" selected="true" style="-fx-cursor: hand;" stylesheets="@main.css" text="Show app notifications" textFill="#ee7722">
-                           <font>
-                              <Font size="18.0" />
-                           </font>
-                        </CheckBox>
-                     </children>
-                     <padding>
-                        <Insets left="10.0" right="10.0" top="10.0" />
-                     </padding>
-                  </VBox>
-                  <VBox fx:id="pnlSetDisplay" alignment="CENTER" prefHeight="200.0" prefWidth="100.0" visible="false" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
-                     <children>
-                        <Label text="Display" textFill="#ee7722">
-                           <font>
-                              <Font name="System Bold" size="24.0" />
-                           </font>
-                        </Label>
-                     </children>
-                  </VBox>
-                  <VBox fx:id="pnlSetPassphrase" prefHeight="200.0" prefWidth="100.0" visible="false" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
-                     <children>
-                        <Label fx:id="txtPassWarningOne" layoutX="26.0" layoutY="18.0" text="Warning! This will encrypt your wallet with a passphrase. Write down your passphrase and keep it safe." textAlignment="JUSTIFY" textFill="#ccccff" wrapText="true">
-                           <VBox.margin>
-                              <Insets bottom="8.0" />
-                           </VBox.margin>
-                        </Label>
-                        <Label fx:id="txtPassWarningTwo" text="If you have not backed up your wallet yet please do so first. An automatic wallet restart will also be performed." textAlignment="JUSTIFY" textFill="#ccccff" wrapText="true">
-                           <VBox.margin>
-                              <Insets bottom="8.0" />
-                           </VBox.margin>
-                        </Label>
-                        <AnchorPane>
-                           <children>
-                              <Label fx:id="txtPassphraseOne" alignment="CENTER" contentDisplay="RIGHT" graphicTextGap="8.0" text="Passphrase" textFill="#ee7722" AnchorPane.leftAnchor="0.0">
-                                 <font>
-                                    <Font size="14.0" />
-                                 </font>
-                              </Label>
-                              <ImageView fitHeight="16.0" fitWidth="16.0" pickOnBounds="true" preserveRatio="true" AnchorPane.rightAnchor="0.0">
-                                 <image>
-                                    <Image url="@images/settings_icon.png" />
-                                 </image>
-                              </ImageView>
-                           </children>
-                        </AnchorPane>
-                        <PasswordField fx:id="taPassphrase" prefHeight="35.0" />
-                        <Label fx:id="txtPassphraseTwo" text="Repeat passphrase" textFill="#ee7722">
-                           <font>
-                              <Font size="14.0" />
-                           </font>
-                        </Label>
-                        <PasswordField fx:id="taRepeatPassphrase" onKeyTyped="#onRepeatPassphraseChange" prefHeight="35.0" />
-                        <HBox alignment="TOP_CENTER">
-                           <VBox.margin>
-                              <Insets top="8.0" />
-                           </VBox.margin>
-                           <children>
-                              <Button fx:id="btnUpdatePassphrase" disable="true" mnemonicParsing="false" onMouseClicked="#onLock" style="-fx-cursor: hand;" text="Encrypt">
-                                 <HBox.margin>
-                                    <Insets right="8.0" />
-                                 </HBox.margin>
-                              </Button>
-                           </children>
-                        </HBox>
-                     </children>
-                     <padding>
-                        <Insets bottom="8.0" left="16.0" right="16.0" top="8.0" />
-                     </padding>
-                  </VBox>
-                  <VBox fx:id="pnlSetExport" prefHeight="200.0" prefWidth="100.0" visible="false" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
-                     <children>
-                        <AnchorPane>
-                           <children>
-                              <Label text="Import Keys" textFill="#ee7722">
-                                 <font>
-                                    <Font size="18.0" />
-                                 </font>
-                              </Label>
-                              <Label layoutY="27.0" text="Import keys and recover from certain disaster." textFill="#ccccff" wrapText="true" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" />
-                              <HBox layoutY="48.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0">
-                                 <children>
-                                    <Button fx:id="btnSetExportImport" mnemonicParsing="false" onMouseClicked="#onImportWallet" style="-fx-cursor: hand;" text="Import">
-                                       <HBox.margin>
-                                          <Insets bottom="8.0" />
-                                       </HBox.margin>
-                                    </Button>
-                                 </children>
-                              </HBox>
-                           </children>
-                        </AnchorPane>
-                        <AnchorPane>
-                           <children>
-                              <Label text="Export keys" textFill="#ee7722">
-                                 <font>
-                                    <Font size="18.0" />
-                                 </font>
-                              </Label>
-                              <Label layoutY="27.0" text="Create an export of your keys and keep in a safe place in case you forget your passphrase." textFill="#ccccff" wrapText="true" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" />
-                              <HBox layoutY="65.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0">
-                                 <children>
-                                    <Button fx:id="btnSetExportExport" mnemonicParsing="false" onMouseClicked="#onDumpWallet" style="-fx-cursor: hand;" text="Export">
-                                       <HBox.margin>
-                                          <Insets bottom="8.0" />
-                                       </HBox.margin>
-                                    </Button>
-                                 </children>
-                              </HBox>
-                           </children>
-                        </AnchorPane>
-                        <AnchorPane>
-                           <children>
-                              <Label text="Backup Wallet" textFill="#ee7722">
-                                 <font>
-                                    <Font size="18.0" />
-                                 </font>
-                              </Label>
-                              <Label layoutY="27.0" text="Create a backup of your wallet to store in case your computer breaks down or is lost." textFill="#ccccff" wrapText="true" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" />
-                              <HBox layoutY="65.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0">
-                                 <children>
-                                    <Button fx:id="btnSetExportBackup" mnemonicParsing="false" onMouseClicked="#onBackupWallet" text="Backup" />
-                                 </children>
-                              </HBox>
-                           </children>
-                        </AnchorPane>
-                     </children>
-                     <padding>
-                        <Insets bottom="8.0" left="10.0" right="8.0" top="8.0" />
-                     </padding>
-                  </VBox>
-                  <VBox fx:id="pnlSetDebug" visible="false" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
-                     <children>
-                        <ListView fx:id="lstDebug" VBox.vgrow="ALWAYS" />
-                     </children>
-                  </VBox>
-               </children>
-            </AnchorPane>
-         </center>
-         <left>
-            <VBox alignment="TOP_RIGHT" styleClass="sidebar" BorderPane.alignment="TOP_RIGHT">
-               <children>
-                  <ToggleButton fx:id="btnSetGeneral" alignment="CENTER_RIGHT" mnemonicParsing="false" onMouseClicked="#onSetGeneralTap" prefWidth="100.0" selected="true" style="-fx-cursor: hand;" text="General">
-                     <toggleGroup>
-                        <ToggleGroup fx:id="settings" />
-                     </toggleGroup>
-                     <VBox.margin>
-                        <Insets bottom="4.0" />
-                     </VBox.margin>
-                     <padding>
-                        <Insets bottom="3.0" left="8.0" right="8.0" top="3.0" />
-                     </padding>
-                  </ToggleButton>
-                  <ToggleButton fx:id="btnSetPassphrase" alignment="CENTER_RIGHT" mnemonicParsing="false" onMouseClicked="#onSetPassphraseTap" prefWidth="100.0" style="-fx-cursor: hand;" text="Passphrase" toggleGroup="$settings">
-                     <VBox.margin>
-                        <Insets bottom="4.0" />
-                     </VBox.margin>
-                     <padding>
-                        <Insets bottom="3.0" left="8.0" right="8.0" top="3.0" />
-                     </padding>
-                  </ToggleButton>
-                  <ToggleButton fx:id="btnSetExport" alignment="CENTER_RIGHT" mnemonicParsing="false" onMouseClicked="#onSetExportTap" prefWidth="100.0" style="-fx-cursor: hand;" text="Import/Export" toggleGroup="$settings">
-                     <VBox.margin>
-                        <Insets bottom="4.0" />
-                     </VBox.margin>
-                     <padding>
-                        <Insets bottom="3.0" left="8.0" right="8.0" top="3.0" />
-                     </padding>
-                  </ToggleButton>
-                  <ToggleButton fx:id="btnSetDebug" alignment="CENTER_RIGHT" contentDisplay="RIGHT" mnemonicParsing="false" onMouseClicked="#onSetDebugTap" prefWidth="100.0" style="-fx-cursor: hand;" text="Debug" toggleGroup="$settings">
-                     <VBox.margin>
-                        <Insets bottom="4.0" />
-                     </VBox.margin>
-                     <padding>
-                        <Insets bottom="3.0" left="8.0" right="8.0" top="3.0" />
-                     </padding>
-                  </ToggleButton>
-                  <AnchorPane VBox.vgrow="ALWAYS">
-                     <children>
-                        <VBox alignment="BOTTOM_CENTER" AnchorPane.bottomAnchor="1.0" AnchorPane.leftAnchor="1.0" AnchorPane.rightAnchor="1.0">
-                           <children>
-                              <Label prefHeight="17.0" prefWidth="95.0" stylesheets="@main.css" text="Janus Ver:" textFill="#b5b5b5">
-                                 <VBox.margin>
-                                    <Insets />
-                                 </VBox.margin>
-                                 <padding>
-                                    <Insets left="1.0" right="1.0" />
-                                 </padding>
-                                 <font>
-                                    <Font size="9.0" />
-                                 </font>
-                              </Label>
-                              <Label fx:id="txtFxVersion" prefHeight="17.0" prefWidth="95.0" textFill="#b5b5b5">
-                                 <VBox.margin>
-                                    <Insets />
-                                 </VBox.margin>
-                                 <padding>
-                                    <Insets left="1.0" right="1.0" />
-                                 </padding>
-                                 <font>
-                                    <Font size="9.0" />
-                                 </font>
-                              </Label>
-                              <Label prefHeight="17.0" prefWidth="95.0" text="Installer Ver:" textFill="#b5b5b5">
-                                 <padding>
-                                    <Insets left="1.0" right="1.0" />
-                                 </padding>
-                                 <font>
-                                    <Font size="9.0" />
-                                 </font>
-                              </Label>
-                              <Label fx:id="txtBootstrapVersion" prefHeight="17.0" prefWidth="95.0" textFill="#b5b5b5">
-                                 <padding>
-                                    <Insets left="1.0" right="1.0" />
-                                 </padding>
-                                 <font>
-                                    <Font size="9.0" />
-                                 </font>
-                              </Label>
-                              <Label prefHeight="17.0" prefWidth="95.0" text="Daemon Ver:" textFill="#b5b5b5">
-                                 <padding>
-                                    <Insets left="1.0" right="1.0" />
-                                 </padding>
-                                 <font>
-                                    <Font size="9.0" />
-                                 </font>
-                              </Label>
-                              <Label fx:id="txtDaemonVersion" prefHeight="17.0" prefWidth="95.0" textFill="#b5b5b5">
-                                 <padding>
-                                    <Insets left="1.0" right="1.0" />
-                                 </padding>
-                                 <font>
-                                    <Font size="9.0" />
-                                 </font>
-                              </Label>
-                              <Label prefHeight="17.0" prefWidth="95.0" text="Hedgehog Ver:" textFill="#b5b5b5">
-                                 <padding>
-                                    <Insets left="1.0" right="1.0" />
-                                 </padding>
-                                 <font>
-                                    <Font size="9.0" />
-                                 </font>
-                              </Label>
-                              <Label fx:id="txtHedgehogVersion" prefHeight="17.0" prefWidth="95.0" textFill="#b5b5b5">
-                                 <padding>
-                                    <Insets left="1.0" right="1.0" />
-                                 </padding>
-                                 <font>
-                                    <Font size="9.0" />
-                                 </font>
-                              </Label>
-                           </children>
-                           <padding>
-                              <Insets right="-1.0" />
-                           </padding>
-                        </VBox>
-                     </children>
-                  </AnchorPane>
-               </children>
-               <padding>
-                  <Insets right="-1.0" />
-               </padding>
-            </VBox>
-         </left>
-      </BorderPane>
-   </children>
+<AnchorPane prefHeight="450.0" prefWidth="700.0" style="-fx-background-color: linear-gradient(from 75px 75px to 200px 150px, #00001c, #000024);" styleClass="settings" stylesheets="@main.css" xmlns="http://javafx.com/javafx/19" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.unigrid.janus.controller.SettingsController">
+	<children>
+		<BorderPane AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+			<center>
+				<AnchorPane>
+					<children>
+						<VBox fx:id="pnlSetGeneral" prefHeight="200.0" prefWidth="100.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+							<children>
+								<FlowPane alignment="TOP_RIGHT" prefHeight="10.0" prefWidth="200.0" rowValignment="TOP">
+									<children>
+										<Label fx:id="verLbl" text="version:" textFill="#b5b5b5">
+											<font>
+												<Font size="9.0" />
+											</font>
+										</Label>
+									</children>
+								</FlowPane>
+								<AnchorPane>
+									<children>
+										<Label text="Configuration file" textFill="#ee7722">
+											<font>
+												<Font size="18.0" />
+											</font>
+										</Label>
+										<Label layoutY="27.0" text="Edit settings for your wallet (after saving the wallet must be restarted)." textFill="#ccccff" wrapText="true" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0">
+											<padding>
+												<Insets bottom="10.0" />
+											</padding>
+										</Label>
+										<HBox layoutY="48.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0">
+											<children>
+												<Button fx:id="btnSetGeneralConf" mnemonicParsing="false" onMouseClicked="#onOpenConf" style="-fx-cursor: hand;" text="OPEN">
+													<HBox.margin>
+														<Insets bottom="8.0" />
+													</HBox.margin>
+												</Button>
+											</children>
+											<padding>
+												<Insets top="15.0" />
+											</padding>
+										</HBox>
+									</children>
+									<VBox.margin>
+										<Insets />
+									</VBox.margin>
+									<padding>
+										<Insets bottom="15.0" />
+									</padding>
+								</AnchorPane>
+								<AnchorPane>
+									<children>
+										<Label text="Gridnode file" textFill="#ee7722">
+											<font>
+												<Font size="18.0" />
+											</font>
+										</Label>
+										<Label layoutY="27.0" text="Add / Edit gridnodes (after saving the wallet must be restarted)." textFill="#ccccff" wrapText="true" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0">
+											<opaqueInsets>
+												<Insets bottom="10.0" />
+											</opaqueInsets>
+										</Label>
+										<HBox layoutY="48.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" />
+									</children>
+									<opaqueInsets>
+										<Insets />
+									</opaqueInsets>
+									<VBox.margin>
+										<Insets />
+									</VBox.margin>
+									<padding>
+										<Insets bottom="15.0" />
+									</padding>
+								</AnchorPane>
+								<Button fx:id="btnSetGeneralGridnode" mnemonicParsing="false" onMouseClicked="#onOpenGridnode" style="-fx-cursor: hand;" text="OPEN">
+									<opaqueInsets>
+										<Insets top="20.0" />
+									</opaqueInsets>
+									<VBox.margin>
+										<Insets bottom="20.0" />
+									</VBox.margin>
+								</Button>
+								<AnchorPane>
+									<children>
+										<Label text="Blockchain data" textFill="#ee7722">
+											<font>
+												<Font size="18.0" />
+											</font>
+										</Label>
+										<Label layoutY="27.0" text="This will open the directory of your locally stored blockchain where your wallet.dat, logs, and configuration files are stored." textFill="#ccccff" wrapText="true" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0">
+											<padding>
+												<Insets bottom="10.0" />
+											</padding>
+										</Label>
+										<HBox layoutY="48.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0">
+											<children>
+												<Button fx:id="btnSetGeneralUnigrid" mnemonicParsing="false" onMouseClicked="#onOpenUnigrid" style="-fx-cursor: hand;" text="OPEN">
+													<HBox.margin>
+														<Insets bottom="8.0" />
+													</HBox.margin>
+												</Button>
+											</children>
+											<padding>
+												<Insets top="15.0" />
+											</padding>
+										</HBox>
+									</children>
+									<padding>
+										<Insets bottom="15.0" />
+									</padding>
+									<VBox.margin>
+										<Insets top="10.0" />
+									</VBox.margin>
+								</AnchorPane>
+								<CheckBox fx:id="chkNotifications" mnemonicParsing="false" onMouseClicked="#onNotificationsShown" selected="true" style="-fx-cursor: hand;" stylesheets="@main.css" text="Show app notifications" textFill="#ee7722">
+									<font>
+										<Font size="18.0" />
+									</font>
+								</CheckBox>
+							</children>
+							<padding>
+								<Insets left="10.0" right="10.0" top="10.0" />
+							</padding>
+						</VBox>
+						<VBox fx:id="pnlSetDisplay" alignment="CENTER" prefHeight="200.0" prefWidth="100.0" visible="false" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+							<children>
+								<Label text="Display" textFill="#ee7722">
+									<font>
+										<Font name="System Bold" size="24.0" />
+									</font>
+								</Label>
+							</children>
+						</VBox>
+						<VBox fx:id="pnlSetPassphrase" prefHeight="200.0" prefWidth="100.0" visible="false" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+							<children>
+								<Label fx:id="txtPassWarningOne" layoutX="26.0" layoutY="18.0" text="Warning! This will encrypt your wallet with a passphrase. Write down your passphrase and keep it safe." textAlignment="JUSTIFY" textFill="#ccccff" wrapText="true">
+									<VBox.margin>
+										<Insets bottom="8.0" />
+									</VBox.margin>
+								</Label>
+								<Label fx:id="txtPassWarningTwo" text="If you have not backed up your wallet yet please do so first. An automatic wallet restart will also be performed." textAlignment="JUSTIFY" textFill="#ccccff" wrapText="true">
+									<VBox.margin>
+										<Insets bottom="8.0" />
+									</VBox.margin>
+								</Label>
+								<AnchorPane>
+									<children>
+										<Label fx:id="txtPassphraseOne" alignment="CENTER" contentDisplay="RIGHT" graphicTextGap="8.0" text="Passphrase" textFill="#ee7722" AnchorPane.leftAnchor="0.0">
+											<font>
+												<Font size="14.0" />
+											</font>
+										</Label>
+										<ImageView fitHeight="16.0" fitWidth="16.0" pickOnBounds="true" preserveRatio="true" AnchorPane.rightAnchor="0.0">
+											<image>
+												<Image url="@images/settings_icon.png" />
+											</image>
+										</ImageView>
+									</children>
+								</AnchorPane>
+								<PasswordField fx:id="taPassphrase" prefHeight="35.0" />
+								<Label fx:id="txtPassphraseTwo" text="Repeat passphrase" textFill="#ee7722">
+									<font>
+										<Font size="14.0" />
+									</font>
+								</Label>
+								<PasswordField fx:id="taRepeatPassphrase" onKeyTyped="#onRepeatPassphraseChange" prefHeight="35.0" />
+								<HBox alignment="TOP_CENTER">
+									<VBox.margin>
+										<Insets top="8.0" />
+									</VBox.margin>
+									<children>
+										<Button fx:id="btnUpdatePassphrase" disable="true" mnemonicParsing="false" onMouseClicked="#onLock" style="-fx-cursor: hand;" text="Encrypt">
+											<HBox.margin>
+												<Insets right="8.0" />
+											</HBox.margin>
+										</Button>
+									</children>
+								</HBox>
+							</children>
+							<padding>
+								<Insets bottom="8.0" left="16.0" right="16.0" top="8.0" />
+							</padding>
+						</VBox>
+						<VBox fx:id="pnlSetExport" prefHeight="200.0" prefWidth="100.0" visible="false" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+							<children>
+								<AnchorPane>
+									<children>
+										<Label text="Import Keys" textFill="#ee7722">
+											<font>
+												<Font size="18.0" />
+											</font>
+										</Label>
+										<Label layoutY="27.0" text="Import keys and recover from certain disaster." textFill="#ccccff" wrapText="true" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" />
+										<HBox layoutY="48.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0">
+											<children>
+												<Button fx:id="btnSetExportImport" mnemonicParsing="false" onMouseClicked="#onImportWallet" style="-fx-cursor: hand;" text="Import">
+													<HBox.margin>
+														<Insets bottom="8.0" />
+													</HBox.margin>
+												</Button>
+											</children>
+										</HBox>
+									</children>
+								</AnchorPane>
+								<AnchorPane>
+									<children>
+										<Label text="Export keys" textFill="#ee7722">
+											<font>
+												<Font size="18.0" />
+											</font>
+										</Label>
+										<Label layoutY="27.0" text="Create an export of your keys and keep in a safe place in case you forget your passphrase." textFill="#ccccff" wrapText="true" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" />
+										<HBox layoutY="65.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0">
+											<children>
+												<Button fx:id="btnSetExportExport" mnemonicParsing="false" onMouseClicked="#onDumpWallet" style="-fx-cursor: hand;" text="Export">
+													<HBox.margin>
+														<Insets bottom="8.0" />
+													</HBox.margin>
+												</Button>
+											</children>
+										</HBox>
+									</children>
+								</AnchorPane>
+								<AnchorPane>
+									<children>
+										<Label text="Backup Wallet" textFill="#ee7722">
+											<font>
+												<Font size="18.0" />
+											</font>
+										</Label>
+										<Label layoutY="27.0" text="Create a backup of your wallet to store in case your computer breaks down or is lost." textFill="#ccccff" wrapText="true" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" />
+										<HBox layoutY="65.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0">
+											<children>
+												<Button fx:id="btnSetExportBackup" mnemonicParsing="false" onMouseClicked="#onBackupWallet" text="Backup" />
+											</children>
+										</HBox>
+									</children>
+								</AnchorPane>
+							</children>
+							<padding>
+								<Insets bottom="8.0" left="10.0" right="8.0" top="8.0" />
+							</padding>
+						</VBox>
+						<StackPane fx:id="maintenanceStack" prefHeight="150.0" prefWidth="200.0" visible="false" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+							<children>
+								<VBox fx:id="pnlSetMaintenance" prefHeight="200.0" prefWidth="100.0">
+									<children>
+										<AnchorPane>
+											<children>
+												<Label text="Wallet Maintenance" textFill="#ee7722">
+													<font>
+														<Font size="18.0" />
+													</font>
+												</Label>
+												<Label layoutY="27.0" text="List the unspent coins in your wallet" textFill="#ccccff" wrapText="true" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" />
+												<HBox layoutY="48.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="48.0">
+													<children>
+														<Button fx:id="btnListUnspent" mnemonicParsing="false" onMouseClicked="#fetchAndDisplayUnspent" style="-fx-cursor: hand;" text="List Unspent">
+															<HBox.margin>
+																<Insets bottom="8.0" left="20.0" />
+															</HBox.margin>
+														</Button>
+													</children>
+													<padding>
+														<Insets top="10.0" />
+													</padding>
+												</HBox>
+											</children>
+										</AnchorPane>
+										<AnchorPane>
+											<children>
+												<TableView fx:id="unspentTable" prefHeight="300.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+													<columns>
+														<TableColumn fx:id="txidColumn" prefWidth="200.0" text="Transaction ID" />
+														<TableColumn fx:id="voutColumn" prefWidth="40.0" text="Vout" />
+														<TableColumn fx:id="addressColumn" prefWidth="200.0" text="Address" />
+														<TableColumn fx:id="scriptPubKeyColumn" prefWidth="5.0" text="Script Pub Key" />
+														<TableColumn fx:id="amountColumn" prefWidth="150.0" text="Amount" />
+														<TableColumn fx:id="confirmationsColumn" prefWidth="100.0" text="Confirmations" />
+													</columns>
+												</TableView>
+											</children>
+										</AnchorPane>
+										<AnchorPane prefHeight="150.0">
+											<children>
+												<VBox spacing="10.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+													<!-- HBox containing the Label -->
+													<HBox>
+														<children>
+															<Label text="Merge multiple small UTXO inputs in one go. Choose an address in your wallet and select an amount for the total merge. The default setting is 200 for consolidating numerous tiny inputs. Adjust this value as needed to continue merging and optimize your wallet's organization. (A small transaction fee will be added to each merge)" textFill="#ccccff" wrapText="true" />
+														</children>
+													</HBox>
+            
+													<!-- HBox containing the TextField and Button -->
+													<HBox>
+														<children>
+															<TextField fx:id="txtAddress" prefWidth="350.0">
+																<HBox.margin>
+																	<Insets right="10.0" />
+																</HBox.margin>
+															</TextField>
+														</children>
+													</HBox>
+                                       <HBox>
+                                          <children>
+                                             <TextField fx:id="txtMergeAmount" prefWidth="350.0" promptText="Amount" text="200">
+                                                <HBox.margin>
+                                                   <Insets right="10.0" />
+                                                </HBox.margin>
+                                             </TextField>
+                                             <Button fx:id="btnMerge" mnemonicParsing="false" onMouseClicked="#mergeUnspentTokens" style="-fx-cursor: hand;" text="Merge">
+                                                <HBox.margin>
+                                                   <Insets bottom="8.0" />
+                                                </HBox.margin>
+                                             </Button>
+                                          </children>
+                                       </HBox>
+                                       <padding>
+                                          <Insets top="10.0" />
+                                       </padding>
+												</VBox>
+											</children>
+										</AnchorPane>
+									</children>
+									<padding>
+										<Insets bottom="8.0" left="10.0" right="8.0" top="8.0" />
+									</padding>
+								</VBox>
+								<VBox fx:id="mergeInputsOverlay" prefHeight="200.0" prefWidth="100.0" visible="false" />
+							</children>
+						</StackPane>
+						<VBox fx:id="pnlSetDebug" visible="false" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+							<children>
+								<ListView fx:id="lstDebug" VBox.vgrow="ALWAYS" />
+							</children>
+						</VBox>
+					</children>
+				</AnchorPane>
+			</center>
+			<left>
+				<VBox alignment="TOP_RIGHT" styleClass="sidebar" BorderPane.alignment="TOP_RIGHT">
+					<children>
+						<ToggleButton fx:id="btnSetGeneral" alignment="CENTER_RIGHT" mnemonicParsing="false" onMouseClicked="#onSetGeneralTap" prefWidth="100.0" selected="true" style="-fx-cursor: hand;" text="General">
+							<toggleGroup>
+								<ToggleGroup fx:id="settings" />
+							</toggleGroup>
+							<VBox.margin>
+								<Insets bottom="4.0" />
+							</VBox.margin>
+							<padding>
+								<Insets bottom="3.0" left="8.0" right="8.0" top="3.0" />
+							</padding>
+						</ToggleButton>
+						<ToggleButton fx:id="btnSetPassphrase" alignment="CENTER_RIGHT" mnemonicParsing="false" onMouseClicked="#onSetPassphraseTap" prefWidth="100.0" style="-fx-cursor: hand;" text="Passphrase" toggleGroup="$settings">
+							<VBox.margin>
+								<Insets bottom="4.0" />
+							</VBox.margin>
+							<padding>
+								<Insets bottom="3.0" left="8.0" right="8.0" top="3.0" />
+							</padding>
+						</ToggleButton>
+						<ToggleButton fx:id="btnSetExport" alignment="CENTER_RIGHT" mnemonicParsing="false" onMouseClicked="#onSetExportTap" prefWidth="100.0" style="-fx-cursor: hand;" text="Import/Export" toggleGroup="$settings">
+							<VBox.margin>
+								<Insets bottom="4.0" />
+							</VBox.margin>
+							<padding>
+								<Insets bottom="3.0" left="8.0" right="8.0" top="3.0" />
+							</padding>
+						</ToggleButton>
+						<ToggleButton fx:id="btnSetDebug" alignment="CENTER_RIGHT" contentDisplay="RIGHT" mnemonicParsing="false" onMouseClicked="#onSetDebugTap" prefWidth="100.0" style="-fx-cursor: hand;" text="Debug" toggleGroup="$settings">
+							<VBox.margin>
+								<Insets bottom="4.0" />
+							</VBox.margin>
+							<padding>
+								<Insets bottom="3.0" left="8.0" right="8.0" top="3.0" />
+							</padding>
+						</ToggleButton>
+						<ToggleButton fx:id="btnSetMaintenance" alignment="CENTER_RIGHT" contentDisplay="RIGHT" mnemonicParsing="false" onMouseClicked="#onSetMaintenanceTap" prefWidth="100.0" style="-fx-cursor: hand;" text="Maintenance" toggleGroup="$settings">
+							<padding>
+								<Insets bottom="3.0" left="8.0" right="8.0" top="3.0" />
+							</padding>
+						</ToggleButton>
+						<AnchorPane VBox.vgrow="ALWAYS">
+							<children>
+								<VBox alignment="BOTTOM_CENTER" AnchorPane.bottomAnchor="1.0" AnchorPane.leftAnchor="1.0" AnchorPane.rightAnchor="1.0">
+									<children>
+										<Label prefHeight="17.0" prefWidth="95.0" stylesheets="@main.css" text="Janus Ver:" textFill="#b5b5b5">
+											<VBox.margin>
+												<Insets />
+											</VBox.margin>
+											<padding>
+												<Insets left="1.0" right="1.0" />
+											</padding>
+											<font>
+												<Font size="9.0" />
+											</font>
+										</Label>
+										<Label fx:id="txtFxVersion" prefHeight="17.0" prefWidth="95.0" textFill="#b5b5b5">
+											<VBox.margin>
+												<Insets />
+											</VBox.margin>
+											<padding>
+												<Insets left="1.0" right="1.0" />
+											</padding>
+											<font>
+												<Font size="9.0" />
+											</font>
+										</Label>
+										<Label prefHeight="17.0" prefWidth="95.0" text="Installer Ver:" textFill="#b5b5b5">
+											<padding>
+												<Insets left="1.0" right="1.0" />
+											</padding>
+											<font>
+												<Font size="9.0" />
+											</font>
+										</Label>
+										<Label fx:id="txtBootstrapVersion" prefHeight="17.0" prefWidth="95.0" textFill="#b5b5b5">
+											<padding>
+												<Insets left="1.0" right="1.0" />
+											</padding>
+											<font>
+												<Font size="9.0" />
+											</font>
+										</Label>
+										<Label prefHeight="17.0" prefWidth="95.0" text="Daemon Ver:" textFill="#b5b5b5">
+											<padding>
+												<Insets left="1.0" right="1.0" />
+											</padding>
+											<font>
+												<Font size="9.0" />
+											</font>
+										</Label>
+										<Label fx:id="txtDaemonVersion" prefHeight="17.0" prefWidth="95.0" textFill="#b5b5b5">
+											<padding>
+												<Insets left="1.0" right="1.0" />
+											</padding>
+											<font>
+												<Font size="9.0" />
+											</font>
+										</Label>
+										<Label prefHeight="17.0" prefWidth="95.0" text="Hedgehog Ver:" textFill="#b5b5b5">
+											<padding>
+												<Insets left="1.0" right="1.0" />
+											</padding>
+											<font>
+												<Font size="9.0" />
+											</font>
+										</Label>
+										<Label fx:id="txtHedgehogVersion" prefHeight="17.0" prefWidth="95.0" textFill="#b5b5b5">
+											<padding>
+												<Insets left="1.0" right="1.0" />
+											</padding>
+											<font>
+												<Font size="9.0" />
+											</font>
+										</Label>
+									</children>
+									<padding>
+										<Insets right="-1.0" />
+									</padding>
+								</VBox>
+							</children>
+						</AnchorPane>
+					</children>
+					<padding>
+						<Insets right="-1.0" />
+					</padding>
+				</VBox>
+			</left>
+		</BorderPane>
+	</children>
 </AnchorPane>
diff --git a/fx/src/test/java/org/unigrid/janus/controller/SettingsControllerTest.java b/fx/src/test/java/org/unigrid/janus/controller/SettingsControllerTest.java
index 4473e978..f7c49b2a 100644
--- a/fx/src/test/java/org/unigrid/janus/controller/SettingsControllerTest.java
+++ b/fx/src/test/java/org/unigrid/janus/controller/SettingsControllerTest.java
@@ -149,6 +149,9 @@ public void shouldSwitchTabs() {
 		robot.clickOn("#btnSetDebug");
 		verifyThat("#pnlSetDebug", isVisible());
 
+		robot.clickOn("#btnSetMaintenance");
+		verifyThat("#pnlSetMaintenance", isVisible());
+
 		robot.clickOn("#btnSetExport");
 		verifyThat("#btnSetExport", isVisible());
 

From 0fb04b1801274b5e621c054612c55ae625116b23 Mon Sep 17 00:00:00 2001
From: dekm <gevan73@gmail.com>
Date: Fri, 15 Sep 2023 23:23:59 +0200
Subject: [PATCH 10/10] updating fxml to use default instead of java 18 or 19

---
 .../src/main/resources/org/unigrid/bootstrap/debugView.fxml     | 2 +-
 fx/src/main/resources/org/unigrid/janus/view/mainWindow.fxml    | 2 +-
 fx/src/main/resources/org/unigrid/janus/view/password.fxml      | 2 +-
 fx/src/main/resources/org/unigrid/janus/view/settings.fxml      | 2 +-
 fx/src/main/resources/org/unigrid/janus/view/splashScreen.fxml  | 2 +-
 fx/src/main/resources/org/unigrid/janus/view/vote.fxml          | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/bootstrap/src/main/resources/org/unigrid/bootstrap/debugView.fxml b/bootstrap/src/main/resources/org/unigrid/bootstrap/debugView.fxml
index 4f825014..fd42e5cd 100644
--- a/bootstrap/src/main/resources/org/unigrid/bootstrap/debugView.fxml
+++ b/bootstrap/src/main/resources/org/unigrid/bootstrap/debugView.fxml
@@ -14,7 +14,7 @@
 <?import javafx.scene.layout.RowConstraints?>
 <?import javafx.scene.text.Font?>
 
-<AnchorPane maxHeight="625.0" maxWidth="714.0" minHeight="-Infinity" minWidth="-Infinity" prefHeight="516.0" prefWidth="714.0" style="-fx-background-color: linear-gradient(from 75px 75px to 200px 150px, #00001c, #000024);" styleClass="mainFxmlClass" stylesheets="@updateview.css" xmlns="http://javafx.com/javafx/18" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.unigrid.bootstrap.controller.DebugViewController">
+<AnchorPane maxHeight="625.0" maxWidth="714.0" minHeight="-Infinity" minWidth="-Infinity" prefHeight="516.0" prefWidth="714.0" style="-fx-background-color: linear-gradient(from 75px 75px to 200px 150px, #00001c, #000024);" styleClass="mainFxmlClass" stylesheets="@updateview.css" xmlns="http://javafx.com/javafx/" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.unigrid.bootstrap.controller.DebugViewController">
    <children>
       <FlowPane alignment="TOP_CENTER" columnHalignment="CENTER" layoutY="2.0" orientation="VERTICAL" prefHeight="523.0" prefWidth="657.0" rowValignment="TOP" AnchorPane.bottomAnchor="1.0" AnchorPane.leftAnchor="1.0" AnchorPane.rightAnchor="1.0" AnchorPane.topAnchor="1.0">
          <children>
diff --git a/fx/src/main/resources/org/unigrid/janus/view/mainWindow.fxml b/fx/src/main/resources/org/unigrid/janus/view/mainWindow.fxml
index 4ee1f0bd..168bf243 100644
--- a/fx/src/main/resources/org/unigrid/janus/view/mainWindow.fxml
+++ b/fx/src/main/resources/org/unigrid/janus/view/mainWindow.fxml
@@ -24,7 +24,7 @@
 <?import org.kordamp.ikonli.javafx.StackedFontIcon?>
 <?import org.unigrid.janus.view.component.WindowBarButton?>
 
-<Stage minHeight="400.0" minWidth="600.0" title="Unigrid Janus Wallet" xmlns="http://javafx.com/javafx/19" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.unigrid.janus.controller.MainWindowController">
+<Stage minHeight="400.0" minWidth="600.0" title="Unigrid Janus Wallet" xmlns="http://javafx.com/javafx/" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.unigrid.janus.controller.MainWindowController">
    <scene>
       <Scene fill="#000024" stylesheets="@main.css">
          <root>
diff --git a/fx/src/main/resources/org/unigrid/janus/view/password.fxml b/fx/src/main/resources/org/unigrid/janus/view/password.fxml
index f13176d9..61972df6 100644
--- a/fx/src/main/resources/org/unigrid/janus/view/password.fxml
+++ b/fx/src/main/resources/org/unigrid/janus/view/password.fxml
@@ -5,7 +5,7 @@
 <?import javafx.scene.layout.AnchorPane?>
 <?import javafx.scene.text.Font?>
 
-<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="200.0" prefWidth="300.0" style="-fx-background-color: linear-gradient(from 75px 75px to 200px 150px, #00001c, #000024);" xmlns="http://javafx.com/javafx/18" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.unigrid.janus.controller.WalletSetupController">
+<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="200.0" prefWidth="300.0" style="-fx-background-color: linear-gradient(from 75px 75px to 200px 150px, #00001c, #000024);" xmlns="http://javafx.com/javafx/" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.unigrid.janus.controller.WalletSetupController">
    <children>
       <Label layoutX="84.0" layoutY="21.0" style="-fx-text-fill: orange;" text="Password">
          <font>
diff --git a/fx/src/main/resources/org/unigrid/janus/view/settings.fxml b/fx/src/main/resources/org/unigrid/janus/view/settings.fxml
index c3a42692..1e350605 100644
--- a/fx/src/main/resources/org/unigrid/janus/view/settings.fxml
+++ b/fx/src/main/resources/org/unigrid/janus/view/settings.fxml
@@ -21,7 +21,7 @@
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.text.Font?>
 
-<AnchorPane prefHeight="450.0" prefWidth="700.0" style="-fx-background-color: linear-gradient(from 75px 75px to 200px 150px, #00001c, #000024);" styleClass="settings" stylesheets="@main.css" xmlns="http://javafx.com/javafx/19" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.unigrid.janus.controller.SettingsController">
+<AnchorPane prefHeight="450.0" prefWidth="700.0" style="-fx-background-color: linear-gradient(from 75px 75px to 200px 150px, #00001c, #000024);" styleClass="settings" stylesheets="@main.css" xmlns="http://javafx.com/javafx/" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.unigrid.janus.controller.SettingsController">
 	<children>
 		<BorderPane AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
 			<center>
diff --git a/fx/src/main/resources/org/unigrid/janus/view/splashScreen.fxml b/fx/src/main/resources/org/unigrid/janus/view/splashScreen.fxml
index a5d31773..97308a86 100644
--- a/fx/src/main/resources/org/unigrid/janus/view/splashScreen.fxml
+++ b/fx/src/main/resources/org/unigrid/janus/view/splashScreen.fxml
@@ -18,7 +18,7 @@
 <?import javafx.stage.Stage?>
 <?import org.kordamp.ikonli.javafx.FontIcon?>
 
-<Stage height="220.0" title="Unigrid Janus Splash Screen" xmlns="http://javafx.com/javafx/18" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.unigrid.janus.controller.SplashScreenController">
+<Stage height="220.0" title="Unigrid Janus Splash Screen" xmlns="http://javafx.com/javafx/" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.unigrid.janus.controller.SplashScreenController">
     <scene>
         <Scene>
             <root>
diff --git a/fx/src/main/resources/org/unigrid/janus/view/vote.fxml b/fx/src/main/resources/org/unigrid/janus/view/vote.fxml
index bea8a483..6d731ee6 100644
--- a/fx/src/main/resources/org/unigrid/janus/view/vote.fxml
+++ b/fx/src/main/resources/org/unigrid/janus/view/vote.fxml
@@ -10,7 +10,7 @@
 <?import javafx.scene.layout.StackPane?>
 <?import javafx.scene.text.Font?>
 
-<AnchorPane style="-fx-background-color: linear-gradient(from 75px 75px to 200px 150px, #00001c, #000024);" stylesheets="@main.css" xmlns="http://javafx.com/javafx/19" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.unigrid.janus.controller.VoteController">
+<AnchorPane style="-fx-background-color: linear-gradient(from 75px 75px to 200px 150px, #00001c, #000024);" stylesheets="@main.css" xmlns="http://javafx.com/javafx/" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.unigrid.janus.controller.VoteController">
    <children>
       <BorderPane prefHeight="200.0" prefWidth="200.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
          <top>