taler-ios

iOS apps for GNU Taler (wallet)
Log | Files | Refs | README | LICENSE

commit 7b974dd1a9bbeb30d0a09a6b8e5b076ef184be88
parent e6deff7bc4d6cb2a6275078a9ac325c1d5071c31
Author: Marc Stibane <marc@taler.net>
Date:   Wed, 25 Sep 2024 08:40:38 +0200

cleanup

Diffstat:
MTalerWallet1/Model/WalletModel.swift | 2+-
MTalerWallet1/Views/Balances/BalancesListView.swift | 2+-
MTalerWallet1/Views/Banking/DepositAmountV.swift | 3---
MTalerWallet1/Views/Banking/ManualWithdrawDone.swift | 2+-
MTalerWallet1/Views/Peer2peer/P2PReadyV.swift | 2+-
MTalerWallet1/Views/Sheets/Refund/RefundURIView.swift | 2+-
6 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/TalerWallet1/Model/WalletModel.swift b/TalerWallet1/Model/WalletModel.swift @@ -112,7 +112,7 @@ extension WalletModel { } /// get the specified transaction from Wallet-Core. No networking involved @MainActor func getTransactionByIdM(_ transactionId: String, viewHandles: Bool = false) - async throws -> Transaction { // M for MainActor + async throws -> Transaction { // M for MainActor return try await getTransactionByIdT(transactionId, viewHandles: viewHandles) // call GetTransactionById on main thread } } diff --git a/TalerWallet1/Views/Balances/BalancesListView.swift b/TalerWallet1/Views/Balances/BalancesListView.swift @@ -68,7 +68,7 @@ struct BalancesListView: View { } #if REFRESHABLE .refreshable { // already async - symLog?.log("refreshing balances") + symLog.log("refreshing balances") let count = await reloadBalances(stack.push("refreshing balances"), true) if let count, count > 0 { NotificationCenter.default.post(name: .BalanceReloaded, object: nil) diff --git a/TalerWallet1/Views/Banking/DepositAmountV.swift b/TalerWallet1/Views/Banking/DepositAmountV.swift @@ -85,9 +85,6 @@ struct DepositAmountV: View { LoadingView(scopeInfo: nil, message: "Depositing...") .navigationBarBackButtonHidden(true) .interactiveDismissDisabled() // can only use "Done" button to dismiss - -// ViewState2.shared.popToRootView - } else { let currency = amountToTransfer.currencyStr let currencySymbol = currencyInfo.altUnitSymbol ?? currencyInfo.specs.name diff --git a/TalerWallet1/Views/Banking/ManualWithdrawDone.swift b/TalerWallet1/Views/Banking/ManualWithdrawDone.swift @@ -51,7 +51,7 @@ struct ManualWithdrawDone: View { .interactiveDismissDisabled() // can only use "Done" button to dismiss // .navigationTitle(navTitle) .safeAreaInset(edge: .bottom) { - Button("Done", action: { dismissTop(stack.push()) } ) // ViewState.shared.popToRootView ? + Button("Done", action: { dismissTop(stack.push()) } ) .buttonStyle(TalerButtonStyle(type: .prominent)) .padding(.horizontal) } diff --git a/TalerWallet1/Views/Peer2peer/P2PReadyV.swift b/TalerWallet1/Views/Peer2peer/P2PReadyV.swift @@ -57,7 +57,7 @@ struct P2PReadyV: View { .navigationBarBackButtonHidden(true) .interactiveDismissDisabled() // can only use "Done" button to dismiss .safeAreaInset(edge: .bottom) { - Button("Done", action: { dismissTop(stack.push()) } ) // ViewState.shared.popToRootView ? + Button("Done", action: { dismissTop(stack.push()) } ) .buttonStyle(TalerButtonStyle(type: .prominent)) .padding(.horizontal) } diff --git a/TalerWallet1/Views/Sheets/Refund/RefundURIView.swift b/TalerWallet1/Views/Sheets/Refund/RefundURIView.swift @@ -45,7 +45,7 @@ struct RefundURIView: View { suspendAction: model.suspendTransaction, resumeAction: model.resumeTransaction) .safeAreaInset(edge: .bottom) { - Button("Done", action: { dismissTop(stack.push()) } ) // ViewState.shared.popToRootView ? + Button("Done", action: { dismissTop(stack.push()) } ) .buttonStyle(TalerButtonStyle(type: .prominent)) .padding(.horizontal) }