Mirrors
/
xmrwallet
mirror of https://github.com/m2049r/xmrwallet.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

tx details consistent with tx list (#107)

This commit is contained in:
m2049r 2017-11-01 20:33:58 +01:00 committed by GitHub
parent 4cfd166ed7
commit 7eb86ea618
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/com/m2049r/xmrwallet/TxFragment.java
View File

@ -212,18 +212,20 @@ public class TxFragment extends Fragment {
} }
String sign = (info.direction == TransactionInfo.Direction.Direction_In ? "+" : "-"); 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)) { if ((info.fee > 0)) {
String fee = Wallet.getDisplayAmount(info.fee); 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 { } else {
tvTxFee.setText(null); tvTxFee.setText(null);
tvTxFee.setVisibility(View.GONE); tvTxFee.setVisibility(View.GONE);
} }
if (info.isFailed) { if (info.isFailed) {
tvTxAmount.setText(getString(R.string.tx_list_amount_failed, Wallet.getDisplayAmount(info.amount))); tvTxAmount.setText(getString(R.string.tx_list_amount_failed, Wallet.getDisplayAmount(info.amount)));
tvTxFee.setText(getString(R.string.tx_list_failed_text)); tvTxFee.setText(getString(R.string.tx_list_failed_text));