From bc0284ba0be1373c5fce56e59da47c2c76dd714d Mon Sep 17 00:00:00 2001
From: chimp1984 <chimp1984@gmx.com>
Date: Thu, 6 Aug 2020 11:42:57 -0500
Subject: [PATCH] Move merit and stake column to the right

For better usability I moved the column next to the result.
---
 .../main/overlays/windows/ProposalResultsWindow.java | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/desktop/src/main/java/bisq/desktop/main/overlays/windows/ProposalResultsWindow.java b/desktop/src/main/java/bisq/desktop/main/overlays/windows/ProposalResultsWindow.java
index 4501e6051d8..f9cfc160a14 100644
--- a/desktop/src/main/java/bisq/desktop/main/overlays/windows/ProposalResultsWindow.java
+++ b/desktop/src/main/java/bisq/desktop/main/overlays/windows/ProposalResultsWindow.java
@@ -285,7 +285,7 @@ public void updateItem(final VoteListItem item, boolean empty) {
                 });
         votesTableView.getColumns().add(column);
 
-        column = new AutoTooltipTableColumn<>(Res.get("dao.results.votes.table.header.stakeAndMerit"));
+        column = new AutoTooltipTableColumn<>(Res.get("dao.results.votes.table.header.merit"));
         column.setSortable(false);
         column.setMinWidth(100);
         column.setCellValueFactory((item) -> new ReadOnlyObjectWrapper<>(item.getValue()));
@@ -299,7 +299,7 @@ public TableCell<VoteListItem, VoteListItem> call(
                             public void updateItem(final VoteListItem item, boolean empty) {
                                 super.updateItem(item, empty);
                                 if (item != null)
-                                    setText(item.getMeritAndStake());
+                                    setText(item.getMerit());
                                 else
                                     setText("");
                             }
@@ -308,7 +308,7 @@ public void updateItem(final VoteListItem item, boolean empty) {
                 });
         votesTableView.getColumns().add(column);
 
-        column = new AutoTooltipTableColumn<>(Res.get("dao.results.votes.table.header.merit"));
+        column = new AutoTooltipTableColumn<>(Res.get("dao.results.votes.table.header.stake"));
         column.setSortable(false);
         column.setMinWidth(100);
         column.setCellValueFactory((item) -> new ReadOnlyObjectWrapper<>(item.getValue()));
@@ -322,7 +322,7 @@ public TableCell<VoteListItem, VoteListItem> call(
                             public void updateItem(final VoteListItem item, boolean empty) {
                                 super.updateItem(item, empty);
                                 if (item != null)
-                                    setText(item.getMerit());
+                                    setText(item.getStake());
                                 else
                                     setText("");
                             }
@@ -331,7 +331,7 @@ public void updateItem(final VoteListItem item, boolean empty) {
                 });
         votesTableView.getColumns().add(column);
 
-        column = new AutoTooltipTableColumn<>(Res.get("dao.results.votes.table.header.stake"));
+        column = new AutoTooltipTableColumn<>(Res.get("dao.results.votes.table.header.stakeAndMerit"));
         column.setSortable(false);
         column.setMinWidth(100);
         column.setCellValueFactory((item) -> new ReadOnlyObjectWrapper<>(item.getValue()));
@@ -345,7 +345,7 @@ public TableCell<VoteListItem, VoteListItem> call(
                             public void updateItem(final VoteListItem item, boolean empty) {
                                 super.updateItem(item, empty);
                                 if (item != null)
-                                    setText(item.getStake());
+                                    setText(item.getMeritAndStake());
                                 else
                                     setText("");
                             }