taler-ios

commit 6d37d33a2758b55af0d8bfab07a676d1bfba9c9b
parent 8bb4c549a98f961df46eba67a825d6962adf66fa
Author: Marc Stibane <marc@taler.net>
Date:   Sun, 13 Apr 2025 09:56:45 +0200

fwdButtonTapped

Diffstat:
M
TalerWallet1/Views/Actions/Peer2peer/P2PSubjectV.swift
 | 
2
+-
M
TalerWallet1/Views/Actions/Peer2peer/SendAmountV.swift
 | 
3
++-
M
TalerWallet1/Views/OIM/OIMView.swift
 | 
12
++++++------

3 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/TalerWallet1/Views/Actions/Peer2peer/P2PSubjectV.swift b/TalerWallet1/Views/Actions/Peer2peer/P2PSubjectV.swift
@@ -182,7 +182,7 @@ struct P2PSubjectV: View {
                     OIMSubjectView(stack: stack.push(),
                                    scope: scope,
                                   amount: $amountToTransfer,
-                          buttonSelected: $sendOrRequest)
+                         fwdButtonTapped: $sendOrRequest)
                     .environmentObject(NamespaceWrapper(namespace))             // keep OIMviews apart
                 }
             }
diff --git a/TalerWallet1/Views/Actions/Peer2peer/SendAmountV.swift b/TalerWallet1/Views/Actions/Peer2peer/SendAmountV.swift
@@ -111,7 +111,8 @@ struct SendAmountV: View {
                                 scope: balance?.scopeInfo,
                                amount: $amountToTransfer,
                             available: $amountAvailable,
-                       buttonSelected: $buttonSelected)
+//                         useAvailable: true,                                    // cannot send more than we have
+                      fwdButtonTapped: $buttonSelected)
                     .environmentObject(NamespaceWrapper(namespace))             // keep OIMviews apart
                 }
             }
diff --git a/TalerWallet1/Views/OIM/OIMView.swift b/TalerWallet1/Views/OIM/OIMView.swift
@@ -24,7 +24,7 @@ struct OIMnavBack<Content: View>: View {
     let scope: ScopeInfo?
     let currencyName: String
     @Binding var amount: Amount
-    @Binding var buttonSelected: Bool
+    @Binding var fwdButtonTapped: Bool
     var content: () -> Content
 
     @Environment(\.dismiss) var dismiss     // call dismiss() to pop back
@@ -42,7 +42,7 @@ struct OIMnavBack<Content: View>: View {
                         Spacer()
                         let inset = UIScreen.horzInsets
                         ForwardButton(enabled: !amount.isZero) {
-                            buttonSelected = true
+                            fwdButtonTapped = true
                         }.padding(.trailing, inset > 0 ? inset - 12 : 0)
                     }
                 }
@@ -146,7 +146,7 @@ struct OIMEditView: View {
     @Binding var amount: Amount
     @Binding var available: Amount
 //    let decimal: Int            // 0 for ¥,HUF;   2 for $,€,£;   3 for ﷼,₯ (arabic)
-    @Binding var buttonSelected: Bool
+    @Binding var fwdButtonTapped: Bool
 
     @AppStorage("sierraLeone") var sierraLeone: Bool = false
 
@@ -166,7 +166,7 @@ struct OIMEditView: View {
                    scope: scope,
             currencyName: currency.noteBase,
                   amount: $amount,
-          buttonSelected: $buttonSelected
+         fwdButtonTapped: $fwdButtonTapped
         ) {
             ZStack {    // without this, money would fly below the scroller
               VStack {  // even though this is the only item in the ZStack
@@ -209,7 +209,7 @@ struct OIMSubjectView: View {
     let scope: ScopeInfo?
     @Binding var amount: Amount
 //    let decimal: Int            // 0 for ¥,HUF;   2 for $,€,£;   3 for ﷼,₯ (arabic)
-    @Binding var buttonSelected: Bool
+    @Binding var fwdButtonTapped: Bool
 
     @AppStorage("sierraLeone") var sierraLeone: Bool = false
 
@@ -221,7 +221,7 @@ struct OIMSubjectView: View {
                    scope: scope,
             currencyName: currency.noteBase,
                   amount: $amount,
-          buttonSelected: $buttonSelected
+         fwdButtonTapped: $fwdButtonTapped
         ) {
             VStack {
                 Spacer()