taler-ios

commit faf2a9f065e062afba8e18adb40deda745591127
parent dffd645b370c02cc3a0885f493ed00d3564d7b82
Author: Marc Stibane <marc@taler.net>
Date:   Thu, 24 Apr 2025 10:49:21 +0200

discard scope

Diffstat:
M
TalerWallet1/Views/Actions/Peer2peer/P2PSubjectV.swift
 | 
1
-
M
TalerWallet1/Views/Actions/Peer2peer/SendAmountV.swift
 | 
1
-
M
TalerWallet1/Views/Balances/BalancesListView.swift
 | 
1
-
M
TalerWallet1/Views/OIM/OIMView.swift
 | 
7
-------
M
TalerWallet1/Views/Sheets/Payment/PaymentView.swift
 | 
3
++-

5 files changed, 2 insertions(+), 11 deletions(-)
diff --git a/TalerWallet1/Views/Actions/Peer2peer/P2PSubjectV.swift b/TalerWallet1/Views/Actions/Peer2peer/P2PSubjectV.swift
@@ -181,7 +181,6 @@ struct P2PSubjectV: View {
               if #available(iOS 16.4, *) {
                 if controller.oimModeActive {
                     OIMSubjectView(stack: stack.push(),
-                                   scope: scope,
                                   amount: $amountToTransfer,
                          fwdButtonTapped: $sendOrRequest)
                     .environmentObject(NamespaceWrapper(namespace))             // keep OIMviews apart
diff --git a/TalerWallet1/Views/Actions/Peer2peer/SendAmountV.swift b/TalerWallet1/Views/Actions/Peer2peer/SendAmountV.swift
@@ -109,7 +109,6 @@ struct SendAmountV: View {
               if #available(iOS 16.4, *) {
                 if controller.oimModeActive {
                     OIMEditView(stack: stack.push(),
-                                scope: balance?.scopeInfo,
                                amount: $amountToTransfer,
                             available: $amountAvailable,
                          useAvailable: true,                                    // cannot send more than we have
diff --git a/TalerWallet1/Views/Balances/BalancesListView.swift b/TalerWallet1/Views/Balances/BalancesListView.swift
@@ -75,7 +75,6 @@ struct BalancesListView: View {
                     if controller.oimModeActive {
                         let balance = controller.balances.first
                         OIMView(stack: stack.push(),
-                                scope: balance?.scopeInfo,
                             available: balance?.available,
                        qrButtonTapped: $qrButtonTapped)
                         .environmentObject(NamespaceWrapper(namespace))         // keep OIMviews apart
diff --git a/TalerWallet1/Views/OIM/OIMView.swift b/TalerWallet1/Views/OIM/OIMView.swift
@@ -21,7 +21,6 @@ fileprivate func intValue(_ amount: Amount?) -> UInt64 {
 // MARK: -
 struct OIMnavBack<Content: View>: View {
     let stack: CallStack
-    let scope: ScopeInfo?
     let currencyName: String
     @Binding var amount: Amount
     @Binding var fwdButtonTapped: Bool
@@ -65,7 +64,6 @@ struct OIMnavBack<Content: View>: View {
 @available(iOS 16.4, *)
 struct OIMView: View {
     let stack: CallStack
-    let scope: ScopeInfo?
     let available: Amount?
 //    let decimal: Int            // 0 for ¥,HUF;   2 for $,€,£;   3 for ﷼,₯ (arabic)
     @Binding var qrButtonTapped: Bool
@@ -165,7 +163,6 @@ struct OIMView: View {
 @available(iOS 16.4, *)
 struct OIMPayView: View {
     let stack: CallStack
-    let scope: ScopeInfo?
     let amount: Amount?
 //    let decimal: Int            // 0 for ¥,HUF;   2 for $,€,£;   3 for ﷼,₯ (arabic)
 
@@ -204,7 +201,6 @@ struct OIMPayView: View {
 @available(iOS 16.4, *)
 struct OIMEditView: View {
     let stack: CallStack
-    let scope: ScopeInfo?
     @Binding var amount: Amount
     @Binding var available: Amount
     let useAvailable : Bool         // if false then we're requesting money and don't use available
@@ -235,7 +231,6 @@ struct OIMEditView: View {
         let currency = cash.currency
 
         OIMnavBack(stack: stack.push(),
-                   scope: scope,
             currencyName: currency.noteBase,
                   amount: $amount,
          fwdButtonTapped: $fwdButtonTapped
@@ -288,7 +283,6 @@ struct OIMEditView: View {
 // MARK: -
 struct OIMSubjectView: View {
     let stack: CallStack
-    let scope: ScopeInfo?
     @Binding var amount: Amount
 //    let decimal: Int            // 0 for ¥,HUF;   2 for $,€,£;   3 for ﷼,₯ (arabic)
     @Binding var fwdButtonTapped: Bool
@@ -300,7 +294,6 @@ struct OIMSubjectView: View {
         let currency = cash.currency
 
         OIMnavBack(stack: stack.push(),
-                   scope: scope,
             currencyName: currency.noteBase,
                   amount: $amount,
          fwdButtonTapped: $fwdButtonTapped
diff --git a/TalerWallet1/Views/Sheets/Payment/PaymentView.swift b/TalerWallet1/Views/Sheets/Payment/PaymentView.swift
@@ -302,7 +302,8 @@ struct PaymentView: View, Sendable {
             .overlay {
               if #available(iOS 16.4, *) {
                 if controller.oimSheetActive {
-                    OIMPayView(stack: stack.push(), scope: firstScope, amount: effective)
+                    OIMPayView(stack: stack.push(),
+                              amount: effective)
                 }
               }
             }