aborted-credit-shows-the-whole-amount-as-fee.diff (5931B)
1 diff --git a/wallet/src/main/java/net/taler/wallet/peer/TransactionPeerPullCredit.kt b/wallet/src/main/java/net/taler/wallet/peer/TransactionPeerPullCredit.kt 2 index a329a533..3478a6aa 100644 3 --- a/wallet/src/main/java/net/taler/wallet/peer/TransactionPeerPullCredit.kt 4 +++ b/wallet/src/main/java/net/taler/wallet/peer/TransactionPeerPullCredit.kt 5 @@ -29,6 +29,7 @@ import net.taler.wallet.R 6 import net.taler.wallet.backend.TalerErrorCode.EXCHANGE_GENERIC_KYC_REQUIRED 7 import net.taler.wallet.backend.TalerErrorInfo 8 import net.taler.wallet.balances.ScopeInfo 9 +import net.taler.wallet.transactions.feeIsMeaningful 10 import net.taler.wallet.transactions.AmountType 11 import net.taler.wallet.transactions.PeerActions 12 import net.taler.wallet.transactions.PeerInfoShort 13 @@ -70,7 +71,7 @@ fun ColumnScope.TransactionPeerPullCreditComposable( 14 amountType = AmountType.Neutral, 15 ) 16 17 - if (t.amountRaw > t.amountEffective) { 18 + if (t.amountRaw > t.amountEffective && t.feeIsMeaningful) { 19 val fee = t.amountRaw - t.amountEffective 20 TransactionAmountComposable( 21 label = stringResource(id = R.string.amount_fee), 22 diff --git a/wallet/src/main/java/net/taler/wallet/peer/TransactionPeerPushCredit.kt b/wallet/src/main/java/net/taler/wallet/peer/TransactionPeerPushCredit.kt 23 index 34ab5606..3a8162aa 100644 24 --- a/wallet/src/main/java/net/taler/wallet/peer/TransactionPeerPushCredit.kt 25 +++ b/wallet/src/main/java/net/taler/wallet/peer/TransactionPeerPushCredit.kt 26 @@ -28,6 +28,7 @@ import net.taler.wallet.R 27 import net.taler.wallet.backend.TalerErrorCode.EXCHANGE_GENERIC_KYC_REQUIRED 28 import net.taler.wallet.backend.TalerErrorInfo 29 import net.taler.wallet.balances.ScopeInfo 30 +import net.taler.wallet.transactions.feeIsMeaningful 31 import net.taler.wallet.transactions.AmountType 32 import net.taler.wallet.transactions.PeerActions 33 import net.taler.wallet.transactions.PeerInfoShort 34 @@ -55,7 +56,7 @@ fun ColumnScope.TransactionPeerPushCreditComposable( 35 amountType = AmountType.Neutral, 36 ) 37 38 - if (t.amountRaw > t.amountEffective) { 39 + if (t.amountRaw > t.amountEffective && t.feeIsMeaningful) { 40 val fee = t.amountRaw - t.amountEffective 41 TransactionAmountComposable( 42 label = stringResource(id = R.string.amount_fee), 43 diff --git a/wallet/src/main/java/net/taler/wallet/refund/TransactionRefundComposable.kt b/wallet/src/main/java/net/taler/wallet/refund/TransactionRefundComposable.kt 44 index f2f408cb..743bf4f2 100644 45 --- a/wallet/src/main/java/net/taler/wallet/refund/TransactionRefundComposable.kt 46 +++ b/wallet/src/main/java/net/taler/wallet/refund/TransactionRefundComposable.kt 47 @@ -40,6 +40,7 @@ import net.taler.wallet.backend.TalerErrorCode 48 import net.taler.wallet.backend.TalerErrorInfo 49 import net.taler.wallet.balances.ScopeInfo 50 import net.taler.wallet.compose.TalerSurface 51 +import net.taler.wallet.transactions.feeIsMeaningful 52 import net.taler.wallet.transactions.AmountType 53 import net.taler.wallet.transactions.ErrorTransactionButton 54 import net.taler.wallet.transactions.TransactionAction 55 @@ -89,7 +90,7 @@ fun TransactionRefundComposable( 56 amountType = AmountType.Neutral, 57 ) 58 59 - if (t.amountRaw > t.amountEffective) { 60 + if (t.amountRaw > t.amountEffective && t.feeIsMeaningful) { 61 val fee = t.amountRaw - t.amountEffective 62 TransactionAmountComposable( 63 label = stringResource(id = R.string.amount_fee), 64 diff --git a/wallet/src/main/java/net/taler/wallet/transactions/TransactionState.kt b/wallet/src/main/java/net/taler/wallet/transactions/TransactionState.kt 65 index 906bfbd7..c55cc54f 100644 66 --- a/wallet/src/main/java/net/taler/wallet/transactions/TransactionState.kt 67 +++ b/wallet/src/main/java/net/taler/wallet/transactions/TransactionState.kt 68 @@ -185,3 +185,24 @@ object TransactionStateSerializer : KSerializer<TransactionState> { 69 }) 70 } 71 } 72 + 73 +/** 74 + * Whether the difference between a credit's raw and effective amounts is 75 + * really a fee. 76 + * 77 + * The credit screens infer the fee as `amountRaw - amountEffective`, and for a 78 + * transaction that never completed wallet-core reports an effective amount of 79 + * zero -- so the inference claims the entire amount went to fees. An aborted 80 + * €5.00 withdrawal read "Fee -€5.00 / Total €0.00" although nothing was 81 + * withdrawn and no fee was charged. 82 + */ 83 +val Transaction.feeIsMeaningful: Boolean 84 + get() = when (txState.major) { 85 + TransactionMajorState.Aborted, 86 + TransactionMajorState.Aborting, 87 + TransactionMajorState.SuspendedAborting, 88 + TransactionMajorState.Failed, 89 + TransactionMajorState.Expired, 90 + TransactionMajorState.Deleted -> false 91 + else -> true 92 + } 93 diff --git a/wallet/src/main/java/net/taler/wallet/withdraw/TransactionWithdrawalComposable.kt b/wallet/src/main/java/net/taler/wallet/withdraw/TransactionWithdrawalComposable.kt 94 index bc8bf4a4..73168e97 100644 95 --- a/wallet/src/main/java/net/taler/wallet/withdraw/TransactionWithdrawalComposable.kt 96 +++ b/wallet/src/main/java/net/taler/wallet/withdraw/TransactionWithdrawalComposable.kt 97 @@ -52,6 +52,7 @@ import net.taler.wallet.backend.TalerErrorCode 98 import net.taler.wallet.backend.TalerErrorInfo 99 import net.taler.wallet.balances.ScopeInfo 100 import net.taler.wallet.cleanExchange 101 +import net.taler.wallet.transactions.feeIsMeaningful 102 import net.taler.wallet.transactions.AmountType 103 import net.taler.wallet.transactions.ErrorTransactionButton 104 import net.taler.wallet.transactions.TransactionAction 105 @@ -168,7 +169,7 @@ fun TransactionWithdrawalComposable( 106 ) 107 } 108 109 - if (t.amountRaw > t.amountEffective) { 110 + if (t.amountRaw > t.amountEffective && t.feeIsMeaningful) { 111 val fee = t.amountRaw - t.amountEffective 112 TransactionAmountComposable( 113 label = stringResource(id = R.string.amount_fee),