Merge branch 'master' of https://gitlab.chiefsoft.net/WrenchBoard/Users-Wrench into familytasks

src/components/MyActiveJobs/ActiveJobMessage.jsx

@@ -31,7 +31,13 @@ export default function ActiveJobMessage({ activeJobMesList }) {
         <tbody>
             {currentActiveJobMesList.map((item, index) => (
             <tr key={index} className='text-slate-500'>
-                <td className="p-2" dangerouslySetInnerHTML={{__html: item.message}}></td>
+                <td>
+                    <div className="msg_box">
+                        <div className="msg_header">{item.msg_date} {item.msg_firstname}</div>
+                        <span className="p-2" dangerouslySetInnerHTML={{__html: item.message}}></span>
+                    </div>
+
+                </td>
             </tr>
             ))}
         </tbody>

src/components/Partials/Header.jsx

@@ -100,7 +100,7 @@ export default function Header({ logoutModalHandler, sidebarHandler }) {
 
   // User Profile
   let { firstname, lastname, email, profile_pic } = userDetails;
-  let userEmail = email.split("@")[0];
+  let userEmail = email?.split("@")[0];
 
   return (
     <>

src/components/jobPopout/PendingJobsPopout.jsx

@@ -229,4 +229,4 @@ function PendingJobsPopout({ details, onClose, situation }) {
   );
 }
 
-export default PendingJobsPopout;
+export default PendingJobsPopout;