From b288ce327f2fd14806e0a339e9f1fac4473e6f30 Mon Sep 17 00:00:00 2001
From: Tom Butcher <thomasbutcher15@gmail.com>
Date: Sat, 29 Nov 2025 01:21:19 +0000
Subject: [PATCH] Update objectData prop to use combined data for improved
 rendering.

---
 src/components/Dashboard/common/ObjectInfo.jsx | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/components/Dashboard/common/ObjectInfo.jsx b/src/components/Dashboard/common/ObjectInfo.jsx
index d664cef..3811a24 100644
--- a/src/components/Dashboard/common/ObjectInfo.jsx
+++ b/src/components/Dashboard/common/ObjectInfo.jsx
@@ -1,8 +1,10 @@
 import { Spin, Descriptions, Flex } from 'antd'
+import { useState, useEffect } from 'react'
 import { LoadingOutlined } from '@ant-design/icons'
 import PropTypes from 'prop-types'
 import ObjectProperty from './ObjectProperty'
 import { getModelProperties } from '../../../database/ObjectModels'
+import merge from 'lodash/merge'
 
 const ObjectInfo = ({
   loading = false,
@@ -27,6 +29,12 @@ const ObjectInfo = ({
 }) => {
   const allItems = getModelProperties(type)
 
+  const [combinedObjectData, setCombinedObjectData] = useState(objectData)
+
+  useEffect(() => {
+    setCombinedObjectData((prev) => merge({}, prev, objectData))
+  }, [objectData])
+
   // If properties array is empty, show all properties
   // Otherwise, filter and order by the properties array
   let items
@@ -82,7 +90,8 @@ const ObjectInfo = ({
           {...item}
           {...objectPropertyProps}
           isEditing={isEditing}
-          objectData={objectData}
+          objectData={combinedObjectData}
+          showSince={true}
         />
       ),
       span: item?.span || undefined