From f3bc342c50cbda13b4469bfa1925fe57510c4a68 Mon Sep 17 00:00:00 2001 From: Paul Goldschmidt Date: Mon, 17 Feb 2025 17:03:48 +0100 Subject: [PATCH 1/4] Update ENGAGEHF/Dashboard/Messages/MessageRow.swift Co-authored-by: Paul Schmiedmayer --- ENGAGEHF/Dashboard/Messages/MessageRow.swift | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ENGAGEHF/Dashboard/Messages/MessageRow.swift b/ENGAGEHF/Dashboard/Messages/MessageRow.swift index 75347619..9762068f 100644 --- a/ENGAGEHF/Dashboard/Messages/MessageRow.swift +++ b/ENGAGEHF/Dashboard/Messages/MessageRow.swift @@ -66,12 +66,12 @@ struct MessageRow: View { .font(.caption) .foregroundStyle(.secondary) } - .padding(.vertical, 4) - .padding(.horizontal, 8) - .background { - Capsule() - .fill(.secondary.opacity(0.1)) - } + .padding(.vertical, 4) + .padding(.horizontal, 8) + .background { + Capsule() + .fill(.secondary.opacity(0.1)) + } } private var processingStateText: String { From d3e4ebdb340c9fdada0e84f3d568f2024e4f3b13 Mon Sep 17 00:00:00 2001 From: Paul Goldschmidt Date: Mon, 17 Feb 2025 17:04:03 +0100 Subject: [PATCH 2/4] Update ENGAGEHF/Managers/MessageManager/Message.swift Co-authored-by: Paul Schmiedmayer --- ENGAGEHF/Managers/MessageManager/Message.swift | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/ENGAGEHF/Managers/MessageManager/Message.swift b/ENGAGEHF/Managers/MessageManager/Message.swift index e2431ae2..5766bb70 100644 --- a/ENGAGEHF/Managers/MessageManager/Message.swift +++ b/ENGAGEHF/Managers/MessageManager/Message.swift @@ -26,10 +26,7 @@ struct Message: Identifiable, Equatable { var processingState: ProcessingState? var isProcessing: Bool { - guard let processingState else { - return false - } - return processingState.isStillProcessing + processingState.isStillProcessing ?? false } func isRelatedTo(_ state: ProcessingState) -> Bool { From 8e2ab27bfb95abb007af5c60ba73567dc6701913 Mon Sep 17 00:00:00 2001 From: Paul Goldschmidt Date: Mon, 17 Feb 2025 17:04:48 +0100 Subject: [PATCH 3/4] Indentation fix Co-authored-by: Paul Schmiedmayer --- ENGAGEHF/Dashboard/Messages/MessageRow.swift | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/ENGAGEHF/Dashboard/Messages/MessageRow.swift b/ENGAGEHF/Dashboard/Messages/MessageRow.swift index 9762068f..a08a9447 100644 --- a/ENGAGEHF/Dashboard/Messages/MessageRow.swift +++ b/ENGAGEHF/Dashboard/Messages/MessageRow.swift @@ -135,18 +135,18 @@ struct MessageRow: View { .frame(width: 38) mainContent } - .padding(2) - .asButton { - if message.action != .unknown && !message.isProcessing { - Task { - let didPerformAction = await navigationManager.execute(message.action) - if message.isDismissible, didPerformAction { - await messageManager.dismiss(message, didPerformAction: didPerformAction) + .padding(2) + .asButton { + if message.action != .unknown && !message.isProcessing { + Task { + let didPerformAction = await navigationManager.execute(message.action) + if message.isDismissible, didPerformAction { + await messageManager.dismiss(message, didPerformAction: didPerformAction) + } } } } - } - .disabled(message.isProcessing) + .disabled(message.isProcessing) } } From 18caaff99600b232a1fc5397e160d4bed7e9e573 Mon Sep 17 00:00:00 2001 From: Paul Goldschmidt Date: Mon, 17 Feb 2025 17:05:50 +0100 Subject: [PATCH 4/4] Update ENGAGEHF/Managers/MessageManager/ProcessingState.swift Co-authored-by: Paul Schmiedmayer --- ENGAGEHF/Managers/MessageManager/ProcessingState.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ENGAGEHF/Managers/MessageManager/ProcessingState.swift b/ENGAGEHF/Managers/MessageManager/ProcessingState.swift index ee4711cc..62c7e282 100644 --- a/ENGAGEHF/Managers/MessageManager/ProcessingState.swift +++ b/ENGAGEHF/Managers/MessageManager/ProcessingState.swift @@ -28,6 +28,6 @@ struct ProcessingState: Equatable { let correlationId: String var isStillProcessing: Bool { - Date().timeIntervalSince(startTime) < 60 + .now.timeIntervalSince(startTime) < 60 } }