From ed9f66148cf461259a3cfa2b48e94ad88e367528 Mon Sep 17 00:00:00 2001
From: Garth Vander Houwen <garthvh@yahoo.com>
Date: Fri, 30 Dec 2022 17:24:01 -0800
Subject: [PATCH] Use ack errors for admin message log

---
 Meshtastic/Views/Messages/ChannelMessageList.swift | 4 ++--
 Meshtastic/Views/Messages/UserMessageList.swift    | 6 +++---
 Meshtastic/Views/Settings/AdminMessageList.swift   | 7 ++++---
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/Meshtastic/Views/Messages/ChannelMessageList.swift b/Meshtastic/Views/Messages/ChannelMessageList.swift
index 732ea084..707abee1 100644
--- a/Meshtastic/Views/Messages/ChannelMessageList.swift
+++ b/Meshtastic/Views/Messages/ChannelMessageList.swift
@@ -120,7 +120,7 @@ struct ChannelMessageList: View {
 													Text("waiting")
 												} else if currentUser && message.ackError > 0 {
 													let ackErrorVal = RoutingError(rawValue: Int(message.ackError))
-													Text("\(ackErrorVal?.display ?? "No Error" )").fixedSize(horizontal: false, vertical: true)
+													Text("\(ackErrorVal?.display ?? "Empty Ack Error")").fixedSize(horizontal: false, vertical: true)
 												}
 												if currentUser {
 													VStack {
@@ -184,7 +184,7 @@ struct ChannelMessageList: View {
 											Text("Waiting to be acknowledged. . .").font(.caption2).foregroundColor(.orange)
 										} else if currentUser && message.ackError > 0 {
 											let ackErrorVal = RoutingError(rawValue: Int(message.ackError))
-											Text("\(ackErrorVal?.display ?? "No Error" )").fixedSize(horizontal: false, vertical: true)
+											Text("\(ackErrorVal?.display ?? "Empty Ack Error")").fixedSize(horizontal: false, vertical: true)
 												.font(.caption2).foregroundColor(.red)
 										}
 									}
diff --git a/Meshtastic/Views/Messages/UserMessageList.swift b/Meshtastic/Views/Messages/UserMessageList.swift
index 6eb04a9e..027971cc 100644
--- a/Meshtastic/Views/Messages/UserMessageList.swift
+++ b/Meshtastic/Views/Messages/UserMessageList.swift
@@ -123,7 +123,7 @@ struct UserMessageList: View {
 														Text("waiting")
 													} else if currentUser && message.ackError > 0 {
 														let ackErrorVal = RoutingError(rawValue: Int(message.ackError))
-														Text("\(ackErrorVal?.display ?? "No Error" )").fixedSize(horizontal: false, vertical: true)
+														Text("\(ackErrorVal?.display ?? "Empty Ack Error")").fixedSize(horizontal: false, vertical: true)
 													}
 													if currentUser {
 														VStack {
@@ -182,12 +182,12 @@ struct UserMessageList: View {
 											let ackErrorVal = RoutingError(rawValue: Int(message.ackError))
 											if currentUser && message.receivedACK {
 												// Ack Received
-												Text("\(ackErrorVal?.display ?? "No Error" )").font(.caption2).foregroundColor(message.realACK ? .gray : .orange)
+												Text("\(ackErrorVal?.display ?? "Empty Ack Error")").font(.caption2).foregroundColor(message.realACK ? .gray : .orange)
 											} else if currentUser && message.ackError == 0 {
 												// Empty Error
 												Text("Waiting to be acknowledged. . .").font(.caption2).foregroundColor(.orange)
 											} else if currentUser && message.ackError > 0 {
-												Text("\(ackErrorVal?.display ?? "No Error" )").fixedSize(horizontal: false, vertical: true)
+												Text("\(ackErrorVal?.display ?? "Empty Ack Error")").fixedSize(horizontal: false, vertical: true)
 													.font(.caption2).foregroundColor(.red)
 											}
 										}
diff --git a/Meshtastic/Views/Settings/AdminMessageList.swift b/Meshtastic/Views/Settings/AdminMessageList.swift
index 3de6324e..28a1d719 100644
--- a/Meshtastic/Views/Settings/AdminMessageList.swift
+++ b/Meshtastic/Views/Settings/AdminMessageList.swift
@@ -37,15 +37,16 @@ struct AdminMessageList: View {
 							Image(systemName: "checkmark.square")
 								.foregroundColor(.gray)
 								.font(.caption)
-							Text("Acknowledged: \(Date(timeIntervalSince1970: TimeInterval(am.ackTimestamp)).formattedDate(format: "h:mm:ss a"))")
+							Text("acknowledged: \(Date(timeIntervalSince1970: TimeInterval(am.ackTimestamp)).formattedDate(format: "h:mm:ss a"))")
 								.foregroundColor(.gray)
 								.font(.caption)
 
 						} else {
+							let ackErrorVal = RoutingError(rawValue: Int(am.ackError))
 							Image(systemName: "square")
 								.foregroundColor(.gray)
 								.font(.caption)
-							Text("Not Acknowledged")
+							Text(ackErrorVal?.display ?? "Empty Ack Error")
 								.foregroundColor(.gray)
 								.font(.caption)
 						}
@@ -53,7 +54,7 @@ struct AdminMessageList: View {
 				}
 			}
 		}
-		.navigationTitle("Admin Message Log")
+		.navigationTitle("admin.log")
 		.navigationBarItems(trailing:
 
 			ZStack {