From e5b15b7816b429816f3650bf506cc58ea2a806a4 Mon Sep 17 00:00:00 2001
From: m2049r <m2049r@monerujo.io>
Date: Sun, 27 Sep 2020 11:00:57 +0200
Subject: [PATCH] always apply tx_amount from qr code (#687)

---
 .../fragment/send/SendAmountWizardFragment.java          | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendAmountWizardFragment.java b/app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendAmountWizardFragment.java
index 5cc56da..a061df4 100644
--- a/app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendAmountWizardFragment.java
+++ b/app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendAmountWizardFragment.java
@@ -148,12 +148,9 @@ public class SendAmountWizardFragment extends SendWizardFragment {
             tvFunds.setText(getString(R.string.send_available,
                     getString(R.string.unknown_amount)));
         }
-        // getNativeAmount is null if exchange is in progress
-        if ((etAmount.getNativeAmount() != null) && etAmount.getNativeAmount().isEmpty()) {
-            final BarcodeData data = sendListener.popBarcodeData();
-            if ((data != null) && (data.amount != null)) {
-                etAmount.setAmount(data.amount);
-            }
+        final BarcodeData data = sendListener.popBarcodeData();
+        if ((data != null) && (data.amount != null)) {
+            etAmount.setAmount(data.amount);
         }
     }