From ed5e5e6d47bd829ffb062f1460f86f8a0a1a842c Mon Sep 17 00:00:00 2001
From: Manfred Karrer <mk@nucleo.io>
Date: Tue, 29 Jan 2019 21:22:49 +0100
Subject: [PATCH] Fixes https://github.com/bisq-network/bisq/issues/2124

---
 .../desktop/main/dao/wallet/send/BsqSendView.java     | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/desktop/src/main/java/bisq/desktop/main/dao/wallet/send/BsqSendView.java b/desktop/src/main/java/bisq/desktop/main/dao/wallet/send/BsqSendView.java
index a10ec5fc6c7..ac137b1742e 100644
--- a/desktop/src/main/java/bisq/desktop/main/dao/wallet/send/BsqSendView.java
+++ b/desktop/src/main/java/bisq/desktop/main/dao/wallet/send/BsqSendView.java
@@ -244,6 +244,7 @@ private void addSendBsqGroup() {
                             txSize,
                             receiversAddressInputTextField.getText(),
                             bsqFormatter,
+                            btcFormatter,
                             () -> {
                                 receiversAddressInputTextField.setText("");
                                 amountInputTextField.setText("");
@@ -298,6 +299,7 @@ private void addSendBtcGroup() {
                             miningFee,
                             txSize, receiversBtcAddressInputTextField.getText(),
                             btcFormatter,
+                            btcFormatter,
                             () -> {
                                 receiversBtcAddressInputTextField.setText("");
                                 btcAmountInputTextField.setText("");
@@ -330,16 +332,17 @@ private void showTxPopup(Coin receiverAmount,
                              Transaction txWithBtcFee,
                              Coin miningFee,
                              int txSize, String address,
-                             BSFormatter formatter,
+                             BSFormatter amountFormatter, // can be BSQ or BTC formatter
+                             BSFormatter feeFormatter,
                              ResultHandler resultHandler) {
         new Popup<>().headLine(Res.get("dao.wallet.send.sendFunds.headline"))
                 .confirmation(Res.get("dao.wallet.send.sendFunds.details",
-                        formatter.formatCoinWithCode(receiverAmount),
+                        amountFormatter.formatCoinWithCode(receiverAmount),
                         address,
-                        formatter.formatCoinWithCode(miningFee),
+                        feeFormatter.formatCoinWithCode(miningFee),
                         CoinUtil.getFeePerByte(miningFee, txSize),
                         txSize / 1000d,
-                        formatter.formatCoinWithCode(receiverAmount)))
+                        amountFormatter.formatCoinWithCode(receiverAmount)))
                 .actionButtonText(Res.get("shared.yes"))
                 .onAction(() -> {
                     walletsManager.publishAndCommitBsqTx(txWithBtcFee, new TxBroadcaster.Callback() {