always apply tx_amount from qr code (#687)

4 years ago · e5b15b7816
parent 7206857a5b
commit e5b15b7816
1 changed files with 3 additions and 6 deletions
--- 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);
        }
    }