TransactionSummaryV

10 files changed, 32 insertions, 26 deletions

diff --git a/TalerWallet.xcodeproj/project.pbxproj b/TalerWallet.xcodeproj/project.pbxproj
index dea61df..3a0ca98 100644
--- a/TalerWallet.xcodeproj/project.pbxproj
+++ b/TalerWallet.xcodeproj/project.pbxproj
@@ -89,7 +89,7 @@
 		4E3EAE5F2A990778009F1BE8 /* QRSheet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4EEC157929F9427F00D46A03 /* QRSheet.swift */; };
 		4E3EAE602A990778009F1BE8 /* P2pReceiveURIView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4E3B4BC02A41E6C200CC88B8 /* P2pReceiveURIView.swift */; };
 		4E3EAE612A990778009F1BE8 /* ListStyle.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4E6EDD862A363D8D0031D520 /* ListStyle.swift */; };
-		4E3EAE622A990778009F1BE8 /* TransactionDetailView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4EB095312989CBFE0043A8A1 /* TransactionDetailView.swift */; };
+		4E3EAE622A990778009F1BE8 /* TransactionSummaryV.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4EB095312989CBFE0043A8A1 /* TransactionSummaryV.swift */; };
 		4E3EAE632A990778009F1BE8 /* WalletCore.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4EB0951C2989CBCB0043A8A1 /* WalletCore.swift */; };
 		4E3EAE642A990778009F1BE8 /* LaunchAnimationView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4EB095432989CBFE0043A8A1 /* LaunchAnimationView.swift */; };
 		4E3EAE682A990778009F1BE8 /* WalletModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4EB095112989CBB00043A8A1 /* WalletModel.swift */; };
@@ -197,7 +197,7 @@
 		4EB095552989CBFE0043A8A1 /* PaymentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4EB0952D2989CBFE0043A8A1 /* PaymentView.swift */; };
 		4EB095562989CBFE0043A8A1 /* TransactionsListView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4EB0952F2989CBFE0043A8A1 /* TransactionsListView.swift */; };
 		4EB095572989CBFE0043A8A1 /* TransactionRowView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4EB095302989CBFE0043A8A1 /* TransactionRowView.swift */; };
-		4EB095582989CBFE0043A8A1 /* TransactionDetailView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4EB095312989CBFE0043A8A1 /* TransactionDetailView.swift */; };
+		4EB095582989CBFE0043A8A1 /* TransactionSummaryV.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4EB095312989CBFE0043A8A1 /* TransactionSummaryV.swift */; };
 		4EB095592989CBFE0043A8A1 /* Model+Transactions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4EB095322989CBFE0043A8A1 /* Model+Transactions.swift */; };
 		4EB0955A2989CBFE0043A8A1 /* URLSheet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4EB095332989CBFE0043A8A1 /* URLSheet.swift */; };
 		4EB0955C2989CBFE0043A8A1 /* BalanceRowView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4EB095362989CBFE0043A8A1 /* BalanceRowView.swift */; };
@@ -375,7 +375,7 @@
 		4EB0952D2989CBFE0043A8A1 /* PaymentView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PaymentView.swift; sourceTree = "<group>"; };
 		4EB0952F2989CBFE0043A8A1 /* TransactionsListView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TransactionsListView.swift; sourceTree = "<group>"; };
 		4EB095302989CBFE0043A8A1 /* TransactionRowView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TransactionRowView.swift; sourceTree = "<group>"; };
-		4EB095312989CBFE0043A8A1 /* TransactionDetailView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TransactionDetailView.swift; sourceTree = "<group>"; };
+		4EB095312989CBFE0043A8A1 /* TransactionSummaryV.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TransactionSummaryV.swift; sourceTree = "<group>"; };
 		4EB095322989CBFE0043A8A1 /* Model+Transactions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Model+Transactions.swift"; sourceTree = "<group>"; };
 		4EB095332989CBFE0043A8A1 /* URLSheet.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = URLSheet.swift; sourceTree = "<group>"; };
 		4EB095362989CBFE0043A8A1 /* BalanceRowView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BalanceRowView.swift; sourceTree = "<group>"; };
@@ -689,7 +689,7 @@
 			children = (
 				4EB0952F2989CBFE0043A8A1 /* TransactionsListView.swift */,
 				4EB095302989CBFE0043A8A1 /* TransactionRowView.swift */,
-				4EB095312989CBFE0043A8A1 /* TransactionDetailView.swift */,
+				4EB095312989CBFE0043A8A1 /* TransactionSummaryV.swift */,
 				4E87C8722A31CB7F001C6406 /* TransactionsEmptyView.swift */,
 				4E6EDD842A3615BE0031D520 /* ManualDetailsV.swift */,
 				4ED2F94A2A278F5100453B40 /* ThreeAmountsV.swift */,
