From 81853300771c80c12d28df51388aa6b2d5eeb0d4 Mon Sep 17 00:00:00 2001 From: Iván Ávalos Date: Wed, 28 Feb 2024 13:24:51 -0600 Subject: [wallet] More logical order of amounts bug 0008542 --- .../net/taler/wallet/deposit/MakeDepositComposable.kt | 10 +++------- .../taler/wallet/deposit/TransactionDepositComposable.kt | 16 ++++++++++------ .../taler/wallet/payment/TransactionPaymentComposable.kt | 16 +++++++++++----- .../net/taler/wallet/peer/TransactionPeerPullCredit.kt | 14 +++++++------- .../net/taler/wallet/peer/TransactionPeerPullDebit.kt | 13 ++++++++----- .../net/taler/wallet/peer/TransactionPeerPushCredit.kt | 13 ++++++++----- .../net/taler/wallet/peer/TransactionPeerPushDebit.kt | 12 ++++++------ 7 files changed, 53 insertions(+), 41 deletions(-) (limited to 'wallet/src/main/java/net/taler') diff --git a/wallet/src/main/java/net/taler/wallet/deposit/MakeDepositComposable.kt b/wallet/src/main/java/net/taler/wallet/deposit/MakeDepositComposable.kt index 2fc4d55..97e2eb0 100644 --- a/wallet/src/main/java/net/taler/wallet/deposit/MakeDepositComposable.kt +++ b/wallet/src/main/java/net/taler/wallet/deposit/MakeDepositComposable.kt @@ -123,12 +123,8 @@ fun MakeDepositComposable( } ) TransactionAmountComposable( - label = if (state.effectiveDepositAmount == null) { - stringResource(R.string.amount_chosen) - } else { - stringResource(R.string.send_deposit_amount_effective) - }, - amount = state.effectiveDepositAmount ?: amount, + label = stringResource(R.string.amount_chosen), + amount = amount, amountType = Positive, ) AnimatedVisibility(visible = state.showFees) { @@ -148,7 +144,7 @@ fun MakeDepositComposable( TransactionAmountComposable( label = stringResource(R.string.send_amount), - amount = totalAmount, + amount = effectiveAmount, amountType = Positive, ) } diff --git a/wallet/src/main/java/net/taler/wallet/deposit/TransactionDepositComposable.kt b/wallet/src/main/java/net/taler/wallet/deposit/TransactionDepositComposable.kt index 1d5c91e..026ab05 100644 --- a/wallet/src/main/java/net/taler/wallet/deposit/TransactionDepositComposable.kt +++ b/wallet/src/main/java/net/taler/wallet/deposit/TransactionDepositComposable.kt @@ -68,16 +68,13 @@ fun TransactionDepositComposable( text = t.timestamp.ms.toAbsoluteTime(context).toString(), style = MaterialTheme.typography.bodyLarge, ) + TransactionAmountComposable( - label = stringResource(id = R.string.transaction_paid), - amount = t.amountEffective, - amountType = AmountType.Negative, - ) - TransactionAmountComposable( - label = stringResource(id = R.string.transaction_order_total), + label = stringResource(id = R.string.amount_chosen), amount = t.amountRaw, amountType = AmountType.Neutral, ) + val fee = t.amountEffective - t.amountRaw if (!fee.isZero()) { TransactionAmountComposable( @@ -86,6 +83,13 @@ fun TransactionDepositComposable( amountType = AmountType.Negative, ) } + + TransactionAmountComposable( + label = stringResource(id = R.string.send_peer_payment_amount_sent), + amount = t.amountEffective, + amountType = AmountType.Negative, + ) + TransitionsComposable(t, devMode, onTransition) if (devMode && t.error != null) { ErrorTransactionButton(error = t.error) diff --git a/wallet/src/main/java/net/taler/wallet/payment/TransactionPaymentComposable.kt b/wallet/src/main/java/net/taler/wallet/payment/TransactionPaymentComposable.kt index 7de16b6..5bbbd97 100644 --- a/wallet/src/main/java/net/taler/wallet/payment/TransactionPaymentComposable.kt +++ b/wallet/src/main/java/net/taler/wallet/payment/TransactionPaymentComposable.kt @@ -73,16 +73,13 @@ fun TransactionPaymentComposable( text = t.timestamp.ms.toAbsoluteTime(context).toString(), style = MaterialTheme.typography.bodyLarge, ) - TransactionAmountComposable( - label = stringResource(id = R.string.transaction_paid), - amount = t.amountEffective, - amountType = AmountType.Negative, - ) + TransactionAmountComposable( label = stringResource(id = R.string.transaction_order_total), amount = t.amountRaw, amountType = AmountType.Neutral, ) + val fee = t.amountEffective - t.amountRaw if (!fee.isZero()) { TransactionAmountComposable( @@ -91,15 +88,24 @@ fun TransactionPaymentComposable( amountType = AmountType.Negative, ) } + + TransactionAmountComposable( + label = stringResource(id = R.string.transaction_paid), + amount = t.amountEffective, + amountType = AmountType.Negative, + ) + if (t.posConfirmation != null) { TransactionInfoComposable( label = stringResource(id = R.string.payment_confirmation_code), info = t.posConfirmation, ) } + PurchaseDetails(info = t.info) { onFulfill(t.info.fulfillmentUrl ?: "") } + TransitionsComposable(t, devMode, onTransition) if (devMode && t.error != null) { ErrorTransactionButton(error = t.error) diff --git a/wallet/src/main/java/net/taler/wallet/peer/TransactionPeerPullCredit.kt b/wallet/src/main/java/net/taler/wallet/peer/TransactionPeerPullCredit.kt index de377fc..cc8bfa3 100644 --- a/wallet/src/main/java/net/taler/wallet/peer/TransactionPeerPullCredit.kt +++ b/wallet/src/main/java/net/taler/wallet/peer/TransactionPeerPullCredit.kt @@ -46,13 +46,7 @@ fun ColumnScope.TransactionPeerPullCreditComposable(t: TransactionPeerPullCredit state = t.txState, talerUri = t.talerUri, ) - - TransactionAmountComposable( - label = stringResource(id = R.string.receive_amount), - amount = t.amountEffective, - amountType = AmountType.Positive, - ) - + TransactionAmountComposable( label = stringResource(id = R.string.amount_chosen), amount = t.amountRaw, @@ -68,6 +62,12 @@ fun ColumnScope.TransactionPeerPullCreditComposable(t: TransactionPeerPullCredit ) } + TransactionAmountComposable( + label = stringResource(id = R.string.receive_amount), + amount = t.amountEffective, + amountType = AmountType.Positive, + ) + TransactionInfoComposable( label = stringResource(id = R.string.send_peer_purpose), info = t.info.summary ?: "", diff --git a/wallet/src/main/java/net/taler/wallet/peer/TransactionPeerPullDebit.kt b/wallet/src/main/java/net/taler/wallet/peer/TransactionPeerPullDebit.kt index aa12a8e..783907e 100644 --- a/wallet/src/main/java/net/taler/wallet/peer/TransactionPeerPullDebit.kt +++ b/wallet/src/main/java/net/taler/wallet/peer/TransactionPeerPullDebit.kt @@ -39,16 +39,12 @@ import net.taler.wallet.transactions.TransactionState @Composable fun TransactionPeerPullDebitComposable(t: TransactionPeerPullDebit) { - TransactionAmountComposable( - label = stringResource(id = R.string.transaction_paid), - amount = t.amountEffective, - amountType = AmountType.Negative, - ) TransactionAmountComposable( label = stringResource(id = R.string.transaction_order_total), amount = t.amountRaw, amountType = AmountType.Neutral, ) + val fee = t.amountEffective - t.amountRaw if (!fee.isZero()) { TransactionAmountComposable( @@ -57,6 +53,13 @@ fun TransactionPeerPullDebitComposable(t: TransactionPeerPullDebit) { amountType = AmountType.Negative, ) } + + TransactionAmountComposable( + label = stringResource(id = R.string.transaction_paid), + amount = t.amountEffective, + amountType = AmountType.Negative, + ) + TransactionInfoComposable( label = stringResource(id = R.string.send_peer_purpose), info = t.info.summary ?: "", diff --git a/wallet/src/main/java/net/taler/wallet/peer/TransactionPeerPushCredit.kt b/wallet/src/main/java/net/taler/wallet/peer/TransactionPeerPushCredit.kt index 2c1c24c..2efa8bb 100644 --- a/wallet/src/main/java/net/taler/wallet/peer/TransactionPeerPushCredit.kt +++ b/wallet/src/main/java/net/taler/wallet/peer/TransactionPeerPushCredit.kt @@ -39,16 +39,12 @@ import net.taler.wallet.transactions.TransactionState @Composable fun TransactionPeerPushCreditComposable(t: TransactionPeerPushCredit) { - TransactionAmountComposable( - label = stringResource(id = R.string.send_peer_payment_amount_received), - amount = t.amountEffective, - amountType = AmountType.Positive, - ) TransactionAmountComposable( label = stringResource(id = R.string.send_peer_payment_amount_sent), amount = t.amountRaw, amountType = AmountType.Neutral, ) + val fee = t.amountRaw - t.amountEffective if (!fee.isZero()) { TransactionAmountComposable( @@ -57,6 +53,13 @@ fun TransactionPeerPushCreditComposable(t: TransactionPeerPushCredit) { amountType = AmountType.Negative, ) } + + TransactionAmountComposable( + label = stringResource(id = R.string.send_peer_payment_amount_received), + amount = t.amountEffective, + amountType = AmountType.Positive, + ) + TransactionInfoComposable( label = stringResource(id = R.string.send_peer_purpose), info = t.info.summary ?: "", diff --git a/wallet/src/main/java/net/taler/wallet/peer/TransactionPeerPushDebit.kt b/wallet/src/main/java/net/taler/wallet/peer/TransactionPeerPushDebit.kt index d83d8fe..909fd47 100644 --- a/wallet/src/main/java/net/taler/wallet/peer/TransactionPeerPushDebit.kt +++ b/wallet/src/main/java/net/taler/wallet/peer/TransactionPeerPushDebit.kt @@ -58,12 +58,6 @@ fun ColumnScope.TransactionPeerPushDebitComposable(t: TransactionPeerPushDebit) talerUri = t.talerUri, ) - TransactionAmountComposable( - label = stringResource(id = R.string.transaction_paid), - amount = t.amountEffective, - amountType = AmountType.Negative, - ) - TransactionAmountComposable( label = stringResource(id = R.string.transaction_order_total), amount = t.amountRaw, @@ -79,6 +73,12 @@ fun ColumnScope.TransactionPeerPushDebitComposable(t: TransactionPeerPushDebit) ) } + TransactionAmountComposable( + label = stringResource(id = R.string.transaction_paid), + amount = t.amountEffective, + amountType = AmountType.Negative, + ) + TransactionInfoComposable( label = stringResource(id = R.string.send_peer_purpose), info = t.info.summary ?: "", -- cgit v1.2.3