2 files changed, 18 insertions, 2 deletions
diff --git a/modern/src/common/components/PositionValue.js b/modern/src/common/components/PositionValue.js
index a851c886..27f793c6 100644
--- a/modern/src/common/components/PositionValue.js
+++ b/modern/src/common/components/PositionValue.js
@@ -24,13 +24,14 @@ const PositionValue = ({ position, property, attribute }) => {
   const altitudeUnit = useAttributePreference('altitudeUnit');
   const speedUnit = useAttributePreference('speedUnit');
   const coordinateFormat = usePreference('coordinateFormat');
+  const hours12 = usePreference('twelveHourFormat');
 
   const formatValue = () => {
     switch (key) {
       case 'fixTime':
       case 'deviceTime':
       case 'serverTime':
-        return formatTime(value);
+        return formatTime(value, 'seconds', hours12);
       case 'latitude':
         return formatCoordinate('latitude', value, coordinateFormat);
       case 'longitude':
diff --git a/modern/src/common/util/formatter.js b/modern/src/common/util/formatter.js
index 88398c68..56c02547 100644
--- a/modern/src/common/util/formatter.js
+++ b/modern/src/common/util/formatter.js
@@ -17,7 +17,22 @@ export const formatNumber = (value, precision = 1) => Number(value.toFixed(preci
 
 export const formatPercentage = (value) => `${value}%`;
 
-export const formatTime = (value, format = 'YYYY-MM-DD HH:mm:ss') => (value ? moment(value).format(format) : '');
+export const formatTime = (value, format, hours12) => {
+  if (value) {
+    const m = moment(value);
+    switch (format) {
+      case 'date':
+        return m.format('YYYY-MM-DD');
+      case 'time':
+        return m.format(hours12 ? 'hh:mm:ss A' : 'HH:mm:ss');
+      case 'minutes':
+        return m.format(hours12 ? 'YYYY-MM-DD hh:mm A' : 'YYYY-MM-DD HH:mm');
+      default:
+        return m.format(hours12 ? 'YYYY-MM-DD hh:mm:ss A' : 'YYYY-MM-DD HH:mm:ss');
+    }
+  }
+  return '';
+};
 
 export const formatStatus = (value, t) => t(prefixString('deviceStatus', value));
 export const formatAlarm = (value, t) => (value ? t(prefixString('alarm', value)) : '');