@@ -1120,7 +1120,7 @@
 				4E3EAE5F2A990778009F1BE8 /* QRSheet.swift in Sources */,
 				4E3EAE602A990778009F1BE8 /* P2pReceiveURIView.swift in Sources */,
 				4E3EAE612A990778009F1BE8 /* ListStyle.swift in Sources */,
-				4E3EAE622A990778009F1BE8 /* TransactionDetailView.swift in Sources */,
+				4E3EAE622A990778009F1BE8 /* TransactionSummaryV.swift in Sources */,
 				4E3EAE632A990778009F1BE8 /* WalletCore.swift in Sources */,
 				4E3EAE642A990778009F1BE8 /* LaunchAnimationView.swift in Sources */,
 				E37AA62A2AF197E5003850CF /* Model+Refund.swift in Sources */,
@@ -1226,7 +1226,7 @@
 				4EEC157A29F9427F00D46A03 /* QRSheet.swift in Sources */,
 				4E3B4BC12A41E6C200CC88B8 /* P2pReceiveURIView.swift in Sources */,
 				4E6EDD872A363D8D0031D520 /* ListStyle.swift in Sources */,
-				4EB095582989CBFE0043A8A1 /* TransactionDetailView.swift in Sources */,
+				4EB095582989CBFE0043A8A1 /* TransactionSummaryV.swift in Sources */,
 				4EB095202989CBCB0043A8A1 /* WalletCore.swift in Sources */,
 				4EB095672989CBFE0043A8A1 /* LaunchAnimationView.swift in Sources */,
 				E37AA62B2AF197E5003850CF /* Model+Refund.swift in Sources */,
diff --git a/TalerWallet1/Controllers/DebugViewC.swift b/TalerWallet1/Controllers/DebugViewC.swift
index 33a15d5..046adcd 100644
--- a/TalerWallet1/Controllers/DebugViewC.swift
+++ b/TalerWallet1/Controllers/DebugViewC.swift
@@ -34,7 +34,8 @@ public let VIEW_PENDING = VIEW_ABOUT + 1                            // 15 Pendin
 
 // MARK: Transactions
 public let VIEW_TRANSACTIONLIST = VIEW_EMPTY + 10                   // 20 TransactionsListView
-public let VIEW_TRANSACTIONDETAIL = VIEW_TRANSACTIONLIST + 1        // 21 TransactionDetail
+public let VIEW_TRANSACTIONSUMMARY = VIEW_TRANSACTIONLIST + 1       // 21 TransactionSummary
+public let VIEW_TRANSACTIONDETAIL = VIEW_TRANSACTIONSUMMARY + 1     // 22 TransactionDetail
 
 
 
@@ -79,7 +80,8 @@ public let SHEET_WITHDRAW_CONFIRM = SHEET_WITHDRAW_ACCEPT + 1       // 133 waiti
 // MARK: Merchant Payment
 // openURL (Link, NFC or scan QR) ==> pays merchant
 public let SHEET_PAYMENT = SHEET_WITHDRAWAL + 10                    // 140 Pay Merchant
-public let SHEET_PAY_TEMPLATE = SHEET_PAYMENT + 2                   // 142 Pay Merchant Template
+public let SHEET_PAY_TEMPLATE = SHEET_PAYMENT + 1                   // 141 Pay Merchant Template
+public let SHEET_PAY_ACCEPT = SHEET_PAY_TEMPLATE + 1                // 142 Pay Accept
 
 // MARK: P2P Pay Invoice
 // p2p pull debit - openURL (Link or scan QR)
diff --git a/TalerWallet1/Controllers/PublicConstants.swift b/TalerWallet1/Controllers/PublicConstants.swift
index 248ce6c..04d1dfe 100644
--- a/TalerWallet1/Controllers/PublicConstants.swift
+++ b/TalerWallet1/Controllers/PublicConstants.swift
@@ -14,8 +14,8 @@ public let SEVENDAYS: UInt = 7      // 3..9
 public let THIRTYDAYS: UInt = 30    // 10..30
 
 public let EMPTYSTRING = ""                         // avoid automatic translation of empty "" textLiterals in Text()
-public let CONFIRM_BANK = "circle.fill"             // badge in PendingRow, TransactionRow and TransactionDetail
-public let NEEDS_KYC = "star.fill"                  // badge in PendingRow, TransactionRow and TransactionDetail
+public let CONFIRM_BANK = "circle.fill"             // badge in PendingRow, TransactionRow and TransactionSummary
+public let NEEDS_KYC = "star.fill"                  // badge in PendingRow, TransactionRow and TransactionSummary
 public let PENDING_INCOMING = "plus.diamond"
 public let PENDING_OUTGOING = "minus.diamond"
 public let DONE_INCOMING = "plus.circle.fill"
diff --git a/TalerWallet1/Views/Banking/ManualWithdrawDone.swift b/TalerWallet1/Views/Banking/ManualWithdrawDone.swift
index d4fa7ec..ca312e6 100644
--- a/TalerWallet1/Views/Banking/ManualWithdrawDone.swift
+++ b/TalerWallet1/Views/Banking/ManualWithdrawDone.swift
@@ -34,7 +34,7 @@ struct ManualWithdrawDone: View {
 #endif
         Group {
             if let transactionId {
-                TransactionDetailView(stack: stack.push(),
+                TransactionSummaryV(stack: stack.push(),
                               transactionId: transactionId,
                                reloadAction: reloadOneAction,
                                    navTitle: navTitle,
diff --git a/TalerWallet1/Views/Peer2peer/P2PReadyV.swift b/TalerWallet1/Views/Peer2peer/P2PReadyV.swift
index e155bd8..a81e76a 100644
--- a/TalerWallet1/Views/Peer2peer/P2PReadyV.swift
+++ b/TalerWallet1/Views/Peer2peer/P2PReadyV.swift
@@ -38,7 +38,7 @@ struct P2PReadyV: View {
 #endif
         Group {
             if let transactionId {
-                TransactionDetailView(stack: stack.push(),
+                TransactionSummaryV(stack: stack.push(),
                               transactionId: transactionId,
                                reloadAction: reloadOneAction,
                                    navTitle: navTitle,
@@ -80,7 +80,7 @@ struct P2PReadyV: View {
                                         purse_expiration: timestamp)
                     // TODO: let user choose baseURL
                     let response = try await model.initiatePeerPushDebitM(nil, terms: terms)
-                    // will switch from WithdrawProgressView to TransactionDetailView
+                    // will switch from WithdrawProgressView to TransactionSummaryV
                     transactionId = response.transactionId
                 } else {
                     let terms = PeerContractTerms(amount: amountToTransfer,
@@ -88,7 +88,7 @@ struct P2PReadyV: View {
                                         purse_expiration: timestamp)
                     // TODO: let user choose baseURL
                     let response = try await model.initiatePeerPullCreditM(nil, terms: terms)
-                    // will switch from WithdrawProgressView to TransactionDetailView
+                    // will switch from WithdrawProgressView to TransactionSummaryV
                     transactionId = response.transactionId
                 }
             } catch {    // TODO: error
diff --git a/TalerWallet1/Views/Sheets/P2P_Sheets/P2pAcceptDone.swift b/TalerWallet1/Views/Sheets/P2P_Sheets/P2pAcceptDone.swift
index 51cd0d4..0d45f8d 100644
--- a/TalerWallet1/Views/Sheets/P2P_Sheets/P2pAcceptDone.swift
+++ b/TalerWallet1/Views/Sheets/P2P_Sheets/P2pAcceptDone.swift
@@ -33,7 +33,7 @@ struct P2pAcceptDone: View {
 #endif
         let navTitle = incoming ? String(localized: "Received P2P", comment: "Title, short")
                                 : String(localized: "Paid P2P", comment: "Title, short")
-        TransactionDetailView(stack: stack.push(),
+        TransactionSummaryV(stack: stack.push(),
                       transactionId: transactionId,
                        reloadAction: reloadOneAction,
                            navTitle: navTitle,
diff --git a/TalerWallet1/Views/Sheets/Refund/RefundURIView.swift b/TalerWallet1/Views/Sheets/Refund/RefundURIView.swift
index 66d1870..1580d93 100644
--- a/TalerWallet1/Views/Sheets/Refund/RefundURIView.swift
+++ b/TalerWallet1/Views/Sheets/Refund/RefundURIView.swift
@@ -23,7 +23,7 @@ struct RefundURIView: View {
 
     var body: some View {
         if let refundTransactionId {
-            TransactionDetailView(stack: stack.push(),
+            TransactionSummaryV(stack: stack.push(),
                           transactionId: refundTransactionId,
                            reloadAction: reloadOneAction,
                                navTitle: nil,   // navTitle,
diff --git a/TalerWallet1/Views/Sheets/WithdrawBankIntegrated/WithdrawAcceptDone.swift b/TalerWallet1/Views/Sheets/WithdrawBankIntegrated/WithdrawAcceptDone.swift
index a15ebd3..b10d0c0 100644
--- a/TalerWallet1/Views/Sheets/WithdrawBankIntegrated/WithdrawAcceptDone.swift
+++ b/TalerWallet1/Views/Sheets/WithdrawBankIntegrated/WithdrawAcceptDone.swift
@@ -33,7 +33,7 @@ struct WithdrawAcceptDone: View {
 #endif
         Group {
             if let transactionId {
-                TransactionDetailView(stack: stack.push(),
+                TransactionSummaryV(stack: stack.push(),
                               transactionId: transactionId,
                                reloadAction: reloadOneAction,
                                    navTitle: navTitle,
diff --git a/TalerWallet1/Views/Transactions/TransactionDetailView.swift b/TalerWallet1/Views/Transactions/TransactionSummaryV.swift
index 162cfb7..38bb311 100644
--- a/TalerWallet1/Views/Transactions/TransactionDetailView.swift
+++ b/TalerWallet1/Views/Transactions/TransactionSummaryV.swift
@@ -21,7 +21,7 @@ extension Transaction {             // for Dummys
     }
 }
 // MARK: -
-struct TransactionDetailView: View {
+struct TransactionSummaryV: View {
     private let symLog = SymLogV(0)
     let stack: CallStack
     let transactionId: String
@@ -185,7 +185,7 @@ struct TransactionDetailView: View {
         }
         .onAppear {
             symLog.log("onAppear")
-            DebugViewC.shared.setViewID(VIEW_TRANSACTIONDETAIL, stack: stack.push())
+            DebugViewC.shared.setViewID(VIEW_TRANSACTIONSUMMARY, stack: stack.push())
         }
         .onDisappear {
             symLog.log("onDisappear")
@@ -193,7 +193,7 @@ struct TransactionDetailView: View {
     }
 //}
 //
-//extension TransactionDetail {
+//extension TransactionSummaryV {
     struct KycButton: View {
         let destination: URL
         @AppStorage("iconOnly") var iconOnly: Bool = false
@@ -276,8 +276,12 @@ struct TransactionDetailView: View {
                     }
                     case .payment(let paymentTransaction): Group {
                         let details = paymentTransaction.details
-                        Text(details.info.summary)
-                            .accessibilityFont(.title3)
+                        NavigationLink(destination: LazyView {
+                            LoadingView(url: nil, message: "Details")
+                        }) {
+                            Text("Show details")
+                        }
+//                        .buttonStyle(TalerButtonStyle(type: .bordered))
                         ThreeAmountsSheet(common: common, topAbbrev: String(localized: "Pay:"),
                                         topTitle: String(localized: "Sum to be paid:"),
                                           baseURL: nil, large: true, summary: details.info.summary)     // TODO: baseURL
@@ -374,7 +378,7 @@ struct TransactionDetailView: View {
 }
 // MARK: -
 #if DEBUG
-//struct TransactionDetail_Previews: PreviewProvider {
+//struct TransactionSummary_Previews: PreviewProvider {
 //    static func deleteTransactionDummy(transactionId: String) async throws {}
 //    static func doneActionDummy() {}
 //    static var withdrawal = Transaction(incoming: true,
@@ -388,8 +392,8 @@ struct TransactionDetailView: View {
 //    static func reloadActionDummy(transactionId: String) async -> Transaction { return withdrawal }
 //    static var previews: some View {
 //        Group {
-//            TransactionDetailView(transaction: withdrawal, reloadAction: reloadActionDummy, doneAction: doneActionDummy)
-//            TransactionDetailView(transaction: payment, reloadAction: reloadActionDummy, deleteAction: deleteTransactionDummy)
+//            TransactionSummaryV(transaction: withdrawal, reloadAction: reloadActionDummy, doneAction: doneActionDummy)
+//            TransactionSummaryV(transaction: payment, reloadAction: reloadActionDummy, deleteAction: deleteTransactionDummy)
 //        }
 //    }
 //}
diff --git a/TalerWallet1/Views/Transactions/TransactionsListView.swift b/TalerWallet1/Views/Transactions/TransactionsListView.swift
index 7614fe5..9a61683 100644
--- a/TalerWallet1/Views/Transactions/TransactionsListView.swift
+++ b/TalerWallet1/Views/Transactions/TransactionsListView.swift
@@ -99,7 +99,7 @@ struct TransactionsArraySliceV: View {
         ForEach(Array(zip(transactions.indices, transactions)), id: \.1) { index, transaction in
             NavigationLink {
                 LazyView {
-                    TransactionDetailView(stack: stack.push(),
+                    TransactionSummaryV(stack: stack.push(),
                                   transactionId: transaction.id,
                                    reloadAction: reloadOneAction,
                                        navTitle: nil,