commit 9a00cfc4b7c28af70b71ce92d727039dacfc8aca parent 0d07de450ece7bdf18cce09499d4da9c970ac0d4 Author: Marc Stibane <marc@taler.net> Date: Mon, 22 Jun 2026 20:06:01 +0200 cleanup / debugging Diffstat:
5 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/TalerWallet1/Controllers/Controller.swift b/TalerWallet1/Controllers/Controller.swift @@ -108,7 +108,7 @@ enum UrlCommand: String, Codable { struct ScannedURL: Identifiable { var id: String { - return url.absoluteString + url.absoluteString } var url: URL var command: UrlCommand diff --git a/TalerWallet1/Views/Balances/BalancesSectionView.swift b/TalerWallet1/Views/Balances/BalancesSectionView.swift @@ -99,7 +99,7 @@ extension BalancesSectionView: View { let _ = symLog.vlog() // just to get the # to compare it with .onAppear & onDisappear #endif let scopeInfo = balance.scopeInfo - let balanceDest = TransactionsListView(stack: stack.push("\(Self.className())()"), + let balanceDest = TransactionsListView(stack: stack.push("BalanceCellV"), scope: scopeInfo, balance: balance, selectedBalance: $selectedBalance, diff --git a/TalerWallet1/Views/Main/WalletEmptyView.swift b/TalerWallet1/Views/Main/WalletEmptyView.swift @@ -53,11 +53,12 @@ struct ProdSectionView: View { chevron.rotationEffect(.degrees((showDropdown ? -180 : 0))) .accessibilityHidden(true) } + .contentShape(.rect) // can tap in background also } .buttonStyle(.plain) if (showDropdown) { Text("Withdraw real digital cash:") .talerFont(.body) - .padding(.top, -30) + .padding(.vertical, -16) } } #if false @@ -91,6 +92,7 @@ struct ProdSectionView: View { narrow: false, disabled: disabled, aligned: .center)) + .padding(.top, -6) .padding(.bottom, 6) } // showDropdown } header: { @@ -152,7 +154,7 @@ struct WalletEmptyHeader: View { emptyView .toolbar { logoItem - ToolbarItem(placement: .primaryAction) { + ToolbarItem(placement: .primaryAction) { // Settings button Button { NotificationCenter.default.post(name: .SettingsAction, object: nil) // will trigger NavigationLink } label: { diff --git a/TalerWallet1/Views/Transactions/TransactionSummaryList.swift b/TalerWallet1/Views/Transactions/TransactionSummaryList.swift @@ -230,7 +230,11 @@ struct TransactionSummaryList: View { if let reloadedTransaction = try? await model.getTransactionById(transactionId, includeContractTerms: true, viewHandles: false) { symLog.log("reloaded \(reloadedTransaction.localizedType): \(reloadedTransaction.common.txState.major)") - withAnimation { talerTX = reloadedTransaction; viewId = UUID() } // redraw + withAnimation { + talerTX = reloadedTransaction; + scope = reloadedTransaction.common.scopes.first + viewId = UUID() // redraw + } if developerMode { if let json = try? await model.jsonTransactionById(transactionId, includeContractTerms: true, viewHandles: false) { diff --git a/TalerWallet1/Views/Transactions/TransactionsListView.swift b/TalerWallet1/Views/Transactions/TransactionsListView.swift @@ -174,7 +174,7 @@ struct TransactionsArraySection: View { Section { ForEach(transactions, id: \.self) { transaction in - let destination = TransactionSummaryList(stack: stack.push(), + let destination = TransactionSummaryList(stack: stack.push("TransactionsArraySection"), transactionId: transaction.id, talerTX: $talerTX, navTitle: nil,