From af060f52e12a7e6c0cd41d23cb78449f9af072ee Mon Sep 17 00:00:00 2001 From: Alan Evans Date: Thu, 8 Apr 2021 09:45:29 -0300 Subject: [PATCH] Place fee after estimated fiat. --- .../securesms/payments/confirm/ConfirmPaymentFragment.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/payments/confirm/ConfirmPaymentFragment.java b/app/src/main/java/org/thoughtcrime/securesms/payments/confirm/ConfirmPaymentFragment.java index 68b95c67d..ea96ac47c 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/payments/confirm/ConfirmPaymentFragment.java +++ b/app/src/main/java/org/thoughtcrime/securesms/payments/confirm/ConfirmPaymentFragment.java @@ -136,13 +136,11 @@ public class ConfirmPaymentFragment extends BottomSheetDialogFragment { case NOT_SET: case SET: list.add(new ConfirmPaymentAdapter.LineItem(getToPayeeDescription(requireContext(), state), state.getAmount().toString(options))); - list.add(new ConfirmPaymentAdapter.LineItem(getString(R.string.ConfirmPayment__network_fee), state.getFee().toString(options))); - if (state.getExchange() != null) { list.add(new ConfirmPaymentAdapter.LineItem(getString(R.string.ConfirmPayment__estimated_s, state.getExchange().getCurrency().getCurrencyCode()), FiatMoneyUtil.format(getResources(), state.getExchange(), FiatMoneyUtil.formatOptions().withDisplayTime(false)))); } - + list.add(new ConfirmPaymentAdapter.LineItem(getString(R.string.ConfirmPayment__network_fee), state.getFee().toString(options))); list.add(new ConfirmPaymentAdapter.Divider()); list.add(new ConfirmPaymentAdapter.TotalLineItem(getString(R.string.ConfirmPayment__total_amount), state.getTotal().toString(options))); }