[taler-taler-ios] 60/69: P2P Expiration Timestamp

[gnunet]

This is an automated email from the git hooks/post-receive script.

marc-stibane pushed a commit to branch master
in repository taler-ios.

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

    P2P Expiration Timestamp
---
 TalerWallet1/Views/Sheets/P2P_Sheets/P2pPayURIView.swift     | 8 ++++++++
 TalerWallet1/Views/Sheets/P2P_Sheets/P2pReceiveURIView.swift | 8 ++++++++
 TalerWallet1/Views/Transactions/TransactionDetailView.swift  | 8 ++++++++
 3 files changed, 24 insertions(+)

diff --git a/TalerWallet1/Views/Sheets/P2P_Sheets/P2pPayURIView.swift 
b/TalerWallet1/Views/Sheets/P2P_Sheets/P2pPayURIView.swift
index 415c9ed..3b64c21 100644
--- 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
index 5e97857..f810da7 100644
--- 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
index 4bd1ef8..4375754 100644
--- 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 {

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.