taler-ios

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

commit 8c369143dd001f2a181f131bbe354c275f24d39e
parent a75849a9b23042a12d4c0f28615f0e4bd1c1747d
Author: Marc Stibane <marc@taler.net>
Date:   Thu, 22 Jun 2023 17:07:14 +0200

for debugging time-outs

Diffstat:
MTalerWallet1/Views/HelperViews/SelectDays.swift | 7++++---
MTalerWallet1/Views/Peer2peer/SendNow.swift | 6++++--
Mtaler-swift/Sources/taler-swift/Time.swift | 6++++++
3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/TalerWallet1/Views/HelperViews/SelectDays.swift b/TalerWallet1/Views/HelperViews/SelectDays.swift @@ -9,6 +9,7 @@ import SymLog struct SelectDays: View { private let symLog = SymLogV(0) @Environment(\.isEnabled) private var isEnabled: Bool + @AppStorage("developerMode") var developerMode: Bool = false @Binding var selected: UInt let maxExpiration: UInt @@ -31,17 +32,17 @@ struct SelectDays: View { var body: some View { HStack { Button(action: oneDayAction) { - Text("1 Day") + Text(developerMode ? "3 Min." : "1 Day") }.buttonStyle(TalerButtonStyle(type: (selected == 1) ? .prominent : .bordered, dimmed: true)) .disabled(!isEnabled) Button(action: sevenDayAction) { - Text("7 Days") + Text(developerMode ? "1 Hour" : "7 Days") }.buttonStyle(TalerButtonStyle(type: (selected == 7) ? .prominent : .bordered, dimmed: true)) .disabled(!isEnabled || maxExpiration < 7) Button(action: thirtyDayAction) { - Text("30 Days") + Text(developerMode ? "1 Day" : "30 Days") }.buttonStyle(TalerButtonStyle(type: (selected == 30) ? .prominent : .bordered, dimmed: true)) .disabled(!isEnabled || maxExpiration < 30) } // 3 buttons diff --git a/TalerWallet1/Views/Peer2peer/SendNow.swift b/TalerWallet1/Views/Peer2peer/SendNow.swift @@ -6,9 +6,9 @@ import SwiftUI import taler_swift import SymLog - struct SendNow: View { private let symLog = SymLogV() + @AppStorage("developerMode") var developerMode: Bool = false let amountToSend: Amount? let amountToReceive: Amount? @@ -50,7 +50,9 @@ struct SendNow: View { symLog.log(".task") do { // generate talerURI - let timestamp = Timestamp.inSomeDays(expireDays) + var timestamp = developerMode ? Timestamp.inSomeMinutes(expireDays > 20 ? (24*60) + : expireDays > 5 ? 60 : 3) + : Timestamp.inSomeDays(expireDays) if let amountToSend { let terms = PeerContractTerms(amount: amountToSend, summary: summary, diff --git a/taler-swift/Sources/taler-swift/Time.swift b/taler-swift/Sources/taler-swift/Time.swift @@ -78,6 +78,12 @@ extension Timestamp { return Timestamp.milliseconds(now + (UInt64(days) * seconds * 1000)) } + public static func inSomeMinutes(_ minutes: UInt) -> Timestamp { + let now = Date().millisecondsSince1970 + let seconds: UInt64 = 60 + return Timestamp.milliseconds(now + (UInt64(minutes) * seconds * 1000)) + } + /// convenience initializer from UInt64 (milliseconds from January 1, 1970) public init(from: UInt64) {