Merge pull request #4402 from chimp1984/move-column-in-dao-vote-results

Move merit and stake column to the right
bisq-network · Aug 13, 2020 · 176fc23 · 176fc23
2 parents 0931792 + bc0284b
commit 176fc23
Showing 1 changed file with 6 additions and 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
@@ -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("");
                             }