[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-taler-ios] 63/204: amount too small is no error
From: |
gnunet |
Subject: |
[taler-taler-ios] 63/204: amount too small is no error |
Date: |
Thu, 05 Dec 2024 23:50:31 +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 63150d4080b73b92bc1b8da96fa6fb7639213d3f
Author: Marc Stibane <marc@taler.net>
AuthorDate: Mon Oct 14 23:08:12 2024 +0200
amount too small is no error
---
TalerWallet1/Views/Banking/QuiteSomeCoins.swift | 2 +-
TalerWallet1/Views/HelperViews/AmountInputV.swift | 6 ++----
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/TalerWallet1/Views/Banking/QuiteSomeCoins.swift
b/TalerWallet1/Views/Banking/QuiteSomeCoins.swift
index f737795..5b51493 100644
--- a/TalerWallet1/Views/Banking/QuiteSomeCoins.swift
+++ b/TalerWallet1/Views/Banking/QuiteSomeCoins.swift
@@ -71,7 +71,7 @@ struct QuiteSomeCoins: View {
let feeIsNegative: Bool
var body: some View {
- let isError = coinData.invalid || coinData.tooMany
+ let isError = coinData.tooMany // || coinData.invalid
let showFee = shouldShowFee && !isError
if showFee {
if let fee = coinData.fee {
diff --git a/TalerWallet1/Views/HelperViews/AmountInputV.swift
b/TalerWallet1/Views/HelperViews/AmountInputV.swift
index a7ef22e..b2fdfed 100644
--- a/TalerWallet1/Views/HelperViews/AmountInputV.swift
+++ b/TalerWallet1/Views/HelperViews/AmountInputV.swift
@@ -34,7 +34,7 @@ struct AmountInputV: View {
let stack: CallStack
@Binding var currencyInfo: CurrencyInfo
@Binding var amountAvailable: Amount
- let amountLabel: String
+ let amountLabel: String?
@Binding var amountToTransfer: Amount
let amountLastUsed: Amount
let wireFee: Amount?
@@ -86,8 +86,6 @@ struct AmountInputV: View {
var body: some View {
let currency = amountToTransfer.currencyStr
// let insufficientLabel = String(localized: "You don't have enough
\(currency).")
- let available = amountAvailable.isZero ? nil
- :
amountAvailable.formatted(currencyInfo, isNegative: false)
VStack(alignment: .trailing) {
// if summary.count > 0 {
// Text(summary)
@@ -111,7 +109,7 @@ struct AmountInputV: View {
shouldShowFee: true, // TODO: set to false if
we never charge withdrawal fees
feeIsNegative: feeIsNegative)
let flags = checkAvailable(coinData)
- Button("Next") { buttonAction() }
+ Button(coinData.invalid ? "Amount too small" : "Next") {
buttonAction() }
.buttonStyle(TalerButtonStyle(type: .prominent, disabled:
flags.disabled))
.disabled(flags.disabled)
}.padding(.horizontal)
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
- [taler-taler-ios] 35/204: layout itself, (continued)
- [taler-taler-ios] 35/204: layout itself, gnunet, 2024/12/05
- [taler-taler-ios] 38/204: hint instead of warning, gnunet, 2024/12/05
- [taler-taler-ios] 42/204: no GradientBorder, gnunet, 2024/12/05
- [taler-taler-ios] 46/204: no subject, gnunet, 2024/12/05
- [taler-taler-ios] 48/204: DragGesture, gnunet, 2024/12/05
- [taler-taler-ios] 54/204: tabBar+QR, gnunet, 2024/12/05
- [taler-taler-ios] 52/204: QRButton gets camera API, gnunet, 2024/12/05
- [taler-taler-ios] 57/204: innerSize, gnunet, 2024/12/05
- [taler-taler-ios] 58/204: ScopePicker, gnunet, 2024/12/05
- [taler-taler-ios] 62/204: a11y, gnunet, 2024/12/05
- [taler-taler-ios] 63/204: amount too small is no error,
gnunet <=
- [taler-taler-ios] 64/204: shortcuts, prep for amountLastUsed, gnunet, 2024/12/05
- [taler-taler-ios] 67/204: Simplify, gnunet, 2024/12/05
- [taler-taler-ios] 68/204: cleanup, gnunet, 2024/12/05
- [taler-taler-ios] 72/204: cleanup currencyInfo, gnunet, 2024/12/05
- [taler-taler-ios] 84/204: cleanup, gnunet, 2024/12/05
- [taler-taler-ios] 53/204: DualHeightSheet, gnunet, 2024/12/05
- [taler-taler-ios] 71/204: pickerStyle, gnunet, 2024/12/05
- [taler-taler-ios] 70/204: Reorg, gnunet, 2024/12/05
- [taler-taler-ios] 69/204: Reorg, gnunet, 2024/12/05
- [taler-taler-ios] 73/204: Published balances, gnunet, 2024/12/05