2 files changed, 8 insertions, 5 deletions
diff --git a/modern/src/main/DeviceRow.jsx b/modern/src/main/DeviceRow.jsx
index 82ffb1b5..9f6f3a22 100644
--- a/modern/src/main/DeviceRow.jsx
+++ b/modern/src/main/DeviceRow.jsx
@@ -11,7 +11,8 @@ import BatteryCharging60Icon from '@mui/icons-material/BatteryCharging60';
 import Battery20Icon from '@mui/icons-material/Battery20';
 import BatteryCharging20Icon from '@mui/icons-material/BatteryCharging20';
 import ErrorIcon from '@mui/icons-material/Error';
-import moment from 'moment';
+import dayjs from 'dayjs';
+import relativeTime from 'dayjs/plugin/relativeTime';
 import { devicesActions } from '../store';
 import {
   formatAlarm, formatBoolean, formatPercentage, formatStatus, getStatusColor,
@@ -22,6 +23,8 @@ import { useAdministrator } from '../common/util/permissions';
 import { ReactComponent as EngineIcon } from '../resources/images/data/engine.svg';
 import { useAttributePreference } from '../common/util/preferences';
 
+dayjs.extend(relativeTime);
+
 const useStyles = makeStyles((theme) => ({
   icon: {
     width: '25px',
@@ -65,7 +68,7 @@ const DeviceRow = ({ data, index, style }) => {
     if (item.status === 'online' || !item.lastUpdate) {
       status = formatStatus(item.status, t);
     } else {
-      status = moment(item.lastUpdate).fromNow();
+      status = dayjs(item.lastUpdate).fromNow();
     }
     return (
       <>
diff --git a/modern/src/main/useFilter.js b/modern/src/main/useFilter.js
index 96a8c4b9..ccda6e14 100644
--- a/modern/src/main/useFilter.js
+++ b/modern/src/main/useFilter.js
@@ -1,6 +1,6 @@
 import { useEffect } from 'react';
 import { useSelector } from 'react-redux';
-import moment from 'moment';
+import dayjs from 'dayjs';
 
 export default (keyword, filter, filterSort, filterMap, positions, setFilteredDevices, setFilteredPositions) => {
   const groups = useSelector((state) => state.groups.items);
@@ -30,8 +30,8 @@ export default (keyword, filter, filterSort, filterMap, positions, setFilteredDe
         break;
       case 'lastUpdate':
         filtered.sort((device1, device2) => {
-          const time1 = device1.lastUpdate ? moment(device1.lastUpdate).valueOf() : 0;
-          const time2 = device2.lastUpdate ? moment(device2.lastUpdate).valueOf() : 0;
+          const time1 = device1.lastUpdate ? dayjs(device1.lastUpdate).valueOf() : 0;
+          const time2 = device2.lastUpdate ? dayjs(device2.lastUpdate).valueOf() : 0;
           return time2 - time1;
         });
         break;