diff --git a/app/src/main/java/net/mynero/wallet/fragment/send/SendFragment.java b/app/src/main/java/net/mynero/wallet/fragment/send/SendFragment.java index 4e6f809..ea4759e 100644 --- a/app/src/main/java/net/mynero/wallet/fragment/send/SendFragment.java +++ b/app/src/main/java/net/mynero/wallet/fragment/send/SendFragment.java @@ -202,6 +202,17 @@ public class SendFragment extends Fragment { return true; } + private boolean destsHasPaymentId() { + List> dests = getRawDests(); + for(Pair dest : dests) { + String address = dest.component1(); + UriData uriData = UriData.parse(address); + if(uriData == null) return false; + if(uriData.hasPaymentId()) return true; + } + return false; + } + private void bindObservers() { mViewModel.sendingMax.observe(getViewLifecycleOwner(), sendingMax -> { if (mViewModel.pendingTransaction.getValue() == null) { @@ -216,7 +227,7 @@ public class SendFragment extends Fragment { }); mViewModel.showAddOutputButton.observe(getViewLifecycleOwner(), show -> { - setAddOutputButtonVisibility(show ? View.VISIBLE : View.INVISIBLE); + setAddOutputButtonVisibility((show && !destsHasPaymentId()) ? View.VISIBLE : View.INVISIBLE); }); mViewModel.pendingTransaction.observe(getViewLifecycleOwner(), pendingTx -> {