taler-ios

commit 62578f675fbb9a56574b58313b6dd72a021a721f
parent c7058325aa7cb097ea208c758c46929c335ec3b1
Author: Marc Stibane <marc@taler.net>
Date:   Thu, 18 Jan 2024 01:09:25 +0100

P2P Expiration Timestamp

Diffstat:
M
TalerWallet1/Views/Sheets/P2P_Sheets/P2pPayURIView.swift
 | 
8
++++++++
M
TalerWallet1/Views/Sheets/P2P_Sheets/P2pReceiveURIView.swift
 | 
8
++++++++
M
TalerWallet1/Views/Transactions/TransactionDetailView.swift
 | 
8
++++++++

3 files changed, 24 insertions(+), 0 deletions(-)
diff --git a/TalerWallet1/Views/Sheets/P2P_Sheets/P2pPayURIView.swift b/TalerWallet1/Views/Sheets/P2P_Sheets/P2pPayURIView.swift
@@ -39,6 +39,14 @@ struct P2pPayURIView: View {
                                    baseURL: nil,
                                     status: nil,
                                    summary: peerPullDebitResponse.contractTerms.summary)
+                    let expiration = peerPullDebitResponse.contractTerms.purse_expiration
+                    let (dateString, date) = TalerDater.dateString(from: expiration)
+                    let accessibilityDate = TalerDater.accessibilityDate(date) ?? dateString
+                    let accessibilityLabel = String(localized: "Expires: \(accessibilityDate)")
+                    Text("Expires: \(dateString)")
+                        .accessibilityFont(.body)
+                        .accessibilityLabel(accessibilityLabel)
+//                        .foregroundColor(colorSchemeContrast == .increased ? .primary : .secondary)
                 }
                 .listStyle(myListStyle.style).anyView
                 .navigationTitle(navTitle)
diff --git a/TalerWallet1/Views/Sheets/P2P_Sheets/P2pReceiveURIView.swift b/TalerWallet1/Views/Sheets/P2P_Sheets/P2pReceiveURIView.swift
@@ -47,6 +47,14 @@ struct P2pReceiveURIView: View {
                                    baseURL: nil,
                                     status: nil,
                                    summary: peerPushCreditResponse.contractTerms.summary)
+                    let expiration = peerPushCreditResponse.contractTerms.purse_expiration
+                    let (dateString, date) = TalerDater.dateString(from: expiration)
+                    let accessibilityDate = TalerDater.accessibilityDate(date) ?? dateString
+                    let accessibilityLabel = String(localized: "Expires: \(accessibilityDate)")
+                    Text("Expires: \(dateString)")
+                        .accessibilityFont(.body)
+                        .accessibilityLabel(accessibilityLabel)
+//                        .foregroundColor(colorSchemeContrast == .increased ? .primary : .secondary)
                 }
                 .listStyle(myListStyle.style).anyView
                 .navigationTitle(navTitle)
diff --git a/TalerWallet1/Views/Transactions/TransactionDetailView.swift b/TalerWallet1/Views/Transactions/TransactionDetailView.swift
@@ -309,6 +309,14 @@ struct TransactionDetailView: View {
                     }
                     case .peer2peer(let p2pTransaction): Group {
                         let details = p2pTransaction.details
+                        let expiration = details.info.expiration
+                        let (dateString, date) = TalerDater.dateString(from: expiration)
+                        let accessibilityDate = TalerDater.accessibilityDate(date) ?? dateString
+                        let accessibilityLabel = String(localized: "Expires: \(accessibilityDate)")
+                        Text("Expires: \(dateString)")
+                            .accessibilityFont(.body)
+                            .accessibilityLabel(accessibilityLabel)
+//                        .foregroundColor(colorSchemeContrast == .increased ? .primary : .secondary)
                         // TODO: isSendCoins should show QR only while not yet expired  - either set timer or wallet-core should do so and send a state-changed notification
                         if pending {
                             if transaction.isPendingReady {