From 7eb86ea618ab3d1cadc9303c721228d9f6d2fdba Mon Sep 17 00:00:00 2001
From: m2049r <30435443+m2049r@users.noreply.github.com>
Date: Wed, 1 Nov 2017 20:33:58 +0100
Subject: [PATCH] tx details consistent with tx list (#107)

---
 .../main/java/com/m2049r/xmrwallet/TxFragment.java | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/com/m2049r/xmrwallet/TxFragment.java b/app/src/main/java/com/m2049r/xmrwallet/TxFragment.java
index cfaf451..d450d95 100644
--- a/app/src/main/java/com/m2049r/xmrwallet/TxFragment.java
+++ b/app/src/main/java/com/m2049r/xmrwallet/TxFragment.java
@@ -212,18 +212,20 @@ public class TxFragment extends Fragment {
         }
         String sign = (info.direction == TransactionInfo.Direction.Direction_In ? "+" : "-");
 
-        tvTxAmount.setText(sign + Wallet.getDisplayAmount(info.amount));
+        long realAmount = info.amount;
+        if (info.isPending) {
+            realAmount = realAmount - info.fee;
+        }
+        tvTxAmount.setText(sign + Wallet.getDisplayAmount(realAmount));
+
         if ((info.fee > 0)) {
             String fee = Wallet.getDisplayAmount(info.fee);
-            if (info.isPending) {
-                tvTxFee.setText(getString(R.string.tx_list_fee_pending, fee));
-            } else {
-                tvTxFee.setText(getString(R.string.tx_list_fee, fee));
-            }
+            tvTxFee.setText(getString(R.string.tx_list_fee, fee));
         } else {
             tvTxFee.setText(null);
             tvTxFee.setVisibility(View.GONE);
         }
+
         if (info.isFailed) {
             tvTxAmount.setText(getString(R.string.tx_list_amount_failed, Wallet.getDisplayAmount(info.amount)));
             tvTxFee.setText(getString(R.string.tx_list_failed_text));