taler-ios

commit 085b089f4fd3d63c162e5d3b6f1d0bb675406a81
parent fe00a3cf63abeb0cc7429327e3257b992f9bf597
Author: Marc Stibane <marc@taler.net>
Date:   Sat, 19 Oct 2024 17:16:42 +0200

scope from balance

Diffstat:
M
TalerWallet1/Views/Actions/Banking/ManualWithdraw.swift
 | 
1
+
M
TalerWallet1/Views/Actions/Banking/ManualWithdrawDone.swift
 | 
15
+++++++++------

2 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/TalerWallet1/Views/Actions/Banking/ManualWithdraw.swift b/TalerWallet1/Views/Actions/Banking/ManualWithdraw.swift
@@ -63,6 +63,7 @@ struct ManualWithdraw: View {
                 ManualWithdrawDone(stack: stack.push(),
                             currencyInfo: $currencyInfo,
                                 exchange: exchange,
+                                 balance: nil,
                         amountToTransfer: amountToTransfer)
 //                           restrictAge: restrictAge)
             }
diff --git a/TalerWallet1/Views/Actions/Banking/ManualWithdrawDone.swift b/TalerWallet1/Views/Actions/Banking/ManualWithdrawDone.swift
@@ -14,7 +14,8 @@ struct ManualWithdrawDone: View {
     let stack: CallStack
     @Binding var currencyInfo: CurrencyInfo
 
-    let exchange: Exchange
+    let exchange: Exchange?
+    let balance: Balance?
     let amountToTransfer: Amount
 //    let restrictAge: Int?
 
@@ -34,6 +35,7 @@ struct ManualWithdrawDone: View {
         let _ = Self._printChanges()
         let _ = symLog.vlog()       // just to get the # to compare it with .onAppear & onDisappear
 #endif
+        let baseURL = balance?.scopeInfo.url ?? exchange?.exchangeBaseUrl ?? EMPTYSTRING
         Group {
             if let transactionId {
                 TransactionSummaryV(stack: stack.push(),
@@ -56,17 +58,17 @@ struct ManualWithdrawDone: View {
                             .padding(.horizontal)
                 }
             } else {
-                LoadingView(scopeInfo: nil, message: exchange.exchangeBaseUrl.trimURL)
+                LoadingView(scopeInfo: nil, message: baseURL.trimURL)
             }
         }.onAppear() {
             symLog.log("onAppear")
             DebugViewC.shared.setViewID(VIEW_WITHDRAW_ACCEPT, stack: stack.push())
         }.task {
             if transactionId == nil {
-                if let result = try? await model.sendAcceptManualWithdrawalM(exchange.exchangeBaseUrl,
-                                                                             amount: amountToTransfer, restrictAge: 0) {
-                    transactionId = result.transactionId
-                }
+                if let result = try? await model.sendAcceptManualWithdrawalM(baseURL,
+                                                                     amount: amountToTransfer,
+                                                                restrictAge: 0)
+                { transactionId = result.transactionId }
             }
         }
     }
@@ -93,6 +95,7 @@ fileprivate struct ManualWithdrawDone_Previews: PreviewProvider {
         ManualWithdrawDone(stack: CallStack("Preview"),
                     currencyInfo: $currencyInfoD,
                         exchange: exchange,
+                         balance: nil,
                 amountToTransfer: amountToTransfer)
     }
 }