From 2220769b03d2401d98f7bf08b0cd3a917d354e37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kyle=20=F0=9F=90=86?= Date: Fri, 17 Oct 2025 19:57:33 -0400 Subject: [PATCH] feat: wire up hide amounts event handlers --- .../wallet/TransactionsController.java | 9 +++++ .../sparrow/wallet/UtxosController.java | 37 +++++++++++++------ 2 files changed, 35 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/sparrowwallet/sparrow/wallet/TransactionsController.java b/src/main/java/com/sparrowwallet/sparrow/wallet/TransactionsController.java index d2d5191f..0111920d 100644 --- a/src/main/java/com/sparrowwallet/sparrow/wallet/TransactionsController.java +++ b/src/main/java/com/sparrowwallet/sparrow/wallet/TransactionsController.java @@ -195,6 +195,15 @@ public class TransactionsController extends WalletFormController implements Init fiatMempoolBalance.refresh(event.getUnitFormat()); } + @Subscribe + public void hideAmountsStatusChanged(HideAmountsStatusEvent event) { + transactionsTable.refresh(); + balance.refresh(); + mempoolBalance.refresh(); + fiatBalance.refresh(); + fiatMempoolBalance.refresh(); + } + @Subscribe public void fiatCurrencySelected(FiatCurrencySelectedEvent event) { if(event.getExchangeSource() == ExchangeSource.NONE) { diff --git a/src/main/java/com/sparrowwallet/sparrow/wallet/UtxosController.java b/src/main/java/com/sparrowwallet/sparrow/wallet/UtxosController.java index 51bf2d61..79505e54 100644 --- a/src/main/java/com/sparrowwallet/sparrow/wallet/UtxosController.java +++ b/src/main/java/com/sparrowwallet/sparrow/wallet/UtxosController.java @@ -121,18 +121,22 @@ public class UtxosController extends WalletFormController implements Initializab long selectedTotal = selectedEntries.stream().mapToLong(Entry::getValue).sum(); if(selectedTotal > 0) { - if(format == null) { - format = UnitFormat.DOT; - } - - if(unit == null || unit.equals(BitcoinUnit.AUTO)) { - unit = (selectedTotal >= BitcoinUnit.getAutoThreshold() ? BitcoinUnit.BTC : BitcoinUnit.SATOSHIS); - } - - if(unit.equals(BitcoinUnit.BTC)) { - sendSelected.setText("Send Selected (" + format.formatBtcValue(selectedTotal) + " BTC)"); + if(Config.get().isHideAmounts()) { + sendSelected.setText("Send Selected"); } else { - sendSelected.setText("Send Selected (" + format.formatSatsValue(selectedTotal) + " sats)"); + if(format == null) { + format = UnitFormat.DOT; + } + + if(unit == null || unit.equals(BitcoinUnit.AUTO)) { + unit = (selectedTotal >= BitcoinUnit.getAutoThreshold() ? BitcoinUnit.BTC : BitcoinUnit.SATOSHIS); + } + + if(unit.equals(BitcoinUnit.BTC)) { + sendSelected.setText("Send Selected (" + format.formatBtcValue(selectedTotal) + " BTC)"); + } else { + sendSelected.setText("Send Selected (" + format.formatSatsValue(selectedTotal) + " sats)"); + } } } else { sendSelected.setText("Send Selected"); @@ -270,6 +274,17 @@ public class UtxosController extends WalletFormController implements Initializab fiatMempoolBalance.refresh(event.getUnitFormat()); } + @Subscribe + public void hideAmountsStatusChanged(HideAmountsStatusEvent event) { + utxosTable.refresh(); + utxosChart.update(getWalletForm().getWalletUtxosEntry()); + balance.refresh(); + mempoolBalance.refresh(); + updateButtons(Config.get().getUnitFormat(), Config.get().getBitcoinUnit()); + fiatBalance.refresh(); + fiatMempoolBalance.refresh(); + } + @Subscribe public void walletHistoryStatus(WalletHistoryStatusEvent event) { utxosTable.updateHistoryStatus(event);