From a37028b53fe0d61f3cd94e7dcd22fdad837ef8cd Mon Sep 17 00:00:00 2001 From: Craig Raw Date: Sat, 11 Jul 2020 10:03:11 +0200 Subject: [PATCH] fiat amount on send --- .../sparrow/wallet/SendController.java | 31 +++++++++++++++++++ .../sparrowwallet/sparrow/wallet/send.fxml | 3 ++ 2 files changed, 34 insertions(+) diff --git a/src/main/java/com/sparrowwallet/sparrow/wallet/SendController.java b/src/main/java/com/sparrowwallet/sparrow/wallet/SendController.java index 5dc49a08..5d82af19 100644 --- a/src/main/java/com/sparrowwallet/sparrow/wallet/SendController.java +++ b/src/main/java/com/sparrowwallet/sparrow/wallet/SendController.java @@ -6,10 +6,12 @@ import com.sparrowwallet.drongo.address.Address; import com.sparrowwallet.drongo.address.InvalidAddressException; import com.sparrowwallet.drongo.wallet.*; import com.sparrowwallet.sparrow.AppController; +import com.sparrowwallet.sparrow.CurrencyRate; import com.sparrowwallet.sparrow.EventManager; import com.sparrowwallet.sparrow.control.*; import com.sparrowwallet.sparrow.event.*; import com.sparrowwallet.sparrow.io.Config; +import com.sparrowwallet.sparrow.io.ExchangeSource; import javafx.beans.property.BooleanProperty; import javafx.beans.property.ObjectProperty; import javafx.beans.property.SimpleBooleanProperty; @@ -52,6 +54,9 @@ public class SendController extends WalletFormController implements Initializabl @FXML private ComboBox amountUnit; + @FXML + private FiatLabel fiatAmount; + @FXML private Button maxButton; @@ -94,6 +99,13 @@ public class SendController extends WalletFormController implements Initializabl utxoSelectorProperty.setValue(null); } + Long recipientValueSats = getRecipientValueSats(); + if(recipientValueSats != null) { + setFiatAmount(AppController.getFiatCurrencyExchangeRate(), recipientValueSats); + } else { + fiatAmount.setText(""); + } + updateTransaction(); } }; @@ -440,6 +452,12 @@ public class SendController extends WalletFormController implements Initializabl updateTransaction(true); } + private void setFiatAmount(CurrencyRate currencyRate, long amount) { + if(currencyRate != null && currencyRate.isAvailable()) { + fiatAmount.set(currencyRate, amount); + } + } + public void clear(ActionEvent event) { address.setText(""); label.setText(""); @@ -508,4 +526,17 @@ public class SendController extends WalletFormController implements Initializabl amountUnit.getSelectionModel().select(BitcoinUnit.BTC.equals(unit) ? 0 : 1); feeAmountUnit.getSelectionModel().select(BitcoinUnit.BTC.equals(unit) ? 0 : 1); } + + @Subscribe + public void fiatCurrencySelected(FiatCurrencySelectedEvent event) { + if(event.getExchangeSource() == ExchangeSource.NONE) { + fiatAmount.setCurrency(null); + fiatAmount.setBtcRate(0.0); + } + } + + @Subscribe + public void exchangeRatesUpdated(ExchangeRatesUpdatedEvent event) { + setFiatAmount(event.getCurrencyRate(), getRecipientValueSats()); + } } diff --git a/src/main/resources/com/sparrowwallet/sparrow/wallet/send.fxml b/src/main/resources/com/sparrowwallet/sparrow/wallet/send.fxml index 03f4c74b..fb8edfdc 100644 --- a/src/main/resources/com/sparrowwallet/sparrow/wallet/send.fxml +++ b/src/main/resources/com/sparrowwallet/sparrow/wallet/send.fxml @@ -19,6 +19,7 @@ +
@@ -54,6 +55,8 @@ + +