Skip to content

Commit 181bb2a

Browse files
authored
remove 'revert tx' column from transactions view
1 parent a2f5421 commit 181bb2a

File tree

2 files changed

+3
-38
lines changed

2 files changed

+3
-38
lines changed

desktop/src/main/java/haveno/desktop/main/funds/transactions/TransactionsView.fxml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@
4040
<TableColumn fx:id="txFeeColumn" minWidth="110" maxWidth="110"/>
4141
<TableColumn fx:id="confidenceColumn" minWidth="70" maxWidth="130"/>
4242
<TableColumn fx:id="memoColumn" minWidth="40" maxWidth="250"/>
43-
<TableColumn fx:id="revertTxColumn" sortable="false" minWidth="110" maxWidth="110" visible="false"/>
4443
</columns>
4544
</TableView>
4645
<HBox spacing="10">

desktop/src/main/java/haveno/desktop/main/funds/transactions/TransactionsView.java

Lines changed: 3 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import com.google.inject.Inject;
2121
import com.googlecode.jcsv.writer.CSVEntryConverter;
2222
import de.jensd.fx.fontawesome.AwesomeIcon;
23-
import haveno.common.util.Utilities;
2423
import haveno.core.api.XmrConnectionService;
2524
import haveno.core.locale.Res;
2625
import haveno.core.offer.OpenOffer;
@@ -47,13 +46,11 @@
4746
import javafx.fxml.FXML;
4847
import javafx.geometry.Insets;
4948
import javafx.scene.Scene;
50-
import javafx.scene.control.Button;
5149
import javafx.scene.control.Label;
5250
import javafx.scene.control.TableCell;
5351
import javafx.scene.control.TableColumn;
5452
import javafx.scene.control.TableView;
5553
import javafx.scene.control.Tooltip;
56-
import javafx.scene.input.KeyCode;
5754
import javafx.scene.input.KeyEvent;
5855
import javafx.scene.layout.HBox;
5956
import javafx.scene.layout.Priority;
@@ -70,7 +67,7 @@ public class TransactionsView extends ActivatableView<VBox, Void> {
7067
@FXML
7168
TableView<TransactionsListItem> tableView;
7269
@FXML
73-
TableColumn<TransactionsListItem, TransactionsListItem> dateColumn, detailsColumn, addressColumn, transactionColumn, amountColumn, txFeeColumn, confidenceColumn, memoColumn, revertTxColumn;
70+
TableColumn<TransactionsListItem, TransactionsListItem> dateColumn, detailsColumn, addressColumn, transactionColumn, amountColumn, txFeeColumn, confidenceColumn, memoColumn;
7471
@FXML
7572
Label numItems;
7673
@FXML
@@ -137,7 +134,6 @@ public void initialize() {
137134
txFeeColumn.setGraphic(new AutoTooltipLabel(Res.get("shared.txFee", Res.getBaseCurrencyCode())));
138135
confidenceColumn.setGraphic(new AutoTooltipLabel(Res.get("shared.confirmations", Res.getBaseCurrencyCode())));
139136
memoColumn.setGraphic(new AutoTooltipLabel(Res.get("funds.tx.memo")));
140-
revertTxColumn.setGraphic(new AutoTooltipLabel(Res.get("shared.revert", Res.getBaseCurrencyCode())));
141137

142138
tableView.setColumnResizePolicy(TableView.CONSTRAINED_RESIZE_POLICY_FLEX_LAST_COLUMN);
143139
tableView.setPlaceholder(new AutoTooltipLabel(Res.get("funds.tx.noTxAvailable")));
@@ -151,7 +147,6 @@ public void initialize() {
151147
setTxFeeColumnCellFactory();
152148
setConfidenceColumnCellFactory();
153149
setMemoColumnCellFactory();
154-
setRevertTxColumnCellFactory();
155150

156151
dateColumn.setComparator(Comparator.comparing(TransactionsListItem::getDate));
157152
detailsColumn.setComparator((o1, o2) -> {
@@ -170,10 +165,7 @@ public void initialize() {
170165
tableView.getSortOrder().add(dateColumn);
171166

172167
keyEventEventHandler = event -> {
173-
// Not intended to be public to users as the feature is not well tested
174-
if (Utilities.isAltOrCtrlPressed(KeyCode.R, event)) {
175-
revertTxColumn.setVisible(!revertTxColumn.isVisible());
176-
}
168+
// unused
177169
};
178170

179171
HBox.setHgrow(spacer, Priority.ALWAYS);
@@ -204,7 +196,7 @@ protected void activate() {
204196
numItems.setText(Res.get("shared.numItemsLabel", sortedDisplayedTransactions.size()));
205197
exportButton.setOnAction(event -> {
206198
final ObservableList<TableColumn<TransactionsListItem, ?>> tableColumns = GUIUtil.getContentColumns(tableView);
207-
final int reportColumns = tableColumns.size() - 1; // CSV report excludes the last column (an icon)
199+
final int reportColumns = tableColumns.size();
208200
CSVEntryConverter<TransactionsListItem> headerConverter = item -> {
209201
String[] columns = new String[reportColumns];
210202
for (int i = 0; i < columns.length; i++)
@@ -501,31 +493,5 @@ public void updateItem(final TransactionsListItem item, boolean empty) {
501493
}
502494
});
503495
}
504-
505-
private void setRevertTxColumnCellFactory() {
506-
revertTxColumn.setCellValueFactory((addressListItem) ->
507-
new ReadOnlyObjectWrapper<>(addressListItem.getValue()));
508-
revertTxColumn.setCellFactory(
509-
new Callback<>() {
510-
511-
@Override
512-
public TableCell<TransactionsListItem, TransactionsListItem> call(TableColumn<TransactionsListItem,
513-
TransactionsListItem> column) {
514-
return new TableCell<>() {
515-
Button button;
516-
517-
@Override
518-
public void updateItem(final TransactionsListItem item, boolean empty) {
519-
super.updateItem(item, empty);
520-
setGraphic(null);
521-
if (button != null) {
522-
button.setOnAction(null);
523-
button = null;
524-
}
525-
}
526-
};
527-
}
528-
});
529-
}
530496
}
531497

0 commit comments

Comments
 (0)