From f9b0d8b2f414036cd9e8d35cc5dc13c8d662300c Mon Sep 17 00:00:00 2001 From: Kyle Santiago Date: Tue, 4 Nov 2025 16:31:37 -0500 Subject: [PATCH] fix: address PR review feedback --- .../sparrowwallet/sparrow/AppController.java | 17 ---------------- .../sparrow/control/CoinAxisFormatter.java | 1 + .../sparrow/control/CoinCell.java | 20 +++++++++---------- .../sparrow/control/CoinLabel.java | 6 +++++- .../sparrow/control/FiatLabel.java | 3 ++- .../sparrow/control/TransactionDiagram.java | 3 ++- .../com/sparrowwallet/sparrow/app.fxml | 7 +------ 7 files changed, 21 insertions(+), 36 deletions(-) diff --git a/src/main/java/com/sparrowwallet/sparrow/AppController.java b/src/main/java/com/sparrowwallet/sparrow/AppController.java index c068eb1c..150260f6 100644 --- a/src/main/java/com/sparrowwallet/sparrow/AppController.java +++ b/src/main/java/com/sparrowwallet/sparrow/AppController.java @@ -152,9 +152,6 @@ public class AppController implements Initializable { @FXML private CheckMenuItem hideAmounts; - @FXML - private ToggleButton hideAmountsToggle; - @FXML private CheckMenuItem useHdCameraResolution; private static final BooleanProperty useHdCameraResolutionProperty = new SimpleBooleanProperty(); @@ -391,10 +388,6 @@ public class AppController implements Initializable { hideEmptyUsedAddressesProperty.set(Config.get().isHideEmptyUsedAddresses()); hideEmptyUsedAddresses.selectedProperty().bindBidirectional(hideEmptyUsedAddressesProperty); hideAmounts.setSelected(Config.get().isHideAmounts()); - hideAmountsToggle.setSelected(Config.get().isHideAmounts()); - Glyph eyeGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.EYE); - Glyph eyeSlashGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.EYE_SLASH); - hideAmountsToggle.setGraphic(Config.get().isHideAmounts() ? eyeSlashGlyph : eyeGlyph); useHdCameraResolutionProperty.set(Config.get().getWebcamResolution() == null || Config.get().getWebcamResolution().isWidescreenAspect()); useHdCameraResolution.selectedProperty().bindBidirectional(useHdCameraResolutionProperty); mirrorCameraImageProperty.set(Config.get().isMirrorCapture()); @@ -964,11 +957,6 @@ public class AppController implements Initializable { EventManager.get().post(new HideAmountsStatusEvent(item.isSelected())); } - public void toggleHideAmounts(ActionEvent event) { - boolean hideAmounts = hideAmountsToggle.isSelected(); - Config.get().setHideAmounts(hideAmounts); - EventManager.get().post(new HideAmountsStatusEvent(hideAmounts)); - } public void useHdCameraResolution(ActionEvent event) { CheckMenuItem item = (CheckMenuItem)event.getSource(); @@ -3150,11 +3138,6 @@ public class AppController implements Initializable { @Subscribe public void hideAmountsStatusChanged(HideAmountsStatusEvent event) { hideAmounts.setSelected(event.isHideAmounts()); - hideAmountsToggle.setSelected(event.isHideAmounts()); - Glyph glyph = event.isHideAmounts() ? - new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.EYE_SLASH) : - new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.EYE); - hideAmountsToggle.setGraphic(glyph); } @Subscribe diff --git a/src/main/java/com/sparrowwallet/sparrow/control/CoinAxisFormatter.java b/src/main/java/com/sparrowwallet/sparrow/control/CoinAxisFormatter.java index a1109842..48a5f254 100644 --- a/src/main/java/com/sparrowwallet/sparrow/control/CoinAxisFormatter.java +++ b/src/main/java/com/sparrowwallet/sparrow/control/CoinAxisFormatter.java @@ -22,6 +22,7 @@ final class CoinAxisFormatter extends StringConverter { if(Config.get().isHideAmounts()) { return ""; } + Double value = bitcoinUnit.getValue(object.longValue()); return new CoinTextFormatter(unitFormat).getCoinFormat().format(value); } diff --git a/src/main/java/com/sparrowwallet/sparrow/control/CoinCell.java b/src/main/java/com/sparrowwallet/sparrow/control/CoinCell.java index 285fed4e..2c78def5 100644 --- a/src/main/java/com/sparrowwallet/sparrow/control/CoinCell.java +++ b/src/main/java/com/sparrowwallet/sparrow/control/CoinCell.java @@ -50,19 +50,19 @@ class CoinCell extends TreeTableCell implements ConfirmationsList Entry entry = getTreeTableView().getTreeItem(getIndex()).getValue(); EntryCell.applyRowStyles(this, entry); + CoinTreeTable coinTreeTable = (CoinTreeTable)getTreeTableView(); + UnitFormat format = coinTreeTable.getUnitFormat(); + BitcoinUnit unit = coinTreeTable.getBitcoinUnit(); + + String satsValue = format.formatSatsValue(amount.longValue()); + DecimalFormat decimalFormat = (amount.longValue() == 0L ? format.getBtcFormat() : format.getTableBtcFormat()); + final String btcValue = decimalFormat.format(amount.doubleValue() / Transaction.SATOSHIS_PER_BITCOIN); + if(Config.get().isHideAmounts()) { - setText("*****"); + setText(CoinLabel.HIDDEN_AMOUNT_TEXT); setTooltip(null); setContextMenu(null); } else { - CoinTreeTable coinTreeTable = (CoinTreeTable)getTreeTableView(); - UnitFormat format = coinTreeTable.getUnitFormat(); - BitcoinUnit unit = coinTreeTable.getBitcoinUnit(); - - String satsValue = format.formatSatsValue(amount.longValue()); - DecimalFormat decimalFormat = (amount.longValue() == 0L ? format.getBtcFormat() : format.getTableBtcFormat()); - final String btcValue = decimalFormat.format(amount.doubleValue() / Transaction.SATOSHIS_PER_BITCOIN); - if(unit.equals(BitcoinUnit.BTC)) { tooltip.setValue(satsValue + " " + BitcoinUnit.SATOSHIS.getLabel()); setText(btcValue); @@ -100,7 +100,7 @@ class CoinCell extends TreeTableCell implements ConfirmationsList setGraphic(node); setContentDisplay(ContentDisplay.RIGHT); - if(((HashIndexEntry) entry).getType() == HashIndexEntry.Type.INPUT) { + if(((HashIndexEntry) entry).getType() == HashIndexEntry.Type.INPUT && !Config.get().isHideAmounts()) { setText("-" + getText()); } } else { diff --git a/src/main/java/com/sparrowwallet/sparrow/control/CoinLabel.java b/src/main/java/com/sparrowwallet/sparrow/control/CoinLabel.java index d7944f35..bb9c4219 100644 --- a/src/main/java/com/sparrowwallet/sparrow/control/CoinLabel.java +++ b/src/main/java/com/sparrowwallet/sparrow/control/CoinLabel.java @@ -13,6 +13,8 @@ import javafx.scene.input.Clipboard; import javafx.scene.input.ClipboardContent; public class CoinLabel extends Label { + public static final String HIDDEN_AMOUNT_TEXT = "\u2022\u2022\u2022\u2022\u2022"; + private final LongProperty valueProperty = new SimpleLongProperty(-1); private final Tooltip tooltip; private final CoinContextMenu contextMenu; @@ -50,12 +52,14 @@ public class CoinLabel extends Label { private void setValueAsText(Long value, BitcoinUnit bitcoinUnit) { if(Config.get().isHideAmounts()) { - setText("*****"); + setText(HIDDEN_AMOUNT_TEXT); setTooltip(null); setContextMenu(null); return; } + + setTooltip(tooltip); setContextMenu(contextMenu); diff --git a/src/main/java/com/sparrowwallet/sparrow/control/FiatLabel.java b/src/main/java/com/sparrowwallet/sparrow/control/FiatLabel.java index 5d2e1f54..e710b88d 100644 --- a/src/main/java/com/sparrowwallet/sparrow/control/FiatLabel.java +++ b/src/main/java/com/sparrowwallet/sparrow/control/FiatLabel.java @@ -91,11 +91,12 @@ public class FiatLabel extends CopyableLabel { private void setValueAsText(long balance, UnitFormat unitFormat) { if(getCurrency() != null && getBtcRate() > 0.0) { if(Config.get().isHideAmounts()) { - setText("*****"); + setText(CoinLabel.HIDDEN_AMOUNT_TEXT); setTooltip(null); setContextMenu(null); return; } + BigDecimal satsBalance = BigDecimal.valueOf(balance); BigDecimal btcBalance = satsBalance.divide(BigDecimal.valueOf(Transaction.SATOSHIS_PER_BITCOIN)); BigDecimal fiatBalance = btcBalance.multiply(BigDecimal.valueOf(getBtcRate())); diff --git a/src/main/java/com/sparrowwallet/sparrow/control/TransactionDiagram.java b/src/main/java/com/sparrowwallet/sparrow/control/TransactionDiagram.java index a137d93c..fe974fe8 100644 --- a/src/main/java/com/sparrowwallet/sparrow/control/TransactionDiagram.java +++ b/src/main/java/com/sparrowwallet/sparrow/control/TransactionDiagram.java @@ -577,8 +577,9 @@ public class TransactionDiagram extends GridPane { String getSatsValue(long amount) { if(Config.get().isHideAmounts()) { - return "*****"; + return CoinLabel.HIDDEN_AMOUNT_TEXT; } + UnitFormat format = Config.get().getUnitFormat() == null ? UnitFormat.DOT : Config.get().getUnitFormat(); return format.formatSatsValue(amount); } diff --git a/src/main/resources/com/sparrowwallet/sparrow/app.fxml b/src/main/resources/com/sparrowwallet/sparrow/app.fxml index e09d64af..97433c70 100644 --- a/src/main/resources/com/sparrowwallet/sparrow/app.fxml +++ b/src/main/resources/com/sparrowwallet/sparrow/app.fxml @@ -120,7 +120,7 @@ - + @@ -175,11 +175,6 @@ - - - - -