[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-taler-android] 01/03: [wallet] withdrawal: don't let users select
From: |
gnunet |
Subject: |
[taler-taler-android] 01/03: [wallet] withdrawal: don't let users select an exchange if there's only one |
Date: |
Tue, 20 Feb 2024 18:09:00 +0100 |
This is an automated email from the git hooks/post-receive script.
torsten-grote pushed a commit to branch master
in repository taler-android.
commit a2feeb810678de06d7de28b735987b0f55f70741
Author: Iván Ávalos <avalos@disroot.org>
AuthorDate: Wed Feb 7 14:11:43 2024 -0600
[wallet] withdrawal: don't let users select an exchange if there's only one
bug 0008300
---
.../net/taler/wallet/withdraw/PromptWithdrawFragment.kt | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git
a/wallet/src/main/java/net/taler/wallet/withdraw/PromptWithdrawFragment.kt
b/wallet/src/main/java/net/taler/wallet/withdraw/PromptWithdrawFragment.kt
index 16b956b..56f56f7 100644
--- a/wallet/src/main/java/net/taler/wallet/withdraw/PromptWithdrawFragment.kt
+++ b/wallet/src/main/java/net/taler/wallet/withdraw/PromptWithdrawFragment.kt
@@ -115,7 +115,13 @@ class PromptWithdrawFragment : Fragment() {
if (s.showImmediately.getIfNotConsumed() == true) {
findNavController().navigate(R.id.action_promptWithdraw_to_reviewExchangeTOS)
} else {
- showContent(s.amountRaw, s.amountEffective, s.exchangeBaseUrl,
s.talerWithdrawUri)
+ showContent(
+ amountRaw = s.amountRaw,
+ amountEffective = s.amountEffective,
+ exchange = s.exchangeBaseUrl,
+ uri = s.talerWithdrawUri,
+ exchanges = s.possibleExchanges,
+ )
ui.confirmWithdrawButton.apply {
text = getString(R.string.withdraw_button_tos)
setOnClickListener {
@@ -133,6 +139,7 @@ class PromptWithdrawFragment : Fragment() {
exchange = s.exchangeBaseUrl,
uri = s.talerWithdrawUri,
ageRestrictionOptions = s.ageRestrictionOptions,
+ exchanges = s.possibleExchanges,
)
ui.confirmWithdrawButton.apply {
text = getString(R.string.withdraw_button_confirm)
@@ -154,6 +161,7 @@ class PromptWithdrawFragment : Fragment() {
amountEffective: Amount,
exchange: String,
uri: String?,
+ exchanges: List<ExchangeItem> = emptyList(),
ageRestrictionOptions: List<Int>? = null,
) {
model.showProgressBar.value = false
@@ -178,7 +186,8 @@ class PromptWithdrawFragment : Fragment() {
ui.withdrawExchangeUrl.text = cleanExchange(exchange)
ui.withdrawExchangeUrl.fadeIn()
- if (uri != null) { // no Uri for manual withdrawals
+ // no Uri for manual withdrawals, no selection for single exchange
+ if (uri != null && exchanges.size > 1) {
ui.selectExchangeButton.fadeIn()
ui.selectExchangeButton.setOnClickListener {
selectExchange()
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.