[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-taler-ios] 163/204: fix deposit
From: |
gnunet |
Subject: |
[taler-taler-ios] 163/204: fix deposit |
Date: |
Thu, 05 Dec 2024 23:52:11 +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 d76f313adb720e9d1c627f19b962ca707605d50f
Author: Marc Stibane <marc@taler.net>
AuthorDate: Mon Nov 25 20:50:08 2024 +0100
fix deposit
---
TalerWallet1/Views/Actions/Banking/DepositAmountView.swift | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/TalerWallet1/Views/Actions/Banking/DepositAmountView.swift
b/TalerWallet1/Views/Actions/Banking/DepositAmountView.swift
index 72ca548..0a21e46 100644
--- a/TalerWallet1/Views/Actions/Banking/DepositAmountView.swift
+++ b/TalerWallet1/Views/Actions/Banking/DepositAmountView.swift
@@ -97,8 +97,9 @@ struct DepositAmountView: View {
symLog.log("Deposit")
if let result = try? await model.createDepositGroup(paytoUri,
amount: amountToTransfer) {
symLog.log(result.transactionId)
- ViewState2.shared.popToRootView(stack.push())
+// ViewState2.shared.popToRootView(stack.push())
NotificationCenter.default.post(name: .TransactionDone,
object: nil, userInfo: nil)
+ dismissTop(stack.push())
} else {
depositStarted = false
}
@@ -115,6 +116,11 @@ struct DepositAmountView: View {
LoadingView(scopeInfo: nil, message: "Depositing...")
.navigationBarBackButtonHidden(true)
.interactiveDismissDisabled() // can only use "Done"
button to dismiss
+ .safeAreaInset(edge: .bottom) {
+ Button("Abort") { dismissTop(stack.push()) }
+ .buttonStyle(TalerButtonStyle(type: .prominent))
+ .padding(.horizontal)
+ }
} else { Group {
if let balance {
let scopeInfo = balance.scopeInfo
@@ -148,6 +154,7 @@ struct DepositAmountView: View {
.padding(4)
Button(buttonTitle(amountToTransfer)) { startDeposit() }
.buttonStyle(TalerButtonStyle(type: .prominent, disabled:
disabled || depositStarted))
+ .padding(.horizontal)
.disabled(disabled || depositStarted)
.accessibilityHint(disabled ? String(localized: "enabled when
amount is non-zero, but not higher than your available amount") : EMPTYSTRING)
} else { // no balance - Yikes
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
- [taler-taler-ios] 117/204: Transactions, (continued)
- [taler-taler-ios] 117/204: Transactions, gnunet, 2024/12/05
- [taler-taler-ios] 133/204: addGlobalCurrency, gnunet, 2024/12/05
- [taler-taler-ios] 132/204: don't reload after delete, gnunet, 2024/12/05
- [taler-taler-ios] 134/204: use addGlobalCurrency, gnunet, 2024/12/05
- [taler-taler-ios] 145/204: baseURL, gnunet, 2024/12/05
- [taler-taler-ios] 151/204: cleanup, gnunet, 2024/12/05
- [taler-taler-ios] 158/204: Logging, gnunet, 2024/12/05
- [taler-taler-ios] 140/204: wording, gnunet, 2024/12/05
- [taler-taler-ios] 154/204: show product images, gnunet, 2024/12/05
- [taler-taler-ios] 160/204: cleanup, gnunet, 2024/12/05
- [taler-taler-ios] 163/204: fix deposit,
gnunet <=
- [taler-taler-ios] 165/204: get rid of P2P, gnunet, 2024/12/05
- [taler-taler-ios] 144/204: scope from balance, gnunet, 2024/12/05
- [taler-taler-ios] 135/204: Colors, gnunet, 2024/12/05
- [taler-taler-ios] 137/204: restrictScope, gnunet, 2024/12/05
- [taler-taler-ios] 139/204: cleanup, gnunet, 2024/12/05
- [taler-taler-ios] 143/204: prepare split, gnunet, 2024/12/05
- [taler-taler-ios] 141/204: cleanup, gnunet, 2024/12/05
- [taler-taler-ios] 149/204: summary for p2p, gnunet, 2024/12/05
- [taler-taler-ios] 147/204: layout improvement, gnunet, 2024/12/05
- [taler-taler-ios] 155/204: ensure to pay only ONCE, gnunet, 2024/12/05