From 8a01a1e4716421a9e1ece8c25bfdb1ae937ea0b6 Mon Sep 17 00:00:00 2001
From: Proddy <paul@derbyshire.nl>
Date: Sun, 30 Apr 2023 20:35:29 +0200
Subject: [PATCH] merge changes from Michael for #600

---
 interface/src/project/SettingsEntities.tsx | 6 ++++--
 interface/src/project/types.ts             | 8 ++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/interface/src/project/SettingsEntities.tsx b/interface/src/project/SettingsEntities.tsx
index 8093107ac..9d38e570a 100644
--- a/interface/src/project/SettingsEntities.tsx
+++ b/interface/src/project/SettingsEntities.tsx
@@ -199,10 +199,12 @@ const SettingsEntities: FC = () => {
     setDialogOpen(true);
   };
 
-  function formatValue(value: any, uom: any) {
+  function formatValue(value: any, uom: number) {
     return value === undefined || uom === undefined
       ? ''
-      : new Intl.NumberFormat().format(value) + (uom === 0 ? '' : ' ' + DeviceValueUOM_s[uom]);
+      : typeof value === 'number'
+      ? new Intl.NumberFormat().format(value) + (uom === 0 ? '' : ' ' + DeviceValueUOM_s[uom])
+      : value;
   }
 
   function showHex(value: number, digit: number) {
diff --git a/interface/src/project/types.ts b/interface/src/project/types.ts
index 8397e5d1f..954014dac 100644
--- a/interface/src/project/types.ts
+++ b/interface/src/project/types.ts
@@ -346,12 +346,12 @@ export interface EntityItem {
   device_id: number | string;
   type_id: number | string;
   offset: number;
-  factor?: number; // optional
-  uom?: number; // optional
+  factor: number;
+  uom: number;
   value_type: number;
-  value?: number; // optional
+  value?: any;
   writeable: boolean;
-  deleted?: boolean; // optional
+  deleted?: boolean;
   o_id?: number;
   o_name?: string;
   o_device_id?: number | string;