taler-android

Android apps for GNU Taler (wallet, PoS, cashier)
Log | Files | Refs | README | LICENSE

commit 29c72ecc95276a9ed4fc564fe224a05a04b717ea
parent c787d6067671746b86566bbcca8a1155835157c7
Author: Iván Ávalos <avalos@disroot.org>
Date:   Fri,  5 Dec 2025 15:56:17 +0100

[wallet] improve p2p confirm button labels

Diffstat:
Mwallet/src/main/java/net/taler/wallet/peer/OutgoingPullComposable.kt | 3++-
Mwallet/src/main/java/net/taler/wallet/peer/OutgoingPushComposable.kt | 3++-
Mwallet/src/main/res/values/strings.xml | 2++
3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/wallet/src/main/java/net/taler/wallet/peer/OutgoingPullComposable.kt b/wallet/src/main/java/net/taler/wallet/peer/OutgoingPullComposable.kt @@ -271,7 +271,8 @@ fun OutgoingPullComposable( if (checkResult != null && checkResult?.tosStatus != ExchangeTosStatus.Accepted) { Text(text = stringResource(R.string.exchange_tos_view)) } else { - Text(text = stringResource(R.string.receive_peer_create_button)) + Text(text = stringResource(R.string.receive_peer_create_button_amount, + amount.amount.withSpec(selectedSpec))) } } } diff --git a/wallet/src/main/java/net/taler/wallet/peer/OutgoingPushComposable.kt b/wallet/src/main/java/net/taler/wallet/peer/OutgoingPushComposable.kt @@ -293,7 +293,8 @@ fun OutgoingPushIntroComposable( enabled = feeResult is Success && !amount.amount.isZero() && subject.isNotBlank(), onClick = { onSend(amount, subject, hours) }, ) { - Text(text = stringResource(R.string.send_peer_create_button)) + Text(text = stringResource(R.string.send_peer_create_button_amount, + amount.amount.withSpec(selectedSpec))) } } } diff --git a/wallet/src/main/res/values/strings.xml b/wallet/src/main/res/values/strings.xml @@ -277,6 +277,7 @@ GNU Taler is immune to many types of fraud such as credit card data theft, phish <string name="receive_peer">Request money from another wallet</string> <string name="receive_peer_create_button">Create request</string> + <string name="receive_peer_create_button_amount">Request %1$s</string> <string name="receive_peer_invoice_uri">Alternatively, copy and send this URI:</string> <string name="receive_peer_payment_instruction">Scan this QR code to pay %1$s</string> <string name="receive_peer_payment_intro">Do you want to receive this payment?</string> @@ -323,6 +324,7 @@ GNU Taler is immune to many types of fraud such as credit card data theft, phish <string name="send_deposit_title">Deposit to bank account</string> <string name="send_deposit_no_alias">No alias</string> <string name="send_peer_create_button">Send funds now</string> + <string name="send_peer_create_button_amount">Send %1$s</string> <string name="send_peer_expiration_1d">1 day</string> <string name="send_peer_expiration_30d">30 days</string> <string name="send_peer_expiration_7d">1 week</string>