[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-taler-ios] 164/204: amountLabel
From: |
gnunet |
Subject: |
[taler-taler-ios] 164/204: amountLabel |
Date: |
Thu, 05 Dec 2024 23:52:12 +0100 |
This is an automated email from the git hooks/post-receive script.
marc-stibane pushed a commit to branch master
in repository taler-ios.
commit 2f9dba81a7d9300eb4b84c10e48261047ed5d1cd
Author: Marc Stibane <marc@taler.net>
AuthorDate: Mon Nov 25 20:52:41 2024 +0100
amountLabel
---
.../Sheets/WithdrawBankIntegrated/WithdrawURIView.swift | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git
a/TalerWallet1/Views/Sheets/WithdrawBankIntegrated/WithdrawURIView.swift
b/TalerWallet1/Views/Sheets/WithdrawBankIntegrated/WithdrawURIView.swift
index 8c712d0..59ff05b 100755
--- a/TalerWallet1/Views/Sheets/WithdrawBankIntegrated/WithdrawURIView.swift
+++ b/TalerWallet1/Views/Sheets/WithdrawBankIntegrated/WithdrawURIView.swift
@@ -100,6 +100,9 @@ struct WithdrawURIView: View {
amountToTransfer = amount ?? Amount.zero(currency: currency)
amountIsEditable = uriInfoResponse.editableAmount
amountAvailable = uriInfoResponse.maxAmount // may be nil
+ if let available = amountAvailable {
+ amountZero = available
+ }
wireFee = uriInfoResponse.wireFee // may be nil
let baseUrl = uriInfoResponse.defaultExchangeBaseUrl
?? uriInfoResponse.possibleExchanges[0].exchangeBaseUrl
@@ -138,12 +141,6 @@ struct WithdrawURIView: View {
.onChange(of: selectedExchange) { selected in
Task { await loadExchange(selected) }
}
- } else { // TODO: don't show exchange for global
currency
- HStack {
- Text(title)
- Text(defaultBaseUrl.trimURL)
- }
- .talerFont(.body)
} // load defaultBaseUrl
let acceptDestination = WithdrawAcceptView(stack:
stack.push(),
url: url,
@@ -163,11 +160,13 @@ struct WithdrawURIView: View {
NavLink($shortcutSelected) { shortcutDest }
NavLink($buttonSelected) { acceptDestination }
}
+ let amountLabel = minimalistic ? String(localized:
"Amount:") // maxAmount
+ : String(localized:
"Amount to withdraw:")
// TODO: input amount, then
AmountInputV(stack: stack.push(),
scope: exchange.scopeInfo,
amountAvailable: $amountZero,
- amountLabel: nil, // will use
"Available for transfer: xxx", trailing
+ amountLabel: amountZero.isZero ?
amountLabel : nil,
amountToTransfer: $amountToTransfer,
amountLastUsed: amountLastUsed,
wireFee: wireFee,
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
- [taler-taler-ios] 192/204: layout, (continued)
- [taler-taler-ios] 192/204: layout, gnunet, 2024/12/05
- [taler-taler-ios] 196/204: Nav header, gnunet, 2024/12/05
- [taler-taler-ios] 189/204: AccountPicker, gnunet, 2024/12/05
- [taler-taler-ios] 142/204: DepositAmountView, gnunet, 2024/12/05
- [taler-taler-ios] 153/204: products, gnunet, 2024/12/05
- [taler-taler-ios] 161/204: DepositWireTypesForCurrency, gnunet, 2024/12/05
- [taler-taler-ios] 150/204: layout improvement, gnunet, 2024/12/05
- [taler-taler-ios] 152/204: fix badge, gnunet, 2024/12/05
- [taler-taler-ios] 157/204: fix flicker, gnunet, 2024/12/05
- [taler-taler-ios] 198/204: BankEditView, gnunet, 2024/12/05
- [taler-taler-ios] 164/204: amountLabel,
gnunet <=
- [taler-taler-ios] 171/204: translations for GNU Taler, gnunet, 2024/12/05
- [taler-taler-ios] 175/204: layout, gnunet, 2024/12/05
- [taler-taler-ios] 177/204: common.scopes.first, gnunet, 2024/12/05
- [taler-taler-ios] 183/204: Section header, gnunet, 2024/12/05
- [taler-taler-ios] 193/204: Sound, gnunet, 2024/12/05
- [taler-taler-ios] 195/204: DepositWireTypes, gnunet, 2024/12/05
- [taler-taler-ios] 167/204: badge + a11y, gnunet, 2024/12/05
- [taler-taler-ios] 166/204: BankListView, gnunet, 2024/12/05
- [taler-taler-ios] 185/204: A11y textfield label, gnunet, 2024/12/05
- [taler-taler-ios] 187/204: A11y, gnunet, 2024/12/05