commit bce0a702e3f6c07dbf2adafe00d2414434a39f4a parent d643b533319b56dcc01e84bd023397dcfd50c5e7 Author: Marc Stibane <marc@taler.net> Date: Wed, 5 Mar 2025 08:17:48 +0100 cleanup, -reservePub Diffstat:
4 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/TalerWallet1/Model/Model+Withdraw.swift b/TalerWallet1/Model/Model+Withdraw.swift @@ -167,9 +167,9 @@ fileprivate struct SetExchangeTOSAccepted: WalletBackendFormattedRequest { } // MARK: - struct AcceptWithdrawalResponse: Decodable { - var reservePub: String - var confirmTransferUrl: String? var transactionId: String + var confirmTransferUrl: String? +// var reservePub: String } /// A request to accept a bank-integrated withdrawl. fileprivate struct AcceptBankIntegratedWithdrawal: WalletBackendFormattedRequest { diff --git a/TalerWallet1/Views/Actions/ActionsSheet.swift b/TalerWallet1/Views/Actions/ActionsSheet.swift @@ -57,7 +57,7 @@ struct ActionsSheet: View { .multilineTextAlignment(.leading) .fixedSize(horizontal: false, vertical: true) // must set this otherwise fixedInnerHeight won't work - let title = String(localized: "LinkTitle_DEMOSHOP", defaultValue: "Spend demo money") + let buttonTitle = String(localized: "LinkTitle_DEMOSHOP", defaultValue: "Spend demo money") let shopAction = { // demoHints += 1 UIApplication.shared.open(URL(string:DEMOSHOP)!, options: [:]) @@ -68,7 +68,7 @@ struct ActionsSheet: View { let talerColor = WalletColors().talerColor ButtonIconBadge(type: .payment, foreColor: talerColor, done: false) Spacer() - Text(title) + Text(buttonTitle) Spacer() } } diff --git a/TalerWallet1/Views/Sheets/WithdrawBankIntegrated/WithdrawAcceptView.swift b/TalerWallet1/Views/Sheets/WithdrawBankIntegrated/WithdrawAcceptView.swift @@ -53,12 +53,12 @@ struct WithdrawAcceptView: View { } var body: some View { - if let exchange { + if let exchange2 = exchange { VStack { - let tosAccepted = exchange.tosStatus == .accepted + let tosAccepted = exchange2.tosStatus == .accepted if !tosAccepted { ToSButtonView(stack: stack.push(), - exchangeBaseUrl: exchange.exchangeBaseUrl, + exchangeBaseUrl: exchange2.exchangeBaseUrl, viewID: SHEET_WITHDRAW_TOS, p2p: false, acceptAction: reloadExchange) @@ -77,7 +77,7 @@ struct WithdrawAcceptView: View { topTitle: String(localized: "Chosen amount to withdraw:"), topAbbrev: String(localized: "Withdraw:", comment: "Chosen amount to withdraw:"), topAmount: raw, - noFees: exchange.noFees, + noFees: exchange2.noFees, fee: fee, feeIsNegative: true, bottomTitle: String(localized: "Amount to obtain:"), @@ -86,7 +86,7 @@ struct WithdrawAcceptView: View { large: false, pending: false, incoming: true, - baseURL: exchange.exchangeBaseUrl, + baseURL: exchange2.exchangeBaseUrl, txStateLcl: nil, // common.txState.major.localizedState summary: nil, merchant: nil, @@ -110,7 +110,7 @@ struct WithdrawAcceptView: View { if tosAccepted { let destination = WithdrawAcceptDone(stack: stack.push(), // scope: scope, - exchangeBaseUrl: exchange.exchangeBaseUrl, + exchangeBaseUrl: exchange2.exchangeBaseUrl, url: url, amountToTransfer: amountToTransfer.isZero ? nil : amountToTransfer) NavigationLink(destination: destination) { diff --git a/TalerWallet1/Views/Sheets/WithdrawBankIntegrated/WithdrawURIView.swift b/TalerWallet1/Views/Sheets/WithdrawBankIntegrated/WithdrawURIView.swift @@ -125,7 +125,7 @@ struct WithdrawURIView: View { let _ = Self._printChanges() let _ = symLog.vlog() // just to get the # to compare it with .onAppear & onDisappear #endif - if let exchange { + if let exchange2 = exchange { if let defaultBaseUrl = defaultExchangeBaseUrl ?? possibleExchanges.first?.exchangeBaseUrl { VStack { let title = String(localized: "using:", comment: "using: exchange.taler.net") @@ -145,7 +145,7 @@ struct WithdrawURIView: View { } // load defaultBaseUrl let acceptDestination = WithdrawAcceptView(stack: stack.push(), url: url, - scope: exchange.scopeInfo, + scope: exchange2.scopeInfo, amountToTransfer: $amountToTransfer, wireFee: $wireFee, exchange: $exchange) @@ -153,7 +153,7 @@ struct WithdrawURIView: View { ScrollView { let shortcutDest = WithdrawAcceptView(stack: stack.push(), url: url, - scope: exchange.scopeInfo, + scope: exchange2.scopeInfo, amountToTransfer: $amountShortcut, wireFee: $wireFee, exchange: $exchange) @@ -166,7 +166,7 @@ struct WithdrawURIView: View { : a11yLabel // TODO: input amount, then AmountInputV(stack: stack.push(), - scope: exchange.scopeInfo, + scope: exchange2.scopeInfo, amountAvailable: $amountZero, amountLabel: amountZero.isZero ? amountLabel : nil, a11yLabel: a11yLabel, @@ -186,7 +186,7 @@ struct WithdrawURIView: View { } .navigationTitle(navTitle) .task(id: controller.currencyTicker) { - currencyInfo = controller.info(for: exchange.scopeInfo, controller.currencyTicker) + currencyInfo = controller.info(for: exchange2.scopeInfo, controller.currencyTicker) } .onAppear() { symLog.log("onAppear")