feature/IO-3478-Mark-Conversation-Unread: Make Notifications more realtime

hotfix/missing-dms-migration - Add Back DMS_ID

_reference/partsManagement/PATCH_parts-management-job-status.md

@@ -0,0 +1,61 @@
+# PATCH /integrations/parts-management/job/:id/status
+
+Update (patch) the status of a job created under parts management. This endpoint is only available
+for jobs whose parent bodyshop has an `external_shop_id` (i.e., is provisioned for parts
+management).
+
+## Endpoint
+
+```
+PATCH /integrations/parts-management/job/:id/status
+```
+
+- `:id` is the UUID of the job to update.
+
+## Request Headers
+
+- `Authorization`: (if required by your integration middleware)
+- `Content-Type: application/json`
+
+## Request Body
+
+Send a JSON object with the following field:
+
+- `status` (string, required): The new status for the job.
+
+Example:
+
+```
+PATCH /integrations/parts-management/job/123e4567-e89b-12d3-a456-426614174000/status
+Content-Type: application/json
+
+{
+  "status": "IN_PROGRESS"
+}
+```
+
+## Success Response
+
+- **200 OK**
+- Returns the updated job object with the new status.
+
+```
+{
+  "id": "123e4567-e89b-12d3-a456-426614174000",
+  "status": "IN_PROGRESS",
+  ...
+}
+```
+
+## Error Responses
+
+- **400 Bad Request**: Missing status field, or parent bodyshop does not have an `external_shop_id`.
+- **404 Not Found**: No job found with the given ID.
+- **500 Internal Server Error**: Unexpected error.
+
+## Notes
+
+- Only jobs whose parent bodyshop has an `external_shop_id` can be patched via this route.
+- Fields other than `status` will be ignored if included in the request body.
+- The route is protected by the same middleware as other parts management endpoints.
+

_reference/partsManagement/PATCH_parts-management-provision.md

@@ -0,0 +1,86 @@
+# PATCH /integrations/parts-management/provision/:id
+
+Update (patch) select fields for a parts management bodyshop. Only available for shops that have an
+`external_shop_id` (i.e., are provisioned for parts management).
+
+## Endpoint
+
+```
+PATCH /integrations/parts-management/provision/:id
+```
+
+- `:id` is the UUID of the bodyshop to update.
+
+## Request Headers
+
+- `Authorization`: (if required by your integration middleware)
+- `Content-Type: application/json`
+
+## Request Body
+
+Send a JSON object with one or more of the following fields to update:
+
+- `shopname` (string)
+- `address1` (string)
+- `address2` (string, optional)
+- `city` (string)
+- `state` (string)
+- `zip_post` (string)
+- `country` (string)
+- `email` (string, shop's email, not user email)
+- `timezone` (string)
+- `phone` (string)
+- `logo_img_path` (object, e.g. `{ src, width, height, headerMargin }`)
+
+Any fields not included in the request body will remain unchanged.
+
+## Example Request
+
+```
+PATCH /integrations/parts-management/provision/123e4567-e89b-12d3-a456-426614174000
+Content-Type: application/json
+
+{
+  "shopname": "New Shop Name",
+  "address1": "123 Main St",
+  "city": "Springfield",
+  "state": "IL",
+  "zip_post": "62704",
+  "country": "USA",
+  "email": "shop@example.com",
+  "timezone": "America/Chicago",
+  "phone": "555-123-4567",
+  "logo_img_path": {
+    "src": "https://example.com/logo.png",
+    "width": "200",
+    "height": "100",
+    "headerMargin": 10
+  }
+}
+```
+
+## Success Response
+
+- **200 OK**
+- Returns the updated shop object with the patched fields.
+
+```
+{
+  "id": "123e4567-e89b-12d3-a456-426614174000",
+  "shopname": "New Shop Name",
+  ...
+}
+```
+
+## Error Responses
+
+- **400 Bad Request**: No valid fields provided, or shop does not have an `external_shop_id`.
+- **404 Not Found**: No shop found with the given ID.
+- **500 Internal Server Error**: Unexpected error.
+
+## Notes
+
+- Only shops with an `external_shop_id` can be patched via this route.
+- Fields not listed above will be ignored if included in the request body.
+- The route is protected by the same middleware as other parts management endpoints.
+

bodyshop_translations.babel

@@ -5305,6 +5305,27 @@
                                                     </translation>
                                                 </translations>
                                             </concept_node>
+                                            <concept_node>
+                                                <name>ro_posting</name>
+                                                <definition_loaded>false</definition_loaded>
+                                                <description></description>
+                                                <comment></comment>
+                                                <default_text></default_text>
+                                                <translations>
+                                                    <translation>
+                                                        <language>en-US</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                    <translation>
+                                                        <language>es-MX</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                    <translation>
+                                                        <language>fr-CA</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                </translations>
+                                            </concept_node>
                                             <concept_node>
                                                 <name>sendmaterialscosting</name>
                                                 <definition_loaded>false</definition_loaded>

client/package.json

@@ -8,56 +8,56 @@
   "private": true,
   "proxy": "http://localhost:4000",
   "dependencies": {
-    "@amplitude/analytics-browser": "^2.23.5",
+    "@amplitude/analytics-browser": "^2.25.2",
     "@ant-design/pro-layout": "^7.22.6",
     "@apollo/client": "^3.13.9",
     "@emotion/is-prop-valid": "^1.4.0",
     "@fingerprintjs/fingerprintjs": "^4.6.1",
     "@firebase/analytics": "^0.10.17",
-    "@firebase/app": "^0.14.2",
+    "@firebase/app": "^0.14.3",
     "@firebase/auth": "^1.10.8",
-    "@firebase/firestore": "^4.9.1",
+    "@firebase/firestore": "^4.9.2",
     "@firebase/messaging": "^0.12.22",
     "@jsreport/browser-client": "^3.1.0",
     "@reduxjs/toolkit": "^2.9.0",
-    "@sentry/cli": "^2.53.0",
+    "@sentry/cli": "^2.56.0",
     "@sentry/react": "^9.43.0",
     "@sentry/vite-plugin": "^4.3.0",
-    "@splitsoftware/splitio-react": "^2.3.1",
+    "@splitsoftware/splitio-react": "^2.5.0",
     "@tanem/react-nprogress": "^5.0.53",
-    "antd": "^5.27.3",
+    "antd": "^5.27.4",
     "apollo-link-logger": "^2.0.1",
     "apollo-link-sentry": "^4.4.0",
     "autosize": "^6.0.1",
-    "axios": "^1.11.0",
+    "axios": "^1.12.2",
     "classnames": "^2.5.1",
     "css-box-model": "^1.2.1",
     "dayjs": "^1.11.18",
     "dayjs-business-days2": "^1.3.0",
     "dinero.js": "^1.9.1",
-    "dotenv": "^17.2.2",
+    "dotenv": "^17.2.3",
     "env-cmd": "^10.1.0",
     "exifr": "^7.1.3",
     "graphql": "^16.11.0",
-    "i18next": "^25.5.2",
+    "i18next": "^25.5.3",
     "i18next-browser-languagedetector": "^8.2.0",
     "immutability-helper": "^3.1.1",
-    "libphonenumber-js": "^1.12.15",
+    "libphonenumber-js": "^1.12.23",
+    "lightningcss": "^1.30.2",
     "logrocket": "^9.0.2",
-    "markerjs2": "^2.32.6",
+    "markerjs2": "^2.32.7",
     "memoize-one": "^6.0.0",
-    "normalize-url": "^8.0.2",
+    "normalize-url": "^8.1.0",
     "object-hash": "^3.0.0",
     "phone": "^3.1.67",
-    "posthog-js": "^1.261.7",
+    "posthog-js": "^1.271.0",
     "prop-types": "^15.8.1",
-    "query-string": "^9.2.2",
+    "query-string": "^9.3.1",
     "raf-schd": "^4.0.3",
     "react": "^18.3.1",
     "react-big-calendar": "^1.19.4",
     "react-color": "^2.19.3",
     "react-cookie": "^8.0.1",
-    "lightningcss": "^1.30.1",
     "react-dom": "^18.3.1",
     "react-drag-listview": "^2.0.0",
     "react-grid-gallery": "^1.0.1",
@@ -73,7 +73,7 @@
     "react-resizable": "^3.0.5",
     "react-router-dom": "^6.30.0",
     "react-sticky": "^6.0.3",
-    "react-virtuoso": "^4.14.0",
+    "react-virtuoso": "^4.14.1",
     "recharts": "^2.15.2",
     "redux": "^5.0.1",
     "redux-actions": "^3.0.3",
@@ -81,7 +81,7 @@
     "redux-saga": "^1.3.0",
     "redux-state-sync": "^3.1.4",
     "reselect": "^5.1.1",
-    "sass": "^1.92.0",
+    "sass": "^1.93.2",
     "socket.io-client": "^4.8.1",
     "styled-components": "^6.1.19",
     "subscriptions-transport-ws": "^0.11.0",
@@ -133,33 +133,33 @@
     "@rollup/rollup-linux-x64-gnu": "4.6.1"
   },
   "devDependencies": {
-    "@ant-design/icons": "^6.0.0",
+    "@ant-design/icons": "^6.1.0",
     "@babel/plugin-proposal-private-property-in-object": "^7.21.11",
     "@babel/preset-react": "^7.27.1",
-    "@dotenvx/dotenvx": "^1.49.0",
+    "@dotenvx/dotenvx": "^1.51.0",
     "@emotion/babel-plugin": "^11.13.5",
     "@emotion/react": "^11.14.0",
-    "@eslint/js": "^9.33.0",
-    "@playwright/test": "^1.55.0",
-    "@sentry/webpack-plugin": "^4.1.1",
+    "@eslint/js": "^9.37.0",
+    "@playwright/test": "^1.56.0",
+    "@sentry/webpack-plugin": "^4.3.0",
     "@testing-library/dom": "^10.4.1",
-    "@testing-library/jest-dom": "^6.8.0",
+    "@testing-library/jest-dom": "^6.9.1",
     "@testing-library/react": "^16.3.0",
     "@vitejs/plugin-react": "^4.6.0",
-    "browserslist": "^4.25.3",
+    "browserslist": "^4.26.3",
     "browserslist-to-esbuild": "^2.1.1",
-    "chalk": "^5.6.0",
-    "eslint": "^9.33.0",
+    "chalk": "^5.6.2",
+    "eslint": "^9.37.0",
     "eslint-plugin-react": "^7.37.5",
     "globals": "^15.15.0",
     "jsdom": "^26.0.0",
-    "memfs": "^4.36.3",
+    "memfs": "^4.48.1",
     "os-browserify": "^0.3.0",
-    "playwright": "^1.55.0",
+    "playwright": "^1.56.0",
     "react-error-overlay": "^6.1.0",
     "redux-logger": "^3.0.6",
     "source-map-explorer": "^2.5.3",
-    "vite": "^7.1.3",
+    "vite": "^7.1.9",
     "vite-plugin-babel": "^1.3.2",
     "vite-plugin-eslint": "^1.8.1",
     "vite-plugin-node-polyfills": "^0.24.0",

client/src/App/App.container.jsx

@@ -12,6 +12,7 @@ import GlobalLoadingBar from "../components/global-loading-bar/global-loading-ba
 import { setDarkMode } from "../redux/application/application.actions";
 import { selectDarkMode } from "../redux/application/application.selectors";
 import { selectCurrentUser } from "../redux/user/user.selectors.js";
+import { signOutStart } from "../redux/user/user.actions";
 import client from "../utils/GraphQLClient";
 import App from "./App";
 import getTheme from "./themeProvider";
@@ -20,14 +21,13 @@ import getTheme from "./themeProvider";
 const config = {
   core: {
     authorizationKey: import.meta.env.VITE_APP_SPLIT_API,
-    key: "anon" // Default key, overridden dynamically by SplitClientProvider
+    key: "anon"
   }
 };
 
-// Custom provider to manage the Split client key based on imexshopid from Redux
 function SplitClientProvider({ children }) {
-  const imexshopid = useSelector((state) => state.user.imexshopid); // Access imexshopid from Redux store
-  const splitClient = useSplitClient({ key: imexshopid || "anon" }); // Use imexshopid or fallback to "anon"
+  const imexshopid = useSelector((state) => state.user.imexshopid);
+  const splitClient = useSplitClient({ key: imexshopid || "anon" });
   useEffect(() => {
     if (splitClient && imexshopid) {
       console.log(`Split client initialized with key: ${imexshopid}, isReady: ${splitClient.isReady}`);
@@ -36,40 +36,66 @@ function SplitClientProvider({ children }) {
   return children;
 }
 
-const mapDispatchToProps = (dispatch) => ({
-  setDarkMode: (isDarkMode) => dispatch(setDarkMode(isDarkMode))
-});
-
 const mapStateToProps = createStructuredSelector({
   currentUser: selectCurrentUser
 });
 
-function AppContainer({ currentUser, setDarkMode }) {
+const mapDispatchToProps = (dispatch) => ({
+  setDarkMode: (isDarkMode) => dispatch(setDarkMode(isDarkMode)),
+  signOutStart: () => dispatch(signOutStart())
+});
+
+function AppContainer({ currentUser, setDarkMode, signOutStart }) {
   const { t } = useTranslation();
   const isDarkMode = useSelector(selectDarkMode);
   const theme = useMemo(() => getTheme(isDarkMode), [isDarkMode]);
 
-  // Update data-theme attribute when dark mode changes
+  // Global seamless logout listener with redirect to /signin
+  useEffect(() => {
+    const handleSeamlessLogout = (event) => {
+      if (event.data?.type !== "seamlessLogoutRequest") return;
+
+      const requestOrigin = event.origin;
+
+      if (currentUser?.authorized !== true) {
+        window.parent.postMessage(
+          { type: "seamlessLogoutResponse", status: "already_logged_out" },
+          requestOrigin || "*"
+        );
+        return;
+      }
+
+      signOutStart();
+      window.parent.postMessage({ type: "seamlessLogoutResponse", status: "logged_out" }, requestOrigin || "*");
+    };
+
+    window.addEventListener("message", handleSeamlessLogout);
+    return () => {
+      window.removeEventListener("message", handleSeamlessLogout);
+    };
+  }, [signOutStart, currentUser]);
+
+  // Update data-theme attribute
   useEffect(() => {
     document.documentElement.setAttribute("data-theme", isDarkMode ? "dark" : "light");
     return () => document.documentElement.removeAttribute("data-theme");
   }, [isDarkMode]);
 
-  // Sync Redux darkMode with localStorage on user change
+  // Sync darkMode with localStorage
   useEffect(() => {
     if (currentUser?.uid) {
       const savedMode = localStorage.getItem(`dark-mode-${currentUser.uid}`);
       if (savedMode !== null) {
         setDarkMode(JSON.parse(savedMode));
       } else {
-        setDarkMode(false); // default to light mode
+        setDarkMode(false);
       }
     } else {
       setDarkMode(false);
     }
-  }, [currentUser?.uid]);
+  }, [currentUser?.uid, setDarkMode]);
 
-  // Persist darkMode to localStorage when it or user changes
+  // Persist darkMode
   useEffect(() => {
     if (currentUser?.uid) {
       localStorage.setItem(`dark-mode-${currentUser.uid}`, JSON.stringify(isDarkMode));

client/src/App/App.jsx

@@ -138,7 +138,7 @@ export function App({
     );
   }
 
-  if (currentEula && !currentUser.eulaIsAccepted) {
+  if (!isPartsEntry && currentEula && !currentUser.eulaIsAccepted) {
     return <Eula />;
   }
 

client/src/components/bill-enter-modal/bill-enter-modal.container.jsx

@@ -26,6 +26,7 @@ import { CalculateBillTotal } from "../bill-form/bill-form.totals.utility";
 import { handleUpload as handleLocalUpload } from "../documents-local-upload/documents-local-upload.utility";
 import { handleUpload } from "../documents-upload/documents-upload.utility";
 import { handleUpload as handleUploadToImageProxy } from "../documents-upload-imgproxy/documents-upload-imgproxy.utility";
+import RbacWrapper from "../../components/rbac-wrapper/rbac-wrapper.component";
 
 const mapStateToProps = createStructuredSelector({
   billEnterModal: selectBillEnterModal,
@@ -450,7 +451,9 @@ function BillEnterModalContainer({ billEnterModal, toggleModalVisible, bodyshop,
           setEnterAgain(false);
         }}
       >
-        <BillFormContainer form={form} disableInvNumber={billEnterModal.context.disableInvNumber} />
+        <RbacWrapper action="bills:enter">
+          <BillFormContainer form={form} disableInvNumber={billEnterModal.context.disableInvNumber} />
+        </RbacWrapper>
       </Form>
     </Modal>
   );

client/src/components/bill-form/bill-form.lines.component.jsx

@@ -45,7 +45,7 @@ export function BillEnterModalLinesComponent({
         title: t("billlines.fields.jobline"),
         dataIndex: "joblineid",
         editable: true,
-        width: "20rem",
+        minWidth: "10rem",
         formItemProps: (field) => {
           return {
             key: `${field.index}joblinename`,
@@ -71,9 +71,9 @@ export function BillEnterModalLinesComponent({
             disabled={disabled}
             options={lineData}
             style={{
-              width: "20rem",
-              maxWidth: "20rem",
-              minWidth: "10rem",
+              //width: "10rem",
+              // maxWidth: "20rem",
+              minWidth: "20rem",
               whiteSpace: "normal",
               height: "auto",
               minHeight: "32px" // default height of Ant Design inputs
@@ -110,7 +110,7 @@ export function BillEnterModalLinesComponent({
         title: t("billlines.fields.line_desc"),
         dataIndex: "line_desc",
         editable: true,
-        width: "20rem",
+        minWidth: "10rem",
         formItemProps: (field) => {
           return {
             key: `${field.index}line_desc`,
@@ -232,7 +232,7 @@ export function BillEnterModalLinesComponent({
         title: t("billlines.fields.actual_cost"),
         dataIndex: "actual_cost",
         editable: true,
-        width: "8rem",
+        width: "10rem",
 
         formItemProps: (field) => {
           return {
@@ -357,6 +357,7 @@ export function BillEnterModalLinesComponent({
         title: t("billlines.labels.deductedfromlbr"),
         dataIndex: "deductedfromlbr",
         editable: true,
+        width: "40px",
         formItemProps: (field) => {
           return {
             valuePropName: "checked",
@@ -464,7 +465,7 @@ export function BillEnterModalLinesComponent({
             title: t("billlines.fields.federal_tax_applicable"),
             dataIndex: "applicable_taxes.federal",
             editable: true,
-
+            width: "40px",
             formItemProps: (field) => {
               return {
                 key: `${field.index}fedtax`,
@@ -485,7 +486,7 @@ export function BillEnterModalLinesComponent({
         title: t("billlines.fields.state_tax_applicable"),
         dataIndex: "applicable_taxes.state",
         editable: true,
-
+        width: "40px",
         formItemProps: (field) => {
           return {
             key: `${field.index}statetax`,
@@ -503,7 +504,7 @@ export function BillEnterModalLinesComponent({
             title: t("billlines.fields.local_tax_applicable"),
             dataIndex: "applicable_taxes.local",
             editable: true,
-
+            width: "40px",
             formItemProps: (field) => {
               return {
                 key: `${field.index}localtax`,

client/src/components/bill-line-search-select/bill-line-search-select.component.jsx

@@ -39,30 +39,32 @@ const BillLineSearchSelect = ({ options, disabled, allowRemoved, ...restProps },
           style: {
             ...(item.removed ? { textDecoration: "line-through" } : {})
           },
-          name: `${item.removed ? `(REMOVED) ` : ""}${item.line_desc}${
-            item.oem_partno ? ` - ${item.oem_partno}` : ""
-          }${item.alt_partno ? ` (${item.alt_partno})` : ""}`.trim(),
-          label: (
-            <div style={{ whiteSpace: "normal", wordBreak: "break-word" }}>
-              <span>
-                {`${item.removed ? `(REMOVED) ` : ""}${item.line_desc}${
-                  item.oem_partno ? ` - ${item.oem_partno}` : ""
-                }${item.alt_partno ? ` (${item.alt_partno})` : ""}`.trim()}
-              </span>
-              {InstanceRenderMgr({
-                rome: item.act_price === 0 && item.mod_lb_hrs > 0 && (
-                  <span style={{ float: "right", paddingleft: "1rem" }}>{`${item.mod_lb_hrs} units`}</span>
-                )
-              })}
-              <span style={{ float: "right", paddingleft: "1rem" }}>
-                {item.act_price ? `$${item.act_price && item.act_price.toFixed(2)}` : ``}
-              </span>
-            </div>
-          )
+          name: generateLineName(item),
+          label: generateLineName(item)
         }))
       ]}
       {...restProps}
     ></Select>
   );
 };
+
+function generateLineName(item) {
+  return (
+    <div style={{ whiteSpace: "normal", wordBreak: "break-word" }}>
+      <span>
+        {`${item.removed ? `(REMOVED) ` : ""}${item.line_desc}${
+          item.oem_partno ? ` - ${item.oem_partno}` : ""
+        }${item.alt_partno ? ` (${item.alt_partno})` : ""}`.trim()}
+      </span>
+      {InstanceRenderMgr({
+        rome: item.act_price === 0 && item.mod_lb_hrs > 0 && (
+          <span style={{ float: "right", paddingleft: "1rem" }}>{`${item.mod_lb_hrs} units`}</span>
+        )
+      })}
+      <span style={{ float: "right", paddingleft: "1rem" }}>
+        {item.act_price ? `$${item.act_price && item.act_price.toFixed(2)}` : ``}
+      </span>
+    </div>
+  );
+}
 export default forwardRef(BillLineSearchSelect);

client/src/components/chat-affix/chat-affix.container.jsx

@@ -2,7 +2,6 @@ import { useApolloClient } from "@apollo/client";
 import { getToken } from "@firebase/messaging";
 import axios from "axios";
 import { useEffect } from "react";
-import { useTranslation } from "react-i18next";
 import { messaging, requestForToken } from "../../firebase/firebase.utils";
 import ChatPopupComponent from "../chat-popup/chat-popup.component";
 import "./chat-affix.styles.scss";
@@ -10,14 +9,14 @@ import { registerMessagingHandlers, unregisterMessagingHandlers } from "./regist
 import { useSocket } from "../../contexts/SocketIO/useSocket.js";
 
 export function ChatAffixContainer({ bodyshop, chatVisible, currentUser }) {
-  const { t } = useTranslation();
   const client = useApolloClient();
   const { socket } = useSocket();
 
+  // 1) FCM subscription (independent of socket handler registration)
   useEffect(() => {
     if (!bodyshop?.messagingservicesid) return;
 
-    async function SubscribeToTopicForFCMNotification() {
+    async function subscribeToTopicForFCMNotification() {
       try {
         await requestForToken();
         await axios.post("/notifications/subscribe", {
@@ -32,17 +31,35 @@ export function ChatAffixContainer({ bodyshop, chatVisible, currentUser }) {
       }
     }
 
-    SubscribeToTopicForFCMNotification();
+    subscribeToTopicForFCMNotification();
+  }, [bodyshop?.messagingservicesid, bodyshop?.imexshopid]);
 
-    // Register WebSocket handlers
-    if (socket?.connected) {
-      registerMessagingHandlers({ socket, client, currentUser, bodyshop, t });
+  // 2) Register socket handlers as soon as socket is connected (regardless of chatVisible)
+  useEffect(() => {
+    if (!socket) return;
+    if (!bodyshop?.messagingservicesid) return;
+    if (!bodyshop?.id) return;
 
-      return () => {
-        unregisterMessagingHandlers({ socket });
-      };
+    // If socket isn't connected yet, ensure no stale handlers remain.
+    if (!socket.connected) {
+      unregisterMessagingHandlers({ socket });
+      return;
     }
-  }, [bodyshop, socket, t, client]);
+
+    // Prevent duplicate listeners if this effect runs more than once.
+    unregisterMessagingHandlers({ socket });
+
+    registerMessagingHandlers({
+      socket,
+      client,
+      currentUser,
+      bodyshop
+    });
+
+    return () => {
+      unregisterMessagingHandlers({ socket });
+    };
+  }, [socket, socket?.connected, bodyshop?.id, bodyshop?.messagingservicesid, client, currentUser?.email]);
 
   if (!bodyshop?.messagingservicesid) return <></>;
 

client/src/components/chat-affix/registerMessagingSocketHandlers.js

@@ -13,68 +13,241 @@ const logLocal = (message, ...args) => {
   }
 };
 
-// Utility function to enrich conversation data
-const enrichConversation = (conversation, isOutbound) => ({
+const safeIsoNow = () => new Date().toISOString();
+const isSystemMsid = (msid) => typeof msid === "string" && msid.startsWith("SYS_");
+
+const normalizeConversationForList = (raw, { isoutbound, isSystem } = {}) => {
+  const c = raw || {};
+  const id = c.id;
+
+  return {
+    __typename: "conversations",
+    id,
+    phone_num: c.phone_num ?? null,
+    updated_at: c.updated_at ?? safeIsoNow(),
+    unreadcnt: typeof c.unreadcnt === "number" ? c.unreadcnt : 0,
+    archived: c.archived ?? false,
+    label: c.label ?? null,
+
+    job_conversations: Array.isArray(c.job_conversations)
+      ? c.job_conversations.map((jc) => {
+          const job = jc?.job || {};
+          const jobId = jc?.jobid ?? job?.id ?? null;
+
+          return {
+            __typename: "job_conversations",
+            jobid: jobId,
+            conversationid: jc?.conversationid ?? id ?? null,
+            job: {
+              __typename: "jobs",
+              id: jobId,
+              ro_number: job?.ro_number ?? null,
+              ownr_fn: job?.ownr_fn ?? null,
+              ownr_ln: job?.ownr_ln ?? null,
+              ownr_co_nm: job?.ownr_co_nm ?? null
+            }
+          };
+        })
+      : [],
+
+    messages_aggregate: c.messages_aggregate || {
+      __typename: "messages_aggregate",
+      aggregate: {
+        __typename: "messages_aggregate_fields",
+        count: isoutbound || isSystem ? 0 : 1
+      }
+    }
+  };
+};
+
+const CONVERSATION_LIST_ITEM_FRAGMENT = gql`
+  fragment _ConversationListItem on conversations {
+    id
+    phone_num
+    updated_at
+    unreadcnt
+    archived
+    label
+    job_conversations {
+      jobid
+      conversationid
+      job {
+        id
+        ro_number
+        ownr_fn
+        ownr_ln
+        ownr_co_nm
+      }
+    }
+    messages_aggregate(where: { read: { _eq: false }, isoutbound: { _eq: false }, is_system: { _eq: false } }) {
+      aggregate {
+        count
+      }
+    }
+  }
+`;
+
+const normalizeMessageForCache = (raw, fallbackConversationId) => {
+  const m = raw || {};
+
+  return {
+    __typename: "messages",
+    id: m.id,
+    conversationid: m.conversationid ?? m.conversation?.id ?? fallbackConversationId,
+
+    status: m.status ?? null,
+    text: m.text ?? "",
+    is_system: typeof m.is_system === "boolean" ? m.is_system : false,
+    isoutbound: typeof m.isoutbound === "boolean" ? m.isoutbound : false,
+    image: typeof m.image === "boolean" ? m.image : false,
+    image_path: m.image_path ?? null,
+    userid: m.userid ?? null,
+    created_at: m.created_at ?? safeIsoNow(),
+    read: typeof m.read === "boolean" ? m.read : false
+  };
+};
+
+const isConversationDetailsCached = (client, conversationId) => {
+  try {
+    return !!client.cache.readQuery({
+      query: GET_CONVERSATION_DETAILS,
+      variables: { conversationId }
+    })?.conversations_by_pk;
+  } catch {
+    return false;
+  }
+};
+
+const conversationDetailsCached = (client, conversationId) => {
+  try {
+    const res = client.cache.readQuery({
+      query: GET_CONVERSATION_DETAILS,
+      variables: { conversationId }
+    });
+    return !!res?.conversations_by_pk;
+  } catch {
+    return false;
+  }
+};
+
+const messageEntityCached = (client, messageId) => {
+  const cacheId = client.cache.identify({ __typename: "messages", id: messageId });
+  if (!cacheId) return false;
+
+  try {
+    client.cache.readFragment({
+      id: cacheId,
+      fragment: gql`
+        fragment _MsgExists on messages {
+          id
+        }
+      `
+    });
+    return true;
+  } catch {
+    return false;
+  }
+};
+
+const enrichConversation = (conversation, { isoutbound, isSystem }) => ({
   ...conversation,
-  updated_at: conversation.updated_at || new Date().toISOString(),
-  unreadcnt: conversation.unreadcnt || 0,
-  archived: conversation.archived || false,
-  label: conversation.label || null,
+  updated_at: conversation.updated_at || safeIsoNow(),
+  unreadcnt: typeof conversation.unreadcnt === "number" ? conversation.unreadcnt : 0,
+  archived: conversation.archived ?? false,
+  label: conversation.label ?? null,
   job_conversations: conversation.job_conversations || [],
   messages_aggregate: conversation.messages_aggregate || {
     __typename: "messages_aggregate",
     aggregate: {
       __typename: "messages_aggregate_fields",
-      count: isOutbound ? 0 : 1
+      count: isoutbound || isSystem ? 0 : 1
     }
   },
   __typename: "conversations"
 });
 
-// Can be uncommonted to test the playback of the notification sound
-// window.testTone = () => {
-//   const notificationSound = new Audio(newMessageSound);
-//   notificationSound.play().catch((error) => {
-//     console.error("Error playing notification sound:", error);
-//   });
-// };
+const upsertConversationIntoOffsetZeroList = (client, conversationObj, { isoutbound, isSystem } = {}) => {
+  const normalized = normalizeConversationForList(conversationObj, { isoutbound, isSystem });
+  if (!normalized?.id) return;
+
+  const convCacheId = client.cache.identify(normalized);
+  if (!convCacheId) return;
+
+  client.cache.writeFragment({
+    id: convCacheId,
+    fragment: CONVERSATION_LIST_ITEM_FRAGMENT,
+    data: normalized
+  });
+
+  client.cache.modify({
+    id: "ROOT_QUERY",
+    fields: {
+      conversations(existing = [], { args, readField }) {
+        if (!args || args.offset !== 0) return existing;
+
+        const archivedEq = args?.where?.archived?._eq;
+        if (archivedEq === true) return existing;
+
+        const without = existing.filter((c) => readField("id", c) !== normalized.id);
+        return [{ __ref: convCacheId }, ...without];
+      }
+    }
+  });
+};
 
 export const registerMessagingHandlers = ({ socket, client, currentUser, bodyshop }) => {
   if (!(socket && client)) return;
 
-  const handleNewMessageSummary = async (message) => {
-    const { conversationId, newConversation, existingConversation, isoutbound } = message;
+  // Coalesce unread refetches (avoid spamming during bursts)
+  let unreadRefetchInFlight = null;
+  const refetchUnreadCount = () => {
+    if (unreadRefetchInFlight) return;
 
-    // True only when DB value is strictly true; falls back to true on cache miss
-    const isNewMessageSoundEnabled = (client) => {
+    unreadRefetchInFlight = client
+      .refetchQueries({
+        include: ["UNREAD_CONVERSATION_COUNT"]
+      })
+      .catch(() => {
+        // best-effort
+      })
+      .finally(() => {
+        unreadRefetchInFlight = null;
+      });
+  };
+
+  const handleNewMessageSummary = async (message) => {
+    const { conversationId, newConversation, existingConversation, isoutbound, msid, updated_at } = message;
+    const isSystem = isSystemMsid(msid);
+
+    const isNewMessageSoundEnabled = (clientInstance) => {
       try {
         const email = currentUser?.email;
-        if (!email) return true; // default allow if we can't resolve user
-        const res = client.readQuery({
+        if (!email) return true;
+        const res = clientInstance.readQuery({
           query: QUERY_ACTIVE_ASSOCIATION_SOUND,
           variables: { email }
         });
         const flag = res?.associations?.[0]?.new_message_sound;
-        return flag === true; // strictly true => enabled
+        return flag === true;
       } catch {
-        // If the query hasn't been seeded in cache yet, default ON
         return true;
       }
     };
 
     logLocal("handleNewMessageSummary - Start", { message, isNew: !existingConversation });
 
-    const queryVariables = { offset: 0 };
-
     if (!isoutbound) {
-      // Play notification sound for new inbound message (scoped to bodyshop)
       if (isLeaderTab(bodyshop.id) && isNewMessageSoundEnabled(client)) {
         playNewMessageSound(bodyshop.id);
       }
+
+      // Real-time badge update for affix (best-effort, coalesced)
+      if (!isSystem) {
+        refetchUnreadCount();
+      }
     }
 
     if (!existingConversation && conversationId) {
-      // Attempt to read from the cache to determine if this is actually a new conversation
       try {
         const cachedConversation = client.cache.readFragment({
           id: client.cache.identify({ __typename: "conversations", id: conversationId }),
@@ -86,75 +259,54 @@ export const registerMessagingHandlers = ({ socket, client, currentUser, bodysho
         });
 
         if (cachedConversation) {
-          logLocal("handleNewMessageSummary - Existing Conversation inferred from cache", {
-            conversationId
-          });
-          return handleNewMessageSummary({
-            ...message,
-            existingConversation: true
-          });
+          logLocal("handleNewMessageSummary - Existing Conversation inferred from cache", { conversationId });
+          return handleNewMessageSummary({ ...message, existingConversation: true });
         }
       } catch {
-        logLocal("handleNewMessageSummary - Cache miss", { conversationId });
+        // Cache miss is normal
       }
     }
 
-    // Handle new conversation
     if (!existingConversation && newConversation?.phone_num) {
-      logLocal("handleNewMessageSummary - New Conversation", newConversation);
-
       try {
-        const queryResults = client.cache.readQuery({
-          query: CONVERSATION_LIST_QUERY,
-          variables: queryVariables
-        });
-
-        const existingConversations = queryResults?.conversations || [];
-        const enrichedConversation = enrichConversation(newConversation, isoutbound);
-
-        if (!existingConversations.some((conv) => conv.id === enrichedConversation.id)) {
-          client.cache.modify({
-            id: "ROOT_QUERY",
-            fields: {
-              conversations(existingConversations = []) {
-                return [enrichedConversation, ...existingConversations];
-              }
-            }
-          });
-        }
+        upsertConversationIntoOffsetZeroList(client, newConversation, { isoutbound, isSystem });
       } catch (error) {
         console.error("Error updating cache for new conversation:", error);
       }
       return;
     }
 
-    // Handle existing conversation
-    if (existingConversation) {
+    if (existingConversation && conversationId) {
       try {
         client.cache.modify({
           id: client.cache.identify({ __typename: "conversations", id: conversationId }),
           fields: {
-            updated_at: () => new Date().toISOString(),
+            updated_at: () => updated_at || safeIsoNow(),
             archived: () => false,
-            messages_aggregate(cached = { aggregate: { count: 0 } }) {
-              const currentCount = cached.aggregate?.count || 0;
-              if (!isoutbound) {
-                return {
-                  __typename: "messages_aggregate",
-                  aggregate: {
-                    __typename: "messages_aggregate_fields",
-                    count: currentCount + 1
-                  }
-                };
-              }
-              return cached;
+
+            messages_aggregate(cached = null) {
+              if (isoutbound || isSystem) return cached;
+
+              const currentCount = cached?.aggregate?.count ?? 0;
+              return {
+                __typename: "messages_aggregate",
+                aggregate: {
+                  __typename: "messages_aggregate_fields",
+                  count: currentCount + 1
+                }
+              };
+            },
+
+            unreadcnt(cached) {
+              if (isoutbound || isSystem) return cached;
+              const n = typeof cached === "number" ? cached : 0;
+              return n + 1;
             }
           }
         });
       } catch (error) {
         console.error("Error updating cache for existing conversation:", error);
       }
-
       return;
     }
 
@@ -166,88 +318,78 @@ export const registerMessagingHandlers = ({ socket, client, currentUser, bodysho
 
     logLocal("handleNewMessageDetailed - Start", message);
 
-    try {
-      // Check if the conversation exists in the cache
-      const queryResults = client.cache.readQuery({
-        query: GET_CONVERSATION_DETAILS,
-        variables: { conversationId }
-      });
+    if (!conversationId || !isConversationDetailsCached(client, conversationId)) return;
 
-      if (!queryResults?.conversations_by_pk) {
-        console.warn("Conversation not found in cache:", { conversationId });
+    try {
+      const normalized = normalizeMessageForCache(newMessage, conversationId);
+
+      const messageCacheId = client.cache.identify(normalized);
+      if (!messageCacheId) {
+        console.warn("handleNewMessageDetailed - Could not identify message for cache", {
+          conversationId,
+          newMessageId: newMessage?.id
+        });
         return;
       }
 
-      // Append the new message to the conversation's message list using cache.modify
+      client.cache.writeFragment({
+        id: messageCacheId,
+        fragment: gql`
+          fragment _IncomingMessage on messages {
+            id
+            conversationid
+            status
+            text
+            is_system
+            isoutbound
+            image
+            image_path
+            userid
+            created_at
+            read
+          }
+        `,
+        data: normalized
+      });
+
       client.cache.modify({
         id: client.cache.identify({ __typename: "conversations", id: conversationId }),
         fields: {
-          messages(existingMessages = []) {
-            return [...existingMessages, newMessage];
+          messages(existing = [], { readField }) {
+            const already = existing.some((ref) => readField("id", ref) === normalized.id);
+            if (already) return existing;
+            return [...existing, { __ref: messageCacheId }];
+          },
+          updated_at() {
+            return normalized.created_at || safeIsoNow();
           }
         }
       });
 
-      logLocal("handleNewMessageDetailed - Message appended successfully", {
-        conversationId,
-        newMessage
-      });
+      logLocal("handleNewMessageDetailed - Message appended successfully", { conversationId });
     } catch (error) {
       console.error("Error updating conversation messages in cache:", error);
     }
   };
 
   const handleMessageChanged = (message) => {
-    if (!message) {
-      logLocal("handleMessageChanged - No message provided", message);
-      return;
-    }
+    if (!message?.id) return;
 
     logLocal("handleMessageChanged - Start", message);
 
+    if (!messageEntityCached(client, message.id)) return;
+
     try {
+      const msgCacheId = client.cache.identify({ __typename: "messages", id: message.id });
+
       client.cache.modify({
-        id: client.cache.identify({ __typename: "conversations", id: message.conversationid }),
+        id: msgCacheId,
         fields: {
-          messages(existingMessages = [], { readField }) {
-            return existingMessages.map((messageRef) => {
-              // Check if this is the message to update
-              if (readField("id", messageRef) === message.id) {
-                const currentStatus = readField("status", messageRef);
-
-                // Handle known types of message changes
-                switch (message.type) {
-                  case "status-changed":
-                    // Prevent overwriting if the current status is already "delivered"
-                    if (currentStatus === "delivered") {
-                      logLocal("handleMessageChanged - Status already delivered, skipping update", {
-                        messageId: message.id
-                      });
-                      return messageRef;
-                    }
-
-                    // Update the status field
-                    return {
-                      ...messageRef,
-                      status: message.status
-                    };
-
-                  case "text-updated":
-                    // Handle changes to the message text
-                    return {
-                      ...messageRef,
-                      text: message.text
-                    };
-
-                  default:
-                    // Log a warning for unhandled message types
-                    logLocal("handleMessageChanged - Unhandled message type", { type: message.type });
-                    return messageRef;
-                }
-              }
-
-              return messageRef;
-            });
+          status(existing) {
+            return message.type === "status-changed" ? (message.status ?? existing) : existing;
+          },
+          text(existing) {
+            return message.type === "text-updated" ? (message.text ?? existing) : existing;
           }
         }
       });
@@ -262,149 +404,140 @@ export const registerMessagingHandlers = ({ socket, client, currentUser, bodysho
   };
 
   const handleConversationChanged = async (data) => {
-    if (!data) {
-      logLocal("handleConversationChanged - No data provided", data);
-      return;
-    }
+    if (!data?.conversationId) return;
+
+    const {
+      conversationId,
+      type,
+      job_conversations,
+      messageIds,
+      messageIdsMarkedRead,
+      lastUnreadMessageId,
+      unreadCount,
+      ...fields
+    } = data;
 
-    const { conversationId, type, job_conversations, messageIds, ...fields } = data;
     logLocal("handleConversationChanged - Start", data);
 
-    const updatedAt = new Date().toISOString();
+    const updatedAt = safeIsoNow();
+    const detailsCached = conversationDetailsCached(client, conversationId);
 
-    const updateConversationList = (newConversation) => {
-      try {
-        const existingList = client.cache.readQuery({
-          query: CONVERSATION_LIST_QUERY,
-          variables: { offset: 0 }
-        });
-
-        const updatedList = existingList?.conversations
-          ? [newConversation, ...existingList.conversations.filter((conv) => conv.id !== newConversation.id)]
-          : [newConversation]; // Prevent duplicates
-
-        client.cache.writeQuery({
-          query: CONVERSATION_LIST_QUERY,
-          variables: { offset: 0 },
-          data: {
-            conversations: updatedList
-          }
-        });
-
-        logLocal("handleConversationChanged - Conversation list updated successfully", newConversation);
-      } catch (error) {
-        console.error("Error updating conversation list in the cache:", error);
-      }
-    };
-
-    // Handle specific types
     try {
       switch (type) {
-        case "conversation-marked-read":
-          if (conversationId && messageIds?.length > 0) {
-            client.cache.modify({
-              id: client.cache.identify({ __typename: "conversations", id: conversationId }),
-              fields: {
-                messages(existingMessages = [], { readField }) {
-                  return existingMessages.map((message) => {
-                    if (messageIds.includes(readField("id", message))) {
-                      return { ...message, read: true };
-                    }
-                    return message;
-                  });
-                },
-                messages_aggregate: () => ({
-                  __typename: "messages_aggregate",
-                  aggregate: { __typename: "messages_aggregate_fields", count: 0 }
-                })
-              }
+        case "conversation-marked-read": {
+          refetchUnreadCount();
+
+          if (detailsCached && Array.isArray(messageIds)) {
+            messageIds.forEach((id) => {
+              if (!messageEntityCached(client, id)) return;
+              client.cache.modify({
+                id: client.cache.identify({ __typename: "messages", id }),
+                fields: { read: () => true }
+              });
             });
           }
-          break;
 
-        case "conversation-created":
-          updateConversationList({ ...fields, job_conversations, updated_at: updatedAt });
+          client.cache.modify({
+            id: client.cache.identify({ __typename: "conversations", id: conversationId }),
+            fields: {
+              messages_aggregate: () => ({
+                __typename: "messages_aggregate",
+                aggregate: { __typename: "messages_aggregate_fields", count: 0 }
+              }),
+              unreadcnt: () => 0,
+              updated_at: () => updatedAt
+            }
+          });
+
           break;
+        }
+
+        case "conversation-marked-unread": {
+          refetchUnreadCount();
+
+          const safeUnreadCount = typeof unreadCount === "number" ? unreadCount : 1;
+          const idsMarkedRead = Array.isArray(messageIdsMarkedRead) ? messageIdsMarkedRead : [];
+
+          if (detailsCached) {
+            idsMarkedRead.forEach((id) => {
+              if (!messageEntityCached(client, id)) return;
+              client.cache.modify({
+                id: client.cache.identify({ __typename: "messages", id }),
+                fields: { read: () => true }
+              });
+            });
+
+            if (lastUnreadMessageId && messageEntityCached(client, lastUnreadMessageId)) {
+              client.cache.modify({
+                id: client.cache.identify({ __typename: "messages", id: lastUnreadMessageId }),
+                fields: { read: () => false }
+              });
+            }
+          }
+
+          client.cache.modify({
+            id: client.cache.identify({ __typename: "conversations", id: conversationId }),
+            fields: {
+              updated_at: () => updatedAt,
+              messages_aggregate: () => ({
+                __typename: "messages_aggregate",
+                aggregate: {
+                  __typename: "messages_aggregate_fields",
+                  count: safeUnreadCount
+                }
+              }),
+              unreadcnt: () => safeUnreadCount
+            }
+          });
+
+          break;
+        }
+
+        case "conversation-created": {
+          // New conversation likely implies new unread inbound message(s)
+          refetchUnreadCount();
+
+          const conv = enrichConversation(
+            { id: conversationId, job_conversations, ...fields, updated_at: updatedAt },
+            { isoutbound: false, isSystem: false }
+          );
+          upsertConversationIntoOffsetZeroList(client, conv);
+          break;
+        }
 
         case "conversation-unarchived":
-        case "conversation-archived":
-          try {
-            const listQueryVariables = { offset: 0 };
-            const detailsQueryVariables = { conversationId };
+        case "conversation-archived": {
+          // Keep unread badge correct even if archiving affects counts
+          refetchUnreadCount();
 
-            // Check if conversation details exist in the cache
-            const detailsExist = !!client.cache.readQuery({
-              query: GET_CONVERSATION_DETAILS,
-              variables: detailsQueryVariables
-            });
-
-            // Refetch conversation list
-            await client.refetchQueries({
-              include: [CONVERSATION_LIST_QUERY, ...(detailsExist ? [GET_CONVERSATION_DETAILS] : [])],
-              variables: [
-                { query: CONVERSATION_LIST_QUERY, variables: listQueryVariables },
-                ...(detailsExist
-                  ? [
-                      {
-                        query: GET_CONVERSATION_DETAILS,
-                        variables: detailsQueryVariables
-                      }
-                    ]
-                  : [])
-              ]
-            });
-
-            logLocal("handleConversationChanged - Refetched queries after state change", {
-              conversationId,
-              type
-            });
-          } catch (error) {
-            console.error("Error refetching queries after conversation state change:", error);
-          }
+          await client.refetchQueries({
+            include: [CONVERSATION_LIST_QUERY, GET_CONVERSATION_DETAILS]
+          });
           break;
+        }
 
         case "tag-added": {
-          // Ensure `job_conversations` is properly formatted
-          const formattedJobConversations = job_conversations.map((jc) => ({
+          const formattedJobConversations = (job_conversations || []).map((jc) => ({
             __typename: "job_conversations",
             jobid: jc.jobid || jc.job?.id,
             conversationid: conversationId,
-            job: jc.job || {
+            job: {
               __typename: "jobs",
-              id: data.selectedJob.id,
-              ro_number: data.selectedJob.ro_number,
-              ownr_co_nm: data.selectedJob.ownr_co_nm,
-              ownr_fn: data.selectedJob.ownr_fn,
-              ownr_ln: data.selectedJob.ownr_ln
+              id: jc.job?.id,
+              ro_number: jc.job?.ro_number,
+              ownr_co_nm: jc.job?.ownr_co_nm,
+              ownr_fn: jc.job?.ownr_fn,
+              ownr_ln: jc.job?.ownr_ln
             }
           }));
 
           client.cache.modify({
             id: client.cache.identify({ __typename: "conversations", id: conversationId }),
             fields: {
-              job_conversations: (existing = []) => {
-                // Ensure no duplicates based on both `conversationid` and `jobid`
-                const existingLinks = new Set(
-                  existing.map((jc) => {
-                    const jobId = client.cache.readFragment({
-                      id: client.cache.identify(jc),
-                      fragment: gql`
-                        fragment JobConversationLinkAdded on job_conversations {
-                          jobid
-                          conversationid
-                        }
-                      `
-                    })?.jobid;
-                    return `${jobId}:${conversationId}`; // Unique identifier for a job-conversation link
-                  })
-                );
-
-                const newItems = formattedJobConversations.filter((jc) => {
-                  const uniqueLink = `${jc.jobid}:${jc.conversationid}`;
-                  return !existingLinks.has(uniqueLink);
-                });
-
-                return [...existing, ...newItems];
+              job_conversations(existing = [], { readField }) {
+                const seen = new Set(existing.map((x) => readField("jobid", x)).filter(Boolean));
+                const incoming = formattedJobConversations.filter((x) => x.jobid && !seen.has(x.jobid));
+                return [...existing, ...incoming];
               }
             }
           });
@@ -412,46 +545,31 @@ export const registerMessagingHandlers = ({ socket, client, currentUser, bodysho
           break;
         }
 
-        case "tag-removed":
-          try {
-            const conversationCacheId = client.cache.identify({ __typename: "conversations", id: conversationId });
-
-            // Evict the specific cache entry for job_conversations
-            client.cache.evict({
-              id: conversationCacheId,
-              fieldName: "job_conversations"
-            });
-
-            // Garbage collect evicted entries
-            client.cache.gc();
-
-            logLocal("handleConversationChanged - tag removed - Refetched conversation list after state change", {
-              conversationId,
-              type
-            });
-          } catch (error) {
-            console.error("Error refetching queries after conversation state change: (Tag Removed)", error);
-          }
+        case "tag-removed": {
+          const conversationCacheId = client.cache.identify({ __typename: "conversations", id: conversationId });
 
+          client.cache.evict({
+            id: conversationCacheId,
+            fieldName: "job_conversations"
+          });
+          client.cache.gc();
           break;
+        }
 
-        default:
-          logLocal("handleConversationChanged - Unhandled type", { type });
+        default: {
           client.cache.modify({
             id: client.cache.identify({ __typename: "conversations", id: conversationId }),
-            fields: {
-              ...Object.fromEntries(
-                Object.entries(fields).map(([key, value]) => [key, (cached) => (value !== undefined ? value : cached)])
-              )
-            }
+            fields: Object.fromEntries(
+              Object.entries(fields).map(([key, value]) => [key, (cached) => (value !== undefined ? value : cached)])
+            )
           });
+        }
       }
     } catch (error) {
       console.error("Error handling conversation changes:", { type, error });
     }
   };
 
-  // Existing handler for phone number opt-out
   const handlePhoneNumberOptedOut = async (data) => {
     const { bodyshopid, phone_number } = data;
     logLocal("handlePhoneNumberOptedOut - Start", data);
@@ -461,22 +579,18 @@ export const registerMessagingHandlers = ({ socket, client, currentUser, bodysho
         id: "ROOT_QUERY",
         fields: {
           phone_number_opt_out(existing = [], { readField }) {
-            const phoneNumberExists = existing.some(
+            const exists = existing.some(
               (ref) => readField("phone_number", ref) === phone_number && readField("bodyshopid", ref) === bodyshopid
             );
-
-            if (phoneNumberExists) {
-              logLocal("handlePhoneNumberOptedOut - Phone number already in cache", { phone_number, bodyshopid });
-              return existing;
-            }
+            if (exists) return existing;
 
             const newOptOut = {
               __typename: "phone_number_opt_out",
               id: `temporary-${phone_number}-${Date.now()}`,
               bodyshopid,
               phone_number,
-              created_at: new Date().toISOString(),
-              updated_at: new Date().toISOString()
+              created_at: safeIsoNow(),
+              updated_at: safeIsoNow()
             };
 
             return [...existing, newOptOut];
@@ -491,46 +605,36 @@ export const registerMessagingHandlers = ({ socket, client, currentUser, bodysho
         args: { bodyshopid, search: phone_number }
       });
       client.cache.gc();
-
-      logLocal("handlePhoneNumberOptedOut - Cache updated successfully", data);
     } catch (error) {
       console.error("Error updating cache for phone number opt-out:", error);
-      logLocal("handlePhoneNumberOptedOut - Error", { error: error.message });
     }
   };
 
-  // New handler for phone number opt-in
   const handlePhoneNumberOptedIn = async (data) => {
     const { bodyshopid, phone_number } = data;
     logLocal("handlePhoneNumberOptedIn - Start", data);
 
     try {
-      // Update the Apollo cache for GET_PHONE_NUMBER_OPT_OUTS by removing the phone number
       client.cache.modify({
         id: "ROOT_QUERY",
         fields: {
           phone_number_opt_out(existing = [], { readField }) {
-            // Filter out the phone number from the opt-out list
             return existing.filter(
               (ref) => !(readField("phone_number", ref) === phone_number && readField("bodyshopid", ref) === bodyshopid)
             );
           }
         },
-        broadcast: true // Trigger UI updates
+        broadcast: true
       });
 
-      // Evict the cache entry to force a refetch on next query
       client.cache.evict({
         id: "ROOT_QUERY",
         fieldName: "phone_number_opt_out",
         args: { bodyshopid, search: phone_number }
       });
       client.cache.gc();
-
-      logLocal("handlePhoneNumberOptedIn - Cache updated successfully", data);
     } catch (error) {
       console.error("Error updating cache for phone number opt-in:", error);
-      logLocal("handlePhoneNumberOptedIn - Error", { error: error.message });
     }
   };
 

client/src/components/chat-conversation-list/chat-conversation-list.component.jsx

@@ -12,7 +12,7 @@ import _ from "lodash";
 import { ExclamationCircleOutlined } from "@ant-design/icons";
 import "./chat-conversation-list.styles.scss";
 import { useQuery } from "@apollo/client";
-import { GET_PHONE_NUMBER_OPT_OUTS } from "../../graphql/phone-number-opt-out.queries.js";
+import { GET_PHONE_NUMBER_OPT_OUTS_BY_NUMBERS } from "../../graphql/phone-number-opt-out.queries.js";
 import { phone } from "phone";
 import { useTranslation } from "react-i18next";
 import { selectBodyshop } from "../../redux/user/user.selectors";
@@ -29,13 +29,26 @@ const mapDispatchToProps = (dispatch) => ({
 function ChatConversationListComponent({ conversationList, selectedConversation, setSelectedConversation, bodyshop }) {
   const { t } = useTranslation();
   const [, forceUpdate] = useState(false);
-  const phoneNumbers = conversationList.map((item) => phone(item.phone_num, "CA").phoneNumber.replace(/^\+1/, ""));
-  const { data: optOutData } = useQuery(GET_PHONE_NUMBER_OPT_OUTS, {
+
+  const phoneNumbers = useMemo(() => {
+    return (conversationList || [])
+      .map((item) => {
+        try {
+          const p = phone(item.phone_num, "CA")?.phoneNumber;
+          return p ? p.replace(/^\+1/, "") : null;
+        } catch {
+          return null;
+        }
+      })
+      .filter(Boolean);
+  }, [conversationList]);
+
+  const { data: optOutData } = useQuery(GET_PHONE_NUMBER_OPT_OUTS_BY_NUMBERS, {
     variables: {
-      bodyshopid: bodyshop.id,
+      bodyshopid: bodyshop?.id,
       phone_numbers: phoneNumbers
     },
-    skip: !conversationList.length,
+    skip: !bodyshop?.id || phoneNumbers.length === 0,
     fetchPolicy: "cache-and-network"
   });
 
@@ -58,15 +71,25 @@ function ChatConversationListComponent({ conversationList, selectedConversation,
     return _.orderBy(conversationList, ["updated_at"], ["desc"]);
   }, [conversationList]);
 
-  const renderConversation = (index, t) => {
+  const renderConversation = (index) => {
     const item = sortedConversationList[index];
-    const normalizedPhone = phone(item.phone_num, "CA").phoneNumber.replace(/^\+1/, "");
-    const hasOptOutEntry = optOutMap.has(normalizedPhone);
+
+    const normalizedPhone = (() => {
+      try {
+        return phone(item.phone_num, "CA")?.phoneNumber?.replace(/^\+1/, "") || "";
+      } catch {
+        return "";
+      }
+    })();
+
+    const hasOptOutEntry = normalizedPhone ? optOutMap.has(normalizedPhone) : false;
+
     const cardContentRight = <TimeAgoFormatter>{item.updated_at}</TimeAgoFormatter>;
     const cardContentLeft =
       item.job_conversations.length > 0
         ? item.job_conversations.map((j, idx) => <Tag key={idx}>{j.job.ro_number}</Tag>)
         : null;
+
     const names = <>{_.uniq(item.job_conversations.map((j) => OwnerNameDisplayFunction(j.job)))}</>;
     const cardTitle = (
       <>
@@ -80,9 +103,10 @@ function ChatConversationListComponent({ conversationList, selectedConversation,
         )}
       </>
     );
+
     const cardExtra = (
       <>
-        <Badge count={item.messages_aggregate.aggregate.count} />
+        <Badge count={item.messages_aggregate?.aggregate?.count || 0} />
         {hasOptOutEntry && (
           <Tooltip title={t("consent.text_body")}>
             <Tag color="red" icon={<ExclamationCircleOutlined />}>
@@ -92,6 +116,7 @@ function ChatConversationListComponent({ conversationList, selectedConversation,
         )}
       </>
     );
+
     const getCardStyle = () =>
       item.id === selectedConversation
         ? { backgroundColor: "var(--card-selected-bg)" }
@@ -104,24 +129,8 @@ function ChatConversationListComponent({ conversationList, selectedConversation,
         className={`chat-list-item ${item.id === selectedConversation ? "chat-list-selected-conversation" : ""}`}
       >
         <Card style={getCardStyle()} variant={true} size="small" extra={cardExtra} title={cardTitle}>
-          <div
-            style={{
-              display: "inline-block",
-              width: "70%",
-              textAlign: "left"
-            }}
-          >
-            {cardContentLeft}
-          </div>
-          <div
-            style={{
-              display: "inline-block",
-              width: "30%",
-              textAlign: "right"
-            }}
-          >
-            {cardContentRight}
-          </div>
+          <div style={{ display: "inline-block", width: "70%", textAlign: "left" }}>{cardContentLeft}</div>
+          <div style={{ display: "inline-block", width: "30%", textAlign: "right" }}>{cardContentRight}</div>
         </Card>
       </List.Item>
     );
@@ -131,7 +140,7 @@ function ChatConversationListComponent({ conversationList, selectedConversation,
     <div className="chat-list-container">
       <Virtuoso
         data={sortedConversationList}
-        itemContent={(index) => renderConversation(index, t)}
+        itemContent={(index) => renderConversation(index)}
         style={{ height: "100%", width: "100%" }}
       />
     </div>

client/src/components/chat-conversation-title/chat-conversation-title.component.jsx

@@ -5,24 +5,24 @@ import ChatConversationTitleTags from "../chat-conversation-title-tags/chat-conv
 import ChatLabelComponent from "../chat-label/chat-label.component";
 import ChatPrintButton from "../chat-print-button/chat-print-button.component";
 import ChatTagRoContainer from "../chat-tag-ro/chat-tag-ro.container";
-import { createStructuredSelector } from "reselect";
-import { connect } from "react-redux";
+import ChatMarkUnreadButton from "../chat-mark-unread-button/chat-mark-unread-button.component";
 
-const mapStateToProps = createStructuredSelector({});
-
-const mapDispatchToProps = () => ({});
-
-export function ChatConversationTitle({ conversation }) {
+export function ChatConversationTitle({ conversation, onMarkUnread, markUnreadDisabled, markUnreadLoading }) {
   return (
     <Space className="chat-title" wrap>
       <PhoneNumberFormatter>{conversation?.phone_num}</PhoneNumberFormatter>
+
       <ChatLabelComponent conversation={conversation} />
       <ChatPrintButton conversation={conversation} />
+
       <ChatConversationTitleTags jobConversations={conversation?.job_conversations || []} />
       <ChatTagRoContainer conversation={conversation || []} />
+
+      <ChatMarkUnreadButton disabled={markUnreadDisabled} loading={markUnreadLoading} onMarkUnread={onMarkUnread} />
+
       <ChatArchiveButton conversation={conversation} />
     </Space>
   );
 }
 
-export default connect(mapStateToProps, mapDispatchToProps)(ChatConversationTitle);
+export default ChatConversationTitle;

client/src/components/chat-conversation/chat-conversation.component.jsx

@@ -19,7 +19,9 @@ export function ChatConversationComponent({
   conversation,
   messages,
   handleMarkConversationAsRead,
-  bodyshop
+  handleMarkLastMessageAsUnread,
+  markingAsUnreadInProgress,
+  canMarkUnread
 }) {
   const [loading, error] = subState;
 
@@ -33,7 +35,12 @@ export function ChatConversationComponent({
       onMouseDown={handleMarkConversationAsRead}
       onKeyDown={handleMarkConversationAsRead}
     >
-      <ChatConversationTitle conversation={conversation} bodyshop={bodyshop} />
+      <ChatConversationTitle
+        conversation={conversation}
+        onMarkUnread={handleMarkLastMessageAsUnread}
+        markUnreadDisabled={!canMarkUnread}
+        markUnreadLoading={markingAsUnreadInProgress}
+      />
       <ChatMessageListComponent messages={messages} />
       <ChatSendMessage conversation={conversation} />
     </div>

client/src/components/chat-conversation/chat-conversation.container.jsx

@@ -1,6 +1,6 @@
 import { gql, useApolloClient, useQuery, useSubscription } from "@apollo/client";
 import axios from "axios";
-import { useCallback, useEffect, useState } from "react";
+import { useCallback, useEffect, useMemo, useState } from "react";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { CONVERSATION_SUBSCRIPTION_BY_PK, GET_CONVERSATION_DETAILS } from "../../graphql/conversations.queries";
@@ -18,8 +18,8 @@ function ChatConversationContainer({ bodyshop, selectedConversation }) {
   const client = useApolloClient();
   const { socket } = useSocket();
   const [markingAsReadInProgress, setMarkingAsReadInProgress] = useState(false);
+  const [markingAsUnreadInProgress, setMarkingAsUnreadInProgress] = useState(false);
 
-  // Fetch conversation details
   const {
     loading: convoLoading,
     error: convoError,
@@ -27,24 +27,23 @@ function ChatConversationContainer({ bodyshop, selectedConversation }) {
   } = useQuery(GET_CONVERSATION_DETAILS, {
     variables: { conversationId: selectedConversation },
     fetchPolicy: "network-only",
-    nextFetchPolicy: "network-only"
+    nextFetchPolicy: "network-only",
+    skip: !selectedConversation
   });
 
-  // Subscription for conversation updates
+  const conversation = convoData?.conversations_by_pk;
+
+  // Subscription for conversation updates (used when socket is NOT connected)
   useSubscription(CONVERSATION_SUBSCRIPTION_BY_PK, {
-    skip: socket?.connected,
+    skip: socket?.connected || !selectedConversation,
     variables: { conversationId: selectedConversation },
     onData: ({ data: subscriptionResult, client }) => {
-      // Extract the messages array from the result
       const messages = subscriptionResult?.data?.messages;
-      if (!messages || messages.length === 0) {
-        console.warn("No messages found in subscription result.");
-        return;
-      }
+      if (!messages || messages.length === 0) return;
 
       messages.forEach((message) => {
         const messageRef = client.cache.identify(message);
-        // Write the new message to the cache
+
         client.cache.writeFragment({
           id: messageRef,
           fragment: gql`
@@ -64,7 +63,6 @@ function ChatConversationContainer({ bodyshop, selectedConversation }) {
           data: message
         });
 
-        // Update the conversation cache to include the new message
         client.cache.modify({
           id: client.cache.identify({ __typename: "conversations", id: selectedConversation }),
           fields: {
@@ -82,6 +80,28 @@ function ChatConversationContainer({ bodyshop, selectedConversation }) {
     }
   });
 
+  /**
+   * Best-effort badge update:
+   * This assumes your list query uses messages_aggregate.aggregate.count as UNREAD inbound count.
+   * If it’s total messages, rename/create a dedicated unread aggregate in the list query and update that field instead.
+   */
+  const setConversationUnreadCountBestEffort = useCallback(
+    (conversationId, unreadCount) => {
+      if (!conversationId) return;
+
+      client.cache.modify({
+        id: client.cache.identify({ __typename: "conversations", id: conversationId }),
+        fields: {
+          messages_aggregate(existing) {
+            if (!existing?.aggregate) return existing;
+            return { ...existing, aggregate: { ...existing.aggregate, count: unreadCount } };
+          }
+        }
+      });
+    },
+    [client.cache]
+  );
+
   const updateCacheWithReadMessages = useCallback(
     (conversationId, messageIds) => {
       if (!conversationId || !messageIds?.length) return;
@@ -89,13 +109,34 @@ function ChatConversationContainer({ bodyshop, selectedConversation }) {
       messageIds.forEach((messageId) => {
         client.cache.modify({
           id: client.cache.identify({ __typename: "messages", id: messageId }),
-          fields: {
-            read: () => true
-          }
+          fields: { read: () => true }
         });
       });
+
+      setConversationUnreadCountBestEffort(conversationId, 0);
     },
-    [client.cache]
+    [client.cache, setConversationUnreadCountBestEffort]
+  );
+
+  const applyUnreadStateWithMaxOneUnread = useCallback(
+    ({ conversationId, lastUnreadMessageId, messageIdsMarkedRead = [], unreadCount = 1 }) => {
+      if (!conversationId || !lastUnreadMessageId) return;
+
+      messageIdsMarkedRead.forEach((id) => {
+        client.cache.modify({
+          id: client.cache.identify({ __typename: "messages", id }),
+          fields: { read: () => true }
+        });
+      });
+
+      client.cache.modify({
+        id: client.cache.identify({ __typename: "messages", id: lastUnreadMessageId }),
+        fields: { read: () => false }
+      });
+
+      setConversationUnreadCountBestEffort(conversationId, unreadCount);
+    },
+    [client.cache, setConversationUnreadCountBestEffort]
   );
 
   // WebSocket event handlers
@@ -103,20 +144,25 @@ function ChatConversationContainer({ bodyshop, selectedConversation }) {
     if (!socket?.connected) return;
 
     const handleConversationChange = (data) => {
-      if (data.type === "conversation-marked-read") {
-        const { conversationId, messageIds } = data;
-        updateCacheWithReadMessages(conversationId, messageIds);
+      if (data?.type === "conversation-marked-read") {
+        updateCacheWithReadMessages(data.conversationId, data.messageIds);
+      }
+
+      if (data?.type === "conversation-marked-unread") {
+        applyUnreadStateWithMaxOneUnread({
+          conversationId: data.conversationId,
+          lastUnreadMessageId: data.lastUnreadMessageId,
+          messageIdsMarkedRead: data.messageIdsMarkedRead,
+          unreadCount: data.unreadCount
+        });
       }
     };
 
     socket.on("conversation-changed", handleConversationChange);
+    return () => socket.off("conversation-changed", handleConversationChange);
+  }, [socket, updateCacheWithReadMessages, applyUnreadStateWithMaxOneUnread]);
 
-    return () => {
-      socket.off("conversation-changed", handleConversationChange);
-    };
-  }, [socket, updateCacheWithReadMessages]);
-
-  // Join and leave conversation via WebSocket
+  // Join/leave conversation via WebSocket
   useEffect(() => {
     if (!socket?.connected || !selectedConversation || !bodyshop?.id) return;
 
@@ -133,15 +179,21 @@ function ChatConversationContainer({ bodyshop, selectedConversation }) {
     };
   }, [socket, bodyshop, selectedConversation]);
 
-  // Mark conversation as read
-  const handleMarkConversationAsRead = async () => {
-    if (!convoData || markingAsReadInProgress) return;
+  const inboundNonSystemMessages = useMemo(() => {
+    const msgs = conversation?.messages || [];
+    return msgs
+      .filter((m) => m && !m.isoutbound && !m.is_system)
+      .slice()
+      .sort((a, b) => new Date(a.created_at).getTime() - new Date(b.created_at).getTime());
+  }, [conversation?.messages]);
 
-    const conversation = convoData.conversations_by_pk;
-    if (!conversation) return;
+  const canMarkUnread = inboundNonSystemMessages.length > 0;
+
+  const handleMarkConversationAsRead = async () => {
+    if (!conversation || markingAsReadInProgress) return;
 
     const unreadMessageIds = conversation.messages
-      ?.filter((message) => !message.read && !message.isoutbound)
+      ?.filter((message) => !message.read && !message.isoutbound && !message.is_system)
       .map((message) => message.id);
 
     if (unreadMessageIds?.length > 0) {
@@ -162,12 +214,48 @@ function ChatConversationContainer({ bodyshop, selectedConversation }) {
     }
   };
 
+  const handleMarkLastMessageAsUnread = async () => {
+    if (!conversation || markingAsUnreadInProgress) return;
+    if (!bodyshop?.id || !bodyshop?.imexshopid) return;
+
+    const lastInbound = inboundNonSystemMessages[inboundNonSystemMessages.length - 1];
+    if (!lastInbound?.id) return;
+
+    setMarkingAsUnreadInProgress(true);
+    try {
+      const res = await axios.post("/sms/markLastMessageUnread", {
+        conversationId: conversation.id,
+        imexshopid: bodyshop.imexshopid,
+        bodyshopid: bodyshop.id
+      });
+
+      const payload = res?.data || {};
+      if (payload.lastUnreadMessageId) {
+        applyUnreadStateWithMaxOneUnread({
+          conversationId: conversation.id,
+          lastUnreadMessageId: payload.lastUnreadMessageId,
+          messageIdsMarkedRead: payload.messageIdsMarkedRead || [],
+          unreadCount: typeof payload.unreadCount === "number" ? payload.unreadCount : 1
+        });
+      } else {
+        setConversationUnreadCountBestEffort(conversation.id, 0);
+      }
+    } catch (error) {
+      console.error("Error marking last message unread:", error.message);
+    } finally {
+      setMarkingAsUnreadInProgress(false);
+    }
+  };
+
   return (
     <ChatConversationComponent
       subState={[convoLoading, convoError]}
-      conversation={convoData?.conversations_by_pk || {}}
-      messages={convoData?.conversations_by_pk?.messages || []}
+      conversation={conversation || {}}
+      messages={conversation?.messages || []}
       handleMarkConversationAsRead={handleMarkConversationAsRead}
+      handleMarkLastMessageAsUnread={handleMarkLastMessageAsUnread}
+      markingAsUnreadInProgress={markingAsUnreadInProgress}
+      canMarkUnread={canMarkUnread}
     />
   );
 }

client/src/components/chat-mark-unread-button/chat-mark-unread-button.component.jsx

@@ -0,0 +1,24 @@
+import { Button, Tooltip } from "antd";
+import { useTranslation } from "react-i18next";
+
+export default function ChatMarkUnreadButton({ disabled, loading, onMarkUnread }) {
+  const { t } = useTranslation();
+
+  return (
+    <Tooltip title={t("messaging.labels.mark_unread")}>
+      <Button
+        size="small"
+        className="unread-button"
+        type="primary"
+        children={t("messaging.labels.mark_unread")}
+        loading={loading}
+        disabled={disabled}
+        onMouseDown={(e) => e.stopPropagation()} // prevent parent mark-read handler
+        onClick={(e) => {
+          e.stopPropagation();
+          onMarkUnread?.();
+        }}
+      />
+    </Tooltip>
+  );
+}

client/src/components/chat-media-selector/chat-media-selector.component.jsx

@@ -40,7 +40,11 @@ export function ChatMediaSelector({ bodyshop, selectedMedia, setSelectedMedia, c
     variables: {
       jobId: conversation.job_conversations[0]?.jobid
     },
-    skip: !open || !conversation.job_conversations || conversation.job_conversations.length === 0
+    skip:
+      !open ||
+      !conversation.job_conversations ||
+      conversation.job_conversations.length === 0 ||
+      bodyshop.uselocalmediaserver
   });
 
   const handleVisibleChange = (change) => {
@@ -48,7 +52,8 @@ export function ChatMediaSelector({ bodyshop, selectedMedia, setSelectedMedia, c
   };
 
   useEffect(() => {
-    setSelectedMedia([]);
+    // Instead of wiping the array (which holds media objects), just clear selection flags
+    setSelectedMedia((prev) => prev.map((m) => ({ ...m, isSelected: false })));
   }, [setSelectedMedia, conversation]);
 
   //Knowingly taking on the technical debt of poor implementation below. Done this way to avoid an edge case where no component may be displayed.
@@ -75,6 +80,7 @@ export function ChatMediaSelector({ bodyshop, selectedMedia, setSelectedMedia, c
             <JobDocumentsLocalGalleryExternal
               externalMediaState={[selectedMedia, setSelectedMedia]}
               jobId={conversation.job_conversations[0]?.jobid}
+              context="chat"
             />
           )}
         </>
@@ -90,6 +96,7 @@ export function ChatMediaSelector({ bodyshop, selectedMedia, setSelectedMedia, c
             <JobDocumentsLocalGalleryExternal
               externalMediaState={[selectedMedia, setSelectedMedia]}
               jobId={conversation.job_conversations[0]?.jobid}
+              context="chat"
             />
           )}
         </>
@@ -110,6 +117,7 @@ export function ChatMediaSelector({ bodyshop, selectedMedia, setSelectedMedia, c
       trigger="click"
       open={open}
       onOpenChange={handleVisibleChange}
+      destroyOnHidden
       classNames={{ root: "media-selector-popover" }}
     >
       <Badge count={selectedMedia.filter((s) => s.isSelected).length}>

client/src/components/chat-messages-list/chat-message-list.styles.scss

@@ -10,6 +10,11 @@
   border-radius: 4px;
 }
 
+.unread-button {
+  height: 20px;
+  border-radius: 4px;
+}
+
 .chat-title {
   margin-bottom: 5px;
 }

client/src/components/dashboard-components/job-lifecycle/job-lifecycle-dashboard.component.jsx

@@ -142,17 +142,37 @@ export default function JobLifecycleDashboardComponent({ data, bodyshop, ...card
             title={t("job_lifecycle.content.legend_title")}
             style={{ marginTop: "10px" }}
           >
-            <div>
+            <div
+              style={{
+                display: "flex",
+                flexWrap: "wrap",
+                gap: 8
+              }}
+            >
               {lifecycleData.summations.map((key) => (
-                <Tag key={key.status} color={key.color} style={{ width: "13vh", padding: "4px", margin: "4px" }}>
+                <Tag
+                  key={key.status}
+                  color={key.color}
+                  style={{
+                    // IMPORTANT: let the tag grow with its content
+                    width: "auto",
+                    padding: 0,
+                    margin: 0,
+                    display: "inline-flex",
+                    alignItems: "center",
+                    justifyContent: "center",
+                    boxSizing: "border-box"
+                  }}
+                >
                   <div
                     aria-label={`${key.status} | ${key.roundedPercentage} | ${key.humanReadable}`}
                     title={`${key.status} | ${key.roundedPercentage} | ${key.humanReadable}`}
                     style={{
                       backgroundColor: "var(--tag-wrapper-bg)",
                       color: "var(--tag-wrapper-text)",
-                      padding: "4px",
-                      textAlign: "center"
+                      padding: "4px 8px",
+                      textAlign: "center",
+                      whiteSpace: "nowrap" // keep it on one line while letting the pill expand
                     }}
                   >
                     {key.status} [{lifecycleData.statusCounts[key.status]}] ({key.roundedPercentage})

client/src/components/dashboard-grid/dashboard-grid.component.jsx

@@ -1,17 +1,17 @@
 import Icon, { SyncOutlined } from "@ant-design/icons";
-import { cloneDeep } from "lodash";
 import { useMutation, useQuery } from "@apollo/client";
 import { Button, Dropdown, Space } from "antd";
 import { PageHeader } from "@ant-design/pro-layout";
-import { useMemo, useState } from "react";
+import { useMemo, useState, useEffect } from "react";
 import { Responsive, WidthProvider } from "react-grid-layout";
 import { useTranslation } from "react-i18next";
 import { MdClose } from "react-icons/md";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { logImEXEvent } from "../../firebase/firebase.utils";
-import { UPDATE_DASHBOARD_LAYOUT } from "../../graphql/user.queries";
-import { selectBodyshop, selectCurrentUser } from "../../redux/user/user.selectors";
+import { UPDATE_DASHBOARD_LAYOUT, QUERY_USER_DASHBOARD_LAYOUT } from "../../graphql/user.queries";
+import { QUERY_DASHBOARD_BODYSHOP } from "../../graphql/bodyshop.queries";
+import { selectCurrentUser } from "../../redux/user/user.selectors";
 import AlertComponent from "../alert/alert.component";
 import LoadingSkeleton from "../loading-skeleton/loading-skeleton.component";
 import { GenerateDashboardData } from "./dashboard-grid.utils";
@@ -24,122 +24,173 @@ import "./dashboard-grid.styles.scss";
 const ResponsiveReactGridLayout = WidthProvider(Responsive);
 
 const mapStateToProps = createStructuredSelector({
-  currentUser: selectCurrentUser,
-  bodyshop: selectBodyshop
+  currentUser: selectCurrentUser
 });
 
 const mapDispatchToProps = () => ({
   //setUserLanguage: language => dispatch(setUserLanguage(language))
 });
 
-export function DashboardGridComponent({ currentUser, bodyshop }) {
+export function DashboardGridComponent({ currentUser }) {
   const { t } = useTranslation();
-  const [state, setState] = useState(() => {
-    const persisted = bodyshop.associations[0].user.dashboardlayout;
-    // Normalize persisted structure to avoid malformed shapes that can cause recursive layout recalculations
-    if (persisted) {
-      return {
-        items: Array.isArray(persisted.items) ? persisted.items : [],
-        layout: Array.isArray(persisted.layout) ? persisted.layout : [],
-        layouts: typeof persisted.layouts === "object" && !Array.isArray(persisted.layouts) ? persisted.layouts : {},
-        cols: persisted.cols
-      };
-    }
-    return { items: [], layout: [], layouts: {}, cols: 12 };
-  });
   const notification = useNotification();
 
-  // Memoize the query document so Apollo doesn't treat each render as a brand-new query causing continuous re-fetches
-  const dashboardQueryDoc = useMemo(() => createDashboardQuery(state.items), [state.items]);
+  // Constants for layout defaults
+  const DEFAULT_COLS = 12;
+  const DEFAULT_Y_POSITION = 1000;
+  const GRID_BREAKPOINTS = { lg: 1200, md: 996, sm: 768, xs: 480, xxs: 0 };
+  const GRID_COLS = { lg: 12, md: 10, sm: 6, xs: 4, xxs: 2 };
 
-  const { loading, error, data, refetch } = useQuery(dashboardQueryDoc, {
+  // Fetch dashboard layout data
+  const { data: layoutData } = useQuery(QUERY_USER_DASHBOARD_LAYOUT, {
+    variables: { email: currentUser.email },
+    fetchPolicy: "network-only",
+    nextFetchPolicy: "network-only",
+    skip: !currentUser?.email
+  });
+
+  // Fetch minimal bodyshop data for components
+  const {
+    loading,
+    error,
+    data: bodyshopData
+  } = useQuery(QUERY_DASHBOARD_BODYSHOP, {
     fetchPolicy: "network-only",
     nextFetchPolicy: "network-only"
   });
 
   const [updateLayout] = useMutation(UPDATE_DASHBOARD_LAYOUT);
 
-  const handleLayoutChange = async (layout, layouts) => {
+  // Memoize layout state initialization
+  const initialState = useMemo(() => {
+    const persisted = layoutData?.users?.[0]?.dashboardlayout;
+    if (persisted) {
+      const { items = [], layout = [], layouts = {}, cols = DEFAULT_COLS } = persisted;
+      return {
+        items: Array.isArray(items) ? items : [],
+        layout: Array.isArray(layout) ? layout : [],
+        layouts: typeof layouts === "object" && !Array.isArray(layouts) ? layouts : {},
+        cols
+      };
+    }
+    return { items: [], layout: [], layouts: {}, cols: DEFAULT_COLS };
+  }, [layoutData]);
+
+  const [state, setState] = useState(initialState);
+
+  // Update state when layout data changes
+  useEffect(() => {
+    if (layoutData?.users?.[0]?.dashboardlayout) {
+      const { items = [], layout = [], layouts = {}, cols = DEFAULT_COLS } = layoutData.users[0].dashboardlayout;
+      setState({
+        items: Array.isArray(items) ? items : [],
+        layout: Array.isArray(layout) ? layout : [],
+        layouts: typeof layouts === "object" && !Array.isArray(layouts) ? layouts : {},
+        cols
+      });
+    }
+  }, [layoutData]);
+
+  // Get bodyshop data for components
+  const bodyshop = bodyshopData?.dashboard_bodyshops?.[0];
+
+  // DRY helper function to update layout in database and cache
+  const updateLayoutAndCache = async (updatedLayout, errorContext = "updating layout") => {
     try {
-      logImEXEvent("dashboard_change_layout");
-
-      setState((prev) => ({ ...prev, layout, layouts }));
-
-      const result = await updateLayout({
-        variables: {
-          email: currentUser.email,
-          layout: { ...state, layout, layouts }
-        }
+      const { data: result } = await updateLayout({
+        variables: { email: currentUser.email, layout: updatedLayout }
       });
 
-      if (result?.errors && result.errors.length) {
-        const errorMessages = result.errors.map((e) => e?.message || String(e));
+      const { errors = [] } = result?.update_users?.returning?.[0] || {};
+
+      if (errors.length) {
+        const errorMessages = errors.map(({ message }) => message || String(error));
         notification.error({
           message: t("dashboard.errors.updatinglayout", {
             message: errorMessages.join("; ")
           })
         });
+        return false;
       }
+
+      return true;
     } catch (err) {
-      // Catch any unexpected errors (including potential cyclic JSON issues) so the promise never rejects unhandled
-      console.error("Dashboard layout update failed", err);
+      console.error(`Dashboard ${errorContext} failed`, err);
       notification.error({
         message: t("dashboard.errors.updatinglayout", {
           message: err?.message || String(err)
         })
       });
+      return false;
     }
   };
 
-  const handleRemoveComponent = (key) => {
+  // Memoize the query document so Apollo doesn't treat each render as a brand-new query causing continuous re-fetches
+  const dashboardQueryDoc = useMemo(() => createDashboardQuery(state.items), [state.items]);
+
+  const {
+    loading: dashboardLoading,
+    error: dashboardError,
+    data: dashboardQueryData,
+    refetch
+  } = useQuery(dashboardQueryDoc, {
+    fetchPolicy: "network-only",
+    nextFetchPolicy: "network-only"
+  });
+
+  const dashboardData = useMemo(() => GenerateDashboardData(dashboardQueryData), [dashboardQueryData]);
+
+  // Memoize existing layout keys to prevent unnecessary recalculations
+  const existingLayoutKeys = useMemo(() => state.items.map(({ i }) => i), [state.items]);
+
+  // Memoize menu items to prevent unnecessary recalculations
+  const menuItems = useMemo(
+    () =>
+      Object.entries(componentList).map(([key, { label }]) => ({
+        key,
+        label,
+        value: key,
+        disabled: existingLayoutKeys.includes(key)
+      })),
+    [existingLayoutKeys]
+  );
+
+  if (loading || dashboardLoading) return <LoadingSkeleton message={t("general.labels.loading")} />;
+  if (error || dashboardError) return <AlertComponent message={(error || dashboardError).message} type="error" />;
+
+  const handleLayoutChange = async (layout, layouts) => {
+    logImEXEvent("dashboard_change_layout");
+    setState((prev) => ({ ...prev, layout, layouts }));
+    await updateLayoutAndCache({ ...state, layout, layouts }, "layout change");
+  };
+
+  const handleRemoveComponent = async (key) => {
     logImEXEvent("dashboard_remove_component", { name: key });
-    const idxToRemove = state.items.findIndex((i) => i.i === key);
-
-    const items = cloneDeep(state.items);
-
-    items.splice(idxToRemove, 1);
-    setState({ ...state, items });
+    const updatedState = { ...state, items: state.items.filter((item) => item.i !== key) };
+    setState(updatedState);
+    await updateLayoutAndCache(updatedState, "component removal");
   };
 
-  const handleAddComponent = (e) => {
-    // Avoid passing the full AntD menu click event (contains circular refs) to analytics
-    logImEXEvent("dashboard_add_component", { key: e.key });
-    const compSpec = componentList[e.key] || {};
-    const minW = compSpec.minW || 1;
-    const minH = compSpec.minH || 1;
-    const baseW = compSpec.w || 2;
-    const baseH = compSpec.h || 2;
-    setState((prev) => {
-      const nextItems = [
-        ...prev.items,
-        {
-          i: e.key,
-          // Position near bottom: use a large y so RGL places it last without triggering cascading relayout loops
-          x: (prev.items.length * 2) % (prev.cols || 12),
-          y: 1000,
-          w: Math.max(baseW, minW),
-          h: Math.max(baseH, minH)
-        }
-      ];
-      return { ...prev, items: nextItems };
-    });
+  const handleAddComponent = async ({ key }) => {
+    logImEXEvent("dashboard_add_component", { key });
+    const { minW = 1, minH = 1, w: baseW = 2, h: baseH = 2 } = componentList[key] || {};
+    const nextItems = [
+      ...state.items,
+      {
+        i: key,
+        x: (state.items.length * 2) % (state.cols || DEFAULT_COLS),
+        y: DEFAULT_Y_POSITION,
+        w: Math.max(baseW, minW),
+        h: Math.max(baseH, minH)
+      }
+    ];
+    const updatedState = { ...state, items: nextItems };
+    setState(updatedState);
+    await updateLayoutAndCache(updatedState, "component addition");
   };
 
-  const dashboardData = useMemo(() => GenerateDashboardData(data), [data]);
-
-  const existingLayoutKeys = state.items.map((i) => i.i);
-
-  const menuItems = Object.keys(componentList).map((key) => ({
-    key: key,
-    label: componentList[key].label,
-    value: key,
-    disabled: existingLayoutKeys.includes(key)
-  }));
-
   const menu = { items: menuItems, onClick: handleAddComponent };
 
-  if (error) return <AlertComponent message={error.message} type="error" />;
-
   return (
     <div>
       <PageHeader
@@ -157,22 +208,19 @@ export function DashboardGridComponent({ currentUser, bodyshop }) {
 
       <ResponsiveReactGridLayout
         className="layout"
-        breakpoints={{ lg: 1200, md: 996, sm: 768, xs: 480, xxs: 0 }}
-        cols={{ lg: 12, md: 10, sm: 6, xs: 4, xxs: 2 }}
+        breakpoints={GRID_BREAKPOINTS}
+        cols={GRID_COLS}
         layouts={state.layouts}
         onLayoutChange={handleLayoutChange}
       >
         {state.items.map((item) => {
-          const spec = componentList[item.i] || {};
-          const TheComponent = spec.component;
-          const minW = spec.minW || 1;
-          const minH = spec.minH || 1;
-          // Ensure current width/height respect minimums to avoid react-grid-layout prop warnings
+          const { component: TheComponent, minW = 1, minH = 1, w: specW, h: specH } = componentList[item.i] || {};
           const safeItem = {
             ...item,
-            w: Math.max(item.w || spec.w || minW, minW),
-            h: Math.max(item.h || spec.h || minH, minH)
+            w: Math.max(item.w || specW || minW, minW),
+            h: Math.max(item.h || specH || minH, minH)
           };
+
           return (
             <div
               key={safeItem.i}

client/src/components/dms-allocations-summary/dms-allocations-summary.component.jsx

@@ -92,6 +92,7 @@ export function DmsAllocationsSummary({ socket, bodyshop, jobId, title }) {
         rowKey="center"
         dataSource={allocationsSummary}
         locale={{ emptyText: t("dms.labels.refreshallocations") }}
+        scroll={{ x: true }}
         summary={() => {
           const totals =
             allocationsSummary &&

client/src/components/email-documents/email-documents.component.jsx

@@ -67,6 +67,7 @@ export function EmailDocumentsComponent({ emailConfig, form, selectedMediaState,
             <JobsDocumentsLocalGalleryExternalComponent
               externalMediaState={[selectedMedia, setSelectedMedia]}
               jobId={emailConfig.jobid}
+              context="email"
             />
           )}
         </>
@@ -82,6 +83,7 @@ export function EmailDocumentsComponent({ emailConfig, form, selectedMediaState,
             <JobsDocumentsLocalGalleryExternalComponent
               externalMediaState={[selectedMedia, setSelectedMedia]}
               jobId={emailConfig.jobid}
+              context="email"
             />
           )}
         </>

client/src/components/eula/eula.component.jsx

@@ -55,7 +55,8 @@ const Eula = ({ currentEula, currentUser, acceptEula }) => {
     const useremail = currentUser.email;
 
     try {
-      const { ...otherFormValues } = formValues;
+      // eslint-disable-next-line no-unused-vars
+      const { accepted_terms, ...otherFormValues } = formValues;
 
       // Trim the values of the fields before submitting
       const trimmedFormValues = Object.entries(otherFormValues).reduce((acc, [key, value]) => {

client/src/components/job-detail-cards/job-detail-cards.parts.component.jsx

@@ -90,7 +90,7 @@ export function JobDetailCardsPartsComponent({ loading, data, jobRO }) {
             .filter(onlyUnique)
             .map((s) => {
               return {
-                text: s || "No Status*",
+                text: s || t("dashboard.errors.status"),
                 value: [s]
               };
             })) ||
@@ -103,7 +103,7 @@ export function JobDetailCardsPartsComponent({ loading, data, jobRO }) {
     <div>
       <CardTemplate loading={loading} title={t("jobs.labels.cards.parts")}>
         <PartsStatusPie joblines_status={joblines_status} />
-        <Table key="id" columns={columns} dataSource={filteredJobLines ? filteredJobLines : []} />
+        <Table key="id" columns={columns} dataSource={filteredJobLines || []} />
       </CardTemplate>
     </div>
   );

client/src/components/job-detail-lines/job-lines.component.jsx

@@ -97,7 +97,7 @@ export function JobLinesComponent({
     filteredInfo: {
       ...(isPartsEntry
         ? {
-            part_type: ["PAN", "PAC", "PAR", "PAL", "PAA", "PAM", "PAP", "PAS", "PASL", "PAG", "PAO"]
+            part_type: ["PAN", "PAC", "PAR", "PAL", "PAA", "PAM", "PAP", "PAS", "PASL", "PAG"] //"PAO" Removed by request
           }
         : {})
     }
@@ -318,7 +318,7 @@ export function JobLinesComponent({
             .filter(onlyUnique)
             .map((s) => {
               return {
-                text: s || "No Status*",
+                text: s || t("dashboard.errors.status"),
                 value: [s]
               };
             })) ||

client/src/components/job-lifecycle/job-lifecycle.component.jsx

@@ -222,17 +222,37 @@ export function JobLifecycleComponent({ bodyshop, job, statuses }) {
                 </div>
               </BlurWrapperComponent>
               <Card type="inner" title={t("job_lifecycle.content.legend_title")} style={{ marginTop: "10px" }}>
-                <div>
+                <div
+                  style={{
+                    display: "flex",
+                    flexWrap: "wrap",
+                    gap: 8
+                  }}
+                >
                   {lifecycleData.durations.summations.map((key) => (
-                    <Tag key={key.status} color={key.color} style={{ width: "13vh", padding: "4px", margin: "4px" }}>
+                    <Tag
+                      key={key.status}
+                      color={key.color}
+                      style={{
+                        // let the tag grow with its content
+                        width: "auto",
+                        padding: 0,
+                        margin: 0,
+                        display: "inline-flex",
+                        alignItems: "center",
+                        justifyContent: "center",
+                        boxSizing: "border-box"
+                      }}
+                    >
                       <div
                         aria-label={`${key.status} | ${key.roundedPercentage} | ${key.humanReadable}`}
                         title={`${key.status} | ${key.roundedPercentage} | ${key.humanReadable}`}
                         style={{
                           backgroundColor: "var(--tag-wrapper-bg)",
                           color: "var(--tag-wrapper-text)",
-                          padding: "4px",
-                          textAlign: "center"
+                          padding: "4px 8px",
+                          textAlign: "center",
+                          whiteSpace: "nowrap" // single line; tag gets wider instead of text escaping
                         }}
                       >
                         {key.status} (

client/src/components/job-parts-queue-count/job-parts-queue-count.component.jsx

@@ -1,8 +1,9 @@
 import { useMemo } from "react";
-import { Col, Row, Tag, Tooltip } from "antd";
+import { Tag, Tooltip } from "antd";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { selectBodyshop } from "../../redux/user/user.selectors";
+import { useTranslation } from "react-i18next";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop
@@ -11,65 +12,67 @@ const mapDispatchToProps = () => ({
   //setUserLanguage: language => dispatch(setUserLanguage(language))
 });
 
-export const DEFAULT_COL_LAYOUT = { xs: 24, sm: 24, md: 8, lg: 4, xl: 4, xxl: 4 };
-
 export default connect(mapStateToProps, mapDispatchToProps)(JobPartsQueueCount);
 
-export function JobPartsQueueCount({ bodyshop, parts, defaultColLayout = DEFAULT_COL_LAYOUT }) {
+export function JobPartsQueueCount({ bodyshop, parts }) {
+  const { t } = useTranslation();
   const partsStatus = useMemo(() => {
     if (!parts) return null;
+    const statusKeys = ["default_bo", "default_ordered", "default_received", "default_returned"];
     return parts.reduce(
       (acc, val) => {
         if (val.part_type === "PAS" || val.part_type === "PASL") return acc;
         acc.total = acc.total + val.count;
         acc[val.status] = acc[val.status] + val.count;
-
         return acc;
       },
       {
         total: 0,
         null: 0,
-        [bodyshop.md_order_statuses.default_bo]: 0,
-        [bodyshop.md_order_statuses.default_ordered]: 0,
-        [bodyshop.md_order_statuses.default_received]: 0,
-        [bodyshop.md_order_statuses.default_returned]: 0
+        ...Object.fromEntries(statusKeys.map((key) => [bodyshop.md_order_statuses[key], 0]))
       }
     );
   }, [bodyshop, parts]);
 
   if (!parts) return null;
   return (
-    <Row>
-      <Col {...defaultColLayout}>
-        <Tooltip title="Total">
-          <Tag>{partsStatus.total}</Tag>
-        </Tooltip>
-      </Col>
-      <Col {...defaultColLayout}>
-        <Tooltip title="No Status">
-          <Tag color="gold">{partsStatus["null"]}</Tag>
-        </Tooltip>
-      </Col>
-      <Col {...defaultColLayout}>
-        <Tooltip title={bodyshop.md_order_statuses.default_ordered}>
-          <Tag color="blue">{partsStatus[bodyshop.md_order_statuses.default_ordered]}</Tag>
-        </Tooltip>
-      </Col>
-      <Col {...defaultColLayout}>
-        <Tooltip title={bodyshop.md_order_statuses.default_received}>
-          <Tag color="green">{partsStatus[bodyshop.md_order_statuses.default_received]}</Tag>
-        </Tooltip>
-      </Col>
-      <Col {...defaultColLayout}>
-        <Tooltip title={bodyshop.md_order_statuses.default_returned}>
-          <Tag color="orange">{partsStatus[bodyshop.md_order_statuses.default_returned]}</Tag>
-        </Tooltip>
-      </Col>
-      <Col {...defaultColLayout}>
-        <Tooltip title={bodyshop.md_order_statuses.default_bo}>
-          <Tag color="red">{partsStatus[bodyshop.md_order_statuses.default_bo]}</Tag>
-        </Tooltip>
-      </Col>
-    </Row>
+    <div
+      style={{
+        display: "grid",
+        gridTemplateColumns: "repeat(auto-fit, minmax(40px, 1fr))",
+        gap: "8px",
+        width: "100%",
+        justifyItems: "start"
+      }}
+    >
+      <Tooltip title="Total">
+        <Tag style={{ minWidth: "40px", textAlign: "center" }}>{partsStatus.total}</Tag>
+      </Tooltip>
+      <Tooltip title={t("dashboard.errors.status_normal")}>
+        <Tag color="gold" style={{ minWidth: "40px", textAlign: "center" }}>
+          {partsStatus["null"]}
+        </Tag>
+      </Tooltip>
+      <Tooltip title={bodyshop.md_order_statuses.default_bo}>
+        <Tag color="red" style={{ minWidth: "40px", textAlign: "center" }}>
+          {partsStatus[bodyshop.md_order_statuses.default_bo]}
+        </Tag>
+      </Tooltip>
+      <Tooltip title={bodyshop.md_order_statuses.default_ordered}>
+        <Tag color="blue" style={{ minWidth: "40px", textAlign: "center" }}>
+          {partsStatus[bodyshop.md_order_statuses.default_ordered]}
+        </Tag>
+      </Tooltip>
+      <Tooltip title={bodyshop.md_order_statuses.default_received}>
+        <Tag color="green" style={{ minWidth: "40px", textAlign: "center" }}>
+          {partsStatus[bodyshop.md_order_statuses.default_received]}
+        </Tag>
+      </Tooltip>
+      <Tooltip title={bodyshop.md_order_statuses.default_returned}>
+        <Tag color="orange" style={{ minWidth: "40px", textAlign: "center" }}>
+          {partsStatus[bodyshop.md_order_statuses.default_returned]}
+        </Tag>
+      </Tooltip>
+    </div>
   );
 }

client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.component.jsx

@@ -609,7 +609,7 @@ export function JobsDetailHeaderActions({
             <FormDateTimePickerComponent
               onBlur={() => {
                 const start = form.getFieldValue("start");
-                form.setFieldsValue({ end: start.add(30, "minutes") });
+                form.setFieldsValue({ end: start?.add(30, "minutes") });
               }}
             />
           </Form.Item>

client/src/components/jobs-detail-header/jobs-detail-header.component.jsx

@@ -77,6 +77,8 @@ export function JobsDetailHeader({ job, bodyshop, disabled, insertAuditTrail, is
     .reduce((acc, val) => acc + val.mod_lb_hrs, 0);
   const ownerTitle = OwnerNameDisplayFunction(job).trim();
 
+  const employeeData = bodyshop.associations.find((a) => a.useremail === job.admin_clerk)?.user?.employee ?? null;
+
   // Handle checkbox changes
   const handleCheckboxChange = async (field, checked) => {
     const value = checked ? dayjs().toISOString() : null;
@@ -162,7 +164,7 @@ export function JobsDetailHeader({ job, bodyshop, disabled, insertAuditTrail, is
                       {job.cccontracts.map((c, index) => (
                         <Space key={c.id} wrap>
                           <Link to={`/manage/courtesycars/contracts/${c.id}`}>
-                            {`${c.agreementnumber} - ${c.courtesycar.fleetnumber} ${c.courtesycar.year} ${c.courtesycar.make} ${c.courtesycar.model}`}
+                            {`${c.agreementnumber} - ${c.courtesycar.fleetnumber} ${c.courtesycar.year} ${c.courtesycar.make} ${c.courtesycar.model} ${c.courtesycar.plate} - ${t(c.status)}`}
                             {index !== job.cccontracts.length - 1 ? "," : null}
                           </Link>
                         </Space>
@@ -355,6 +357,14 @@ export function JobsDetailHeader({ job, bodyshop, disabled, insertAuditTrail, is
             >
               <div>
                 <JobEmployeeAssignments job={job} />
+                {job.admin_clerk && (
+                  <>
+                    <Divider style={{ margin: ".5rem" }} />
+                    <DataLabel label={t("jobs.fields.admin_clerk")}>
+                      {employeeData?.displayName ?? job.admin_clerk}
+                    </DataLabel>
+                  </>
+                )}
                 <Divider style={{ margin: ".5rem" }} />
                 <DataLabel label={t("jobs.labels.labor_hrs")}>
                   {bodyHrs.toFixed(1)} / {refinishHrs.toFixed(1)} / {(bodyHrs + refinishHrs).toFixed(1)}

client/src/components/jobs-documents-imgproxy-gallery/jobs-document-imgproxy-gallery.download.component.jsx

@@ -35,16 +35,14 @@ export function JobsDocumentsImgproxyDownloadButton({ galleryImages, identifier,
     ...galleryImages.other.filter((image) => image.isSelected)
   ];
 
-  function downloadProgress(progressEvent) {
-    setDownload((currentDownloadState) => {
-      return {
-        downloaded: progressEvent.loaded || 0,
-        speed: (progressEvent.loaded || 0) - ((currentDownloadState && currentDownloadState.downloaded) || 0)
-      };
-    });
-  }
+  const downloadProgress = ({ loaded }) => {
+    setDownload((currentDownloadState) => ({
+      downloaded: loaded ?? 0,
+      speed: (loaded ?? 0) - (currentDownloadState?.downloaded ?? 0)
+    }));
+  };
 
-  function standardMediaDownload(bufferData) {
+  const standardMediaDownload = (bufferData) => {
     try {
       const a = document.createElement("a");
       const url = window.URL.createObjectURL(new Blob([bufferData]));
@@ -55,29 +53,26 @@ export function JobsDocumentsImgproxyDownloadButton({ galleryImages, identifier,
       setLoading(false);
       setDownload(null);
     }
-  }
+  };
 
   const handleDownload = async () => {
     logImEXEvent("jobs_documents_download");
     setLoading(true);
     try {
-      const response = await axios({
+      const { data } = await axios({
         url: "/media/imgproxy/download",
         method: "POST",
         responseType: "blob",
         data: { jobId, documentids: imagesToDownload.map((_) => _.id) },
         onDownloadProgress: downloadProgress
       });
-
-      setLoading(false);
-      setDownload(null);
-
       // Use the response data (Blob) to trigger download
-      standardMediaDownload(response.data);
+      standardMediaDownload(data);
     } catch {
+      // handle error (optional)
+    } finally {
       setLoading(false);
       setDownload(null);
-      // handle error (optional)
     }
   };
 

client/src/components/jobs-documents-imgproxy-gallery/jobs-documents-imgproxy-gallery.component.jsx

@@ -76,14 +76,14 @@ function JobsDocumentsImgproxyComponent({
               <SyncOutlined />
             </Button>
             <JobsDocumentsGallerySelectAllComponent galleryImages={galleryImages} setGalleryImages={setGalleryImages} />
+            {!billId && (
+              <JobsDocumentsGalleryReassign galleryImages={galleryImages} callback={fetchThumbnails || refetch} />
+            )}
             <JobsDocumentsDownloadButton galleryImages={galleryImages} identifier={downloadIdentifier} jobId={jobId} />
             <JobsDocumentsDeleteButton
               galleryImages={galleryImages}
               deletionCallback={billsCallback || fetchThumbnails || refetch}
             />
-            {!billId && (
-              <JobsDocumentsGalleryReassign galleryImages={galleryImages} callback={fetchThumbnails || refetch} />
-            )}
           </Space>
         </Col>
         {!hasMediaAccess && (

client/src/components/jobs-documents-imgproxy-gallery/jobs-documents-imgproxy-gallery.delete.component.jsx

@@ -67,7 +67,7 @@ export default function JobsDocumentsImgproxyDeleteButton({ galleryImages, delet
       okButtonProps={{ danger: true }}
       cancelText={t("general.actions.cancel")}
     >
-      <Button disabled={imagesToDelete.length < 1} loading={loading}>
+      <Button danger disabled={imagesToDelete.length < 1} loading={loading}>
         {t("documents.actions.delete")}
       </Button>
     </Popconfirm>

client/src/components/jobs-documents-local-gallery/jobs-documents-local-gallery.container.jsx

@@ -107,8 +107,8 @@ export function JobsDocumentsLocalGallery({
             <a href={CreateExplorerLinkForJob({ jobid: job.id })}>
               <Button>{t("documents.labels.openinexplorer")}</Button>
             </a>
-            <JobsDocumentsLocalGalleryReassign jobid={job.id} />
             <JobsDocumentsLocalGallerySelectAllComponent jobid={job.id} />
+            <JobsDocumentsLocalGalleryReassign jobid={job.id} />
             <JobsLocalGalleryDownloadButton job={job} />
             <JobsDocumentsLocalDeleteButton jobid={job.id} />
           </Space>

client/src/components/jobs-documents-local-gallery/jobs-documents-local-gallery.delete.component.jsx

@@ -28,6 +28,8 @@ export function JobsDocumentsLocalDeleteButton({ bodyshop, getJobMedia, allMedia
 
   const [loading, setLoading] = useState(false);
 
+  const imagesToDelete = (allMedia?.[jobid] || []).filter((i) => i.isSelected);
+
   const handleDelete = async () => {
     logImEXEvent("job_documents_delete");
     setLoading(true);
@@ -36,7 +38,7 @@ export function JobsDocumentsLocalDeleteButton({ bodyshop, getJobMedia, allMedia
       `${bodyshop.localmediaserverhttp}/jobs/delete`,
       {
         jobid: jobid,
-        files: (allMedia?.[jobid] || []).filter((i) => i.isSelected).map((i) => i.filename)
+        files: imagesToDelete.map((i) => i.filename)
       },
       { headers: { ims_token: bodyshop.localmediatoken } }
     );
@@ -60,14 +62,17 @@ export function JobsDocumentsLocalDeleteButton({ bodyshop, getJobMedia, allMedia
 
   return (
     <Popconfirm
+      disabled={imagesToDelete.length < 1}
       icon={<QuestionCircleOutlined style={{ color: "red" }} />}
       onConfirm={handleDelete}
       title={t("documents.labels.confirmdelete")}
       okText={t("general.actions.delete")}
-      okButtonProps={{ type: "danger" }}
+      okButtonProps={{ danger: true }}
       cancelText={t("general.actions.cancel")}
     >
-      <Button loading={loading}>{t("documents.actions.delete")}</Button>
+      <Button danger disabled={imagesToDelete.length < 1} loading={loading}>
+        {t("documents.actions.delete")}
+      </Button>
     </Popconfirm>
   );
 }

client/src/components/jobs-documents-local-gallery/jobs-documents-local-gallery.download.jsx

@@ -1,8 +1,8 @@
-import { Button } from "antd";
+import { Button, Space } from "antd";
 import { useState } from "react";
 import { useTranslation } from "react-i18next";
 import cleanAxios from "../../utils/CleanAxios";
-
+import formatBytes from "../../utils/formatbytes";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { selectAllMedia } from "../../redux/media/media.selectors";
@@ -19,45 +19,63 @@ export default connect(mapStateToProps, mapDispatchToProps)(JobsLocalGalleryDown
 
 export function JobsLocalGalleryDownloadButton({ bodyshop, allMedia, job }) {
   const { t } = useTranslation();
-  const [download, setDownload] = useState(null);
+  const [loading, setLoading] = useState(false);
+  const [download, setDownload] = useState(false);
 
-  function downloadProgress(progressEvent) {
-    setDownload((currentDownloadState) => {
-      return {
-        downloaded: progressEvent.loaded || 0,
-        speed: (progressEvent.loaded || 0) - (currentDownloadState?.downloaded || 0)
-      };
-    });
-  }
+  const imagesToDownload = (allMedia?.[job.id] || []).filter((i) => i.isSelected);
+
+  const downloadProgress = ({ loaded }) => {
+    setDownload((currentDownloadState) => ({
+      downloaded: loaded || 0,
+      speed: (loaded || 0) - (currentDownloadState?.downloaded || 0)
+    }));
+  };
+
+  const standardMediaDownload = (bufferData, filename) => {
+    try {
+      const a = document.createElement("a");
+      const url = window.URL.createObjectURL(new Blob([bufferData]));
+      a.href = url;
+      a.download = `${filename}.zip`;
+      a.click();
+    } catch {
+      setLoading(false);
+      setDownload(null);
+    }
+  };
 
   const handleDownload = async () => {
-    const theDownloadedZip = await cleanAxios.post(
-      `${bodyshop.localmediaserverhttp}/jobs/download`,
-      {
-        jobid: job.id,
-        files: (allMedia?.[job.id] || []).filter((i) => i.isSelected).map((i) => i.filename)
-      },
-      {
-        headers: { ims_token: bodyshop.localmediatoken },
-        responseType: "arraybuffer",
-        onDownloadProgress: downloadProgress
-      }
-    );
-    setDownload(null);
-    standardMediaDownload(theDownloadedZip.data, job.ro_number);
+    const { localmediaserverhttp, localmediatoken } = bodyshop;
+    const { id, ro_number } = job;
+    setLoading(true);
+    try {
+      const response = await cleanAxios.post(
+        `${localmediaserverhttp}/jobs/download`,
+        {
+          jobid: id,
+          files: imagesToDownload.map((i) => i.filename)
+        },
+        {
+          headers: { ims_token: localmediatoken },
+          responseType: "arraybuffer",
+          onDownloadProgress: downloadProgress
+        }
+      );
+      standardMediaDownload(response.data, ro_number);
+    } catch {
+      // handle error (optional)
+    } finally {
+      setLoading(false);
+      setDownload(null);
+    }
   };
 
   return (
-    <Button loading={!!download} onClick={handleDownload}>
-      {t("documents.actions.download")}
+    <Button disabled={imagesToDownload < 1} loading={download || loading} onClick={handleDownload}>
+      <Space>
+        <span>{t("documents.actions.download")}</span>
+        {download && <span>{`(${formatBytes(download.downloaded)} @ ${formatBytes(download.speed)} / second)`}</span>}
+      </Space>
     </Button>
   );
 }
-
-function standardMediaDownload(bufferData, filename) {
-  const a = document.createElement("a");
-  const url = window.URL.createObjectURL(new Blob([bufferData]));
-  a.href = url;
-  a.download = `${filename}.zip`;
-  a.click();
-}

client/src/components/jobs-documents-local-gallery/jobs-documents-local-gallery.external.component.jsx

@@ -1,11 +1,12 @@
-import { useEffect } from "react";
-import { Gallery } from "react-grid-gallery";
+import { useEffect, useMemo, useState, useCallback } from "react";
+import LocalMediaGrid from "./local-media-grid.component";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { getJobMedia } from "../../redux/media/media.actions";
 import { selectAllMedia } from "../../redux/media/media.selectors";
 import { selectBodyshop } from "../../redux/user/user.selectors";
+import LoadingSpinner from "../loading-spinner/loading-spinner.component";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -18,41 +19,127 @@ const mapDispatchToProps = (dispatch) => ({
 
 export default connect(mapStateToProps, mapDispatchToProps)(JobDocumentsLocalGalleryExternal);
 
-function JobDocumentsLocalGalleryExternal({ jobId, externalMediaState, getJobMedia, allMedia }) {
+/**
+ * JobDocumentsLocalGalleryExternal
+ * Fetches and displays job-related image media using the custom LocalMediaGrid.
+ *
+ * Props:
+ *  - jobId: string | number (required to fetch media)
+ *  - externalMediaState: [imagesArray, setImagesFn] (state lifted to parent for shared selection)
+ *  - getJobMedia: dispatching function to retrieve media for a job
+ *  - allMedia: redux slice keyed by jobId containing raw media records
+ *  - context: "chat" | "email" | other string used to drive grid behavior
+ *
+ * Notes:
+ *  - The previous third-party gallery required a remount key (openVersion); custom grid no longer does.
+ *  - Selection flags are preserved when media refreshes.
+ *  - Loading state ends after transformation regardless of whether any images were found.
+ */
+function JobDocumentsLocalGalleryExternal({ jobId, externalMediaState, getJobMedia, allMedia, context = "chat" }) {
   const [galleryImages, setgalleryImages] = externalMediaState;
-  const { t } = useTranslation();
+  const [isLoading, setIsLoading] = useState(false);
+  const { t } = useTranslation(); // i18n hook retained if future translations are added
+  const DEBUG_LOCAL_GALLERY = false; // flip to true for verbose console logging
 
+  // Transform raw media record into a normalized image object consumed by the grid.
+  const transformMediaToImages = useCallback((raw) => {
+    return raw
+      .filter((m) => m.type?.mime?.startsWith("image"))
+      .map((m) => ({
+        ...m,
+        src: m.thumbnail,
+        thumbnail: m.thumbnail,
+        fullsize: m.src,
+        width: 225,
+        height: 225,
+        thumbnailWidth: 225,
+        thumbnailHeight: 225,
+        caption: m.filename || m.key
+      }));
+  }, []);
+
+  // Fetch media when jobId changes (network request triggers Redux update -> documents memo recalculates).
   useEffect(() => {
-    if (jobId) {
-      getJobMedia(jobId);
-    }
+    if (!jobId) return;
+    setIsLoading(true);
+    getJobMedia(jobId);
   }, [jobId, getJobMedia]);
 
-  useEffect(() => {
-    let documents = allMedia?.[jobId]
-      ? allMedia[jobId].reduce((acc, val) => {
-          if (val.type?.mime && val.type.mime.startsWith("image")) {
-            acc.push({ ...val, src: val.thumbnail, fullsize: val.src });
-          }
-          return acc;
-        }, [])
-      : [];
-    console.log(
-      "🚀 ~ file: jobs-documents-local-gallery.external.component.jsx:48 ~ useEffect ~ documents:",
-      documents
-    );
+  // Memo: transform raw redux media into gallery documents.
+  const documents = useMemo(
+    () => transformMediaToImages(allMedia?.[jobId] || []),
+    [allMedia, jobId, transformMediaToImages]
+  );
 
-    setgalleryImages(documents);
-  }, [allMedia, jobId, setgalleryImages, t]);
+  // Sync transformed documents into external state while preserving selection flags.
+  useEffect(() => {
+    const prevSelection = new Map(galleryImages.map((p) => [p.filename, p.isSelected]));
+    const nextImages = documents.map((d) => ({ ...d, isSelected: prevSelection.get(d.filename) || false }));
+    // Micro-optimization: if array length and each filename + selection flag match, skip creating a new array.
+    if (galleryImages.length === nextImages.length) {
+      let identical = true;
+      for (let i = 0; i < nextImages.length; i++) {
+        if (
+          galleryImages[i].filename !== nextImages[i].filename ||
+          galleryImages[i].isSelected !== nextImages[i].isSelected
+        ) {
+          identical = false;
+          break;
+        }
+      }
+      if (identical) {
+        setIsLoading(false); // ensure loading stops even on no-change
+        if (DEBUG_LOCAL_GALLERY) {
+          console.log("[LocalGallery] documents unchanged", { jobId, count: documents.length });
+        }
+        return;
+      }
+    }
+    setgalleryImages(nextImages);
+    setIsLoading(false); // stop loading after transform regardless of emptiness
+    if (DEBUG_LOCAL_GALLERY) {
+      console.log("[LocalGallery] documents transformed", { jobId, count: documents.length });
+    }
+  }, [documents, setgalleryImages, galleryImages, jobId, DEBUG_LOCAL_GALLERY]);
+
+  // Toggle handler (stable reference)
+  const handleToggle = useCallback(
+    (idx) => {
+      setgalleryImages((imgs) => imgs.map((g, gIdx) => (gIdx === idx ? { ...g, isSelected: !g.isSelected } : g)));
+    },
+    [setgalleryImages]
+  );
+
+  const messageStyle = { textAlign: "center", padding: "1rem" }; // retained for potential future states
+
+  if (!jobId) {
+    return (
+      <div aria-label="media gallery unavailable" style={{ position: "relative", minHeight: 80 }}>
+        <div style={messageStyle}>No job selected.</div>
+      </div>
+    );
+  }
 
   return (
-    <div className="clearfix">
-      <Gallery
-        images={galleryImages}
-        onSelect={(index) => {
-          setgalleryImages(galleryImages.map((g, idx) => (index === idx ? { ...g, isSelected: !g.isSelected } : g)));
-        }}
-      />
+    <div
+      className="clearfix"
+      style={{ position: "relative", minHeight: 80 }}
+      data-jobid={jobId}
+      aria-label={`media gallery for job ${jobId}`}
+    >
+      {isLoading && galleryImages.length === 0 && (
+        <div className="local-gallery-loading" style={messageStyle} role="status" aria-live="polite">
+          <LoadingSpinner />
+        </div>
+      )}
+      {galleryImages.length > 0 && (
+        <LocalMediaGrid images={galleryImages} minColumns={4} context={context} onToggle={handleToggle} />
+      )}
+      {galleryImages.length > 0 && (
+        <div style={{ fontSize: 10, color: "#888", marginTop: 4 }} aria-live="off">
+          {`${t("general.labels.media")}: ${galleryImages.length}`}
+        </div>
+      )}
     </div>
   );
 }

client/src/components/jobs-documents-local-gallery/local-media-grid.component.jsx

@@ -0,0 +1,207 @@
+import { useCallback, useEffect, useMemo, useRef, useState } from "react";
+
+/**
+ * LocalMediaGrid
+ * Lightweight replacement for react-grid-gallery inside the chat popover.
+ * Props:
+ *  - images: Array<{ src, fullsize, filename?, isSelected? }>
+ *  - onToggle(index)
+ */
+export function LocalMediaGrid({
+  images,
+  onToggle,
+  thumbSize = 100,
+  gap = 8,
+  minColumns = 3,
+  maxColumns = 12,
+  context = "default"
+}) {
+  const containerRef = useRef(null);
+  const [cols, setCols] = useState(() => {
+    // Pre-calc initial columns to stabilize layout before images render
+    const count = images.length;
+    if (count === 0) return minColumns; // reserve minimal structure
+    if (count === 1 && context === "chat") return 1;
+    return Math.min(maxColumns, Math.max(minColumns, count));
+  });
+  const [justifyMode, setJustifyMode] = useState("start");
+  const [distributeExtra, setDistributeExtra] = useState(false);
+  const [loadedMap, setLoadedMap] = useState(() => new Map()); // filename -> boolean loaded
+
+  const handleImageLoad = useCallback((key) => {
+    setLoadedMap((prev) => {
+      if (prev.get(key)) return prev; // already loaded
+      const next = new Map(prev);
+      next.set(key, true);
+      return next;
+    });
+  }, []);
+
+  // Dynamically compute columns for all contexts to avoid auto-fit stretching gaps in email overlay
+  useEffect(() => {
+    const el = containerRef.current;
+    if (!el) return;
+    const compute = () => {
+      // For non-chat (email / default) we rely on CSS auto-fill; only chat needs explicit column calc & distribution logic.
+      if (context !== "chat") {
+        setCols(images.length || 0); // retain count for ARIA semantics; not used for template when non-chat.
+        setDistributeExtra(false);
+        return;
+      }
+      const width = el.clientWidth;
+      if (!width) return;
+      const perCol = thumbSize + gap; // track + gap space
+      const fitCols = Math.max(1, Math.floor((width + gap) / perCol));
+      // base desired columns: up to how many images we have and how many fit
+      let finalCols = Math.min(images.length || 1, fitCols, maxColumns);
+      // enforce minimum columns to reserve layout skeleton (except when fewer images)
+      if (finalCols < minColumns && images.length >= minColumns) {
+        finalCols = Math.min(fitCols, minColumns);
+      }
+      // chat-specific clamp
+      if (context === "chat") {
+        finalCols = Math.min(finalCols, 4);
+      }
+      if (finalCols < 1) finalCols = 1;
+      setCols(finalCols);
+      setJustifyMode("start");
+
+      // Determine if there is leftover horizontal space that can't fit another column.
+      // Only distribute when we're at the maximum allowed columns for the context and images exceed or meet that count.
+      const contextMax = context === "chat" ? 4 : maxColumns;
+      const baseWidthNeeded = finalCols * thumbSize + (finalCols - 1) * gap;
+      const leftover = width - baseWidthNeeded;
+      const atMaxColumns = finalCols === contextMax && images.length >= finalCols;
+      // leftover must be positive but less than space needed for an additional column (perCol)
+      if (atMaxColumns && leftover > 0 && leftover < perCol) {
+        setDistributeExtra(true);
+      } else {
+        setDistributeExtra(false);
+      }
+    };
+    compute();
+    const ro = new ResizeObserver(() => compute());
+    ro.observe(el);
+    return () => ro.disconnect();
+  }, [images.length, thumbSize, gap, minColumns, maxColumns, context]);
+
+  const gridTemplateColumns = useMemo(() => {
+    if (context === "chat") {
+      if (distributeExtra) {
+        return `repeat(${cols}, minmax(${thumbSize}px, 1fr))`;
+      }
+      return `repeat(${cols}, ${thumbSize}px)`;
+    }
+    // Non-chat contexts: allow browser to auto-fill columns; fixed min (thumbSize) ensures squares; tracks expand to distribute remaining space.
+    return `repeat(auto-fill, minmax(${thumbSize}px, 1fr))`;
+  }, [cols, thumbSize, distributeExtra, context]);
+  const stableWidth = undefined; // no fixed width
+
+  const handleKeyDown = useCallback(
+    (e, idx) => {
+      if (e.key === "Enter" || e.key === " ") {
+        e.preventDefault();
+        onToggle(idx);
+      }
+    },
+    [onToggle]
+  );
+
+  return (
+    <div
+      className="local-media-grid"
+      style={{
+        display: "grid",
+        gridTemplateColumns,
+        gap,
+        maxHeight: 420,
+        overflowY: "auto",
+        overflowX: "hidden",
+        padding: 4,
+        justifyContent: justifyMode,
+        width: stableWidth
+      }}
+      ref={containerRef}
+      role="list"
+      aria-label="media thumbnails"
+    >
+      {images.map((img, idx) => (
+        <div
+          key={img.filename || idx}
+          role="listitem"
+          tabIndex={0}
+          aria-label={img.filename || `image ${idx + 1}`}
+          onClick={() => onToggle(idx)}
+          onKeyDown={(e) => handleKeyDown(e, idx)}
+          style={{
+            position: "relative",
+            border: img.isSelected ? "2px solid #1890ff" : "1px solid #ccc",
+            outline: "none",
+            borderRadius: 4,
+            cursor: "pointer",
+            background: "#fafafa",
+            width: thumbSize,
+            height: thumbSize,
+            overflow: "hidden",
+            boxSizing: "border-box"
+          }}
+        >
+          {(() => {
+            const key = img.filename || idx;
+            const loaded = loadedMap.get(key) === true;
+            return (
+              <>
+                {!loaded && (
+                  <div
+                    aria-hidden="true"
+                    style={{
+                      position: "absolute",
+                      inset: 0,
+                      background: "#f0f0f0",
+                      display: "flex",
+                      alignItems: "center",
+                      justifyContent: "center",
+                      fontSize: 10,
+                      color: "#bbb"
+                    }}
+                  >
+                    {/* simple skeleton; no shimmer to reduce cost */}…
+                  </div>
+                )}
+                <img
+                  src={img.src}
+                  alt={img.filename || img.caption || "thumbnail"}
+                  loading="lazy"
+                  onLoad={() => handleImageLoad(key)}
+                  style={{
+                    width: thumbSize,
+                    height: thumbSize,
+                    objectFit: "cover",
+                    display: "block",
+                    borderRadius: 4,
+                    opacity: loaded ? 1 : 0,
+                    transition: "opacity .25s ease"
+                  }}
+                />
+              </>
+            );
+          })()}
+          {img.isSelected && (
+            <div
+              aria-hidden="true"
+              style={{
+                position: "absolute",
+                inset: 0,
+                background: "rgba(24,144,255,0.45)",
+                borderRadius: 4
+              }}
+            />
+          )}
+        </div>
+      ))}
+      {/* No placeholders needed; layout uses auto-fit for non-chat or fixed columns for chat */}
+    </div>
+  );
+}
+
+export default LocalMediaGrid;

client/src/components/jobs-list/jobs-list.component.jsx

@@ -166,7 +166,7 @@ export function JobsList({ bodyshop }) {
             .filter(onlyUnique)
             .map((s) => {
               return {
-                text: s || "No Status*",
+                text: s || t("dashboard.errors.status"),
                 value: [s]
               };
             })

client/src/components/jobs-ready-list/jobs-ready-list.component.jsx

@@ -165,7 +165,7 @@ export function JobsReadyList({ bodyshop }) {
             .filter(onlyUnique)
             .map((s) => {
               return {
-                text: s || "No Status*",
+                text: s || t("dashboard.errors.status"),
                 value: [s]
               };
             })

client/src/components/parts-queue-card/parts-queue-job-lines.component.jsx

@@ -145,7 +145,7 @@ export function PartsQueueJobLinesComponent({ loading, jobLines }) {
             .filter(onlyUnique)
             .map((s) => {
               return {
-                text: s || "No Status*",
+                text: s || t("dashboard.errors.status"),
                 value: [s]
               };
             })) ||

client/src/components/parts-queue-list/parts-queue.list.component.jsx

@@ -171,7 +171,7 @@ export function PartsQueueListComponent({ bodyshop }) {
       filters:
         bodyshop.md_ro_statuses.active_statuses.map((s) => {
           return {
-            text: s || "No Status*",
+            text: s || t("dashboard.errors.status"),
             value: [s]
           };
         }) || [],

client/src/components/production-list-columns/production-list-columns.data.jsx

@@ -34,8 +34,9 @@ const getEmployeeName = (employeeId, employees) => {
   return employee ? `${employee.first_name} ${employee.last_name}` : "";
 };
 
-const r = ({ technician, state, activeStatuses, data, bodyshop, refetch, treatments }) => {
+const productionListColumnsData = ({ technician, state, activeStatuses, data, bodyshop, refetch, treatments }) => {
   const { Enhanced_Payroll } = treatments;
+
   return [
     {
       title: i18n.t("jobs.actions.viewdetail"),
@@ -313,7 +314,7 @@ const r = ({ technician, state, activeStatuses, data, bodyshop, refetch, treatme
         activeStatuses
           ?.map((s) => {
             return {
-              text: s || "No Status*",
+              text: s || i18n.t("dashboard.errors.status"),
               value: [s]
             };
           })
@@ -584,4 +585,4 @@ const r = ({ technician, state, activeStatuses, data, bodyshop, refetch, treatme
     }
   ];
 };
-export default r;
+export default productionListColumnsData;

client/src/components/production-list-columns/production-list-columns.empassignment.component.jsx

@@ -144,7 +144,7 @@ export function ProductionListEmpAssignment({ insertAuditTrail, bodyshop, record
       <Spin spinning={loading}>
         {record[type] ? (
           <div>
-            <span>{`${theEmployee.first_name || ""} ${theEmployee.last_name || ""}`}</span>
+            <span>{`${theEmployee?.first_name || ""} ${theEmployee?.last_name || ""}`}</span>
             <DeleteFilled style={iconStyle} onClick={() => handleRemove(type)} />
           </div>
         ) : (

client/src/components/report-center-modal/report-center-modal.component.jsx

@@ -143,7 +143,7 @@ export function ReportCenterModalComponent({ reportCenterModal, bodyshop }) {
 
   //TODO: Find a way to filter out / blur on demand.
   return (
-    <div>
+    <div className="report-center-modal">
       <Form onFinish={handleFinish} autoComplete={"off"} layout="vertical" form={form}>
         <Input.Search onChange={(e) => setSearch(e.target.value)} value={search} />
         <Form.Item name="defaultSorters" hidden />
@@ -163,13 +163,14 @@ export function ReportCenterModalComponent({ reportCenterModal, bodyshop }) {
               {Object.keys(grouped)
                 //.filter((key) => !groupExcludeKeyFilter.includes(key))
                 .map((key) => (
-                  <Col md={8} sm={12} key={key}>
+                  <Col xs={24} sm={12} md={Object.keys(grouped).length === 1 ? 24 : 8} key={key}>
                     <Card.Grid
                       style={{
                         width: "100%",
                         height: "100%",
                         maxHeight: "33vh",
-                        overflowY: "scroll"
+                        overflowY: "scroll",
+                        minWidth: "200px"
                       }}
                     >
                       <Typography.Title level={4}>{t(`reportcenter.labels.groups.${key}`)}</Typography.Title>
@@ -177,7 +178,7 @@ export function ReportCenterModalComponent({ reportCenterModal, bodyshop }) {
                         <BlurWrapperComponent
                           featureName={groupExcludeKeyFilter.find((g) => g.key === key).featureName}
                         >
-                          <ul style={{ listStyleType: "none", columns: "2 auto" }}>
+                          <ul style={{ listStyleType: "none", columns: grouped[key].length > 4 ? "2 auto" : "1", padding: 0, margin: 0 }}>
                             {grouped[key].map((item) => (
                               <li key={item.key}>
                                 <Radio key={item.key} value={item.key}>
@@ -188,7 +189,7 @@ export function ReportCenterModalComponent({ reportCenterModal, bodyshop }) {
                           </ul>
                         </BlurWrapperComponent>
                       ) : (
-                        <ul style={{ listStyleType: "none", columns: "2 auto" }}>
+                        <ul style={{ listStyleType: "none", columns: grouped[key].length > 4 ? "2 auto" : "1", padding: 0, margin: 0 }}>
                           {grouped[key].map((item) =>
                             item.featureNameRestricted ? (
                               <li key={item.key}>

client/src/components/report-center-modal/report-center-modal.styles.scss

@@ -11,3 +11,38 @@
     }
   }
 }
+
+// Report center modal fixes for column layout
+.report-center-modal {
+  .ant-form-item .ant-radio-group {
+    width: 100%;
+    
+    .ant-card-grid {
+      padding: 16px;
+      box-sizing: border-box;
+      
+      ul {
+        width: 100%;
+        
+        li {
+          margin-bottom: 8px;
+          break-inside: avoid;
+          page-break-inside: avoid;
+          
+          .ant-radio-wrapper {
+            display: flex;
+            align-items: flex-start;
+            width: 100%;
+            
+            span:not(.ant-radio) {
+              word-break: break-word;
+              overflow-wrap: break-word;
+              hyphens: auto;
+              flex: 1;
+            }
+          }
+        }
+      }
+    }
+  }
+}

client/src/components/shop-info/shop-info.general.component.jsx

@@ -425,7 +425,15 @@ export function ShopInfoGeneral({ form, bodyshop }) {
                     ]
                   : [])
               ]
-            : [])
+            : []),
+          <Form.Item
+            key="accumulatePayableLines"
+            name={["accountingconfig", "accumulatePayableLines"]}
+            label={t("bodyshop.fields.accumulatePayableLines")}
+            valuePropName="checked"
+          >
+            <Switch />
+          </Form.Item>
         ]}
       </LayoutFormRow>
       <FeatureWrapper featureName="scoreboard" noauth={() => null}>

client/src/components/shop-info/shop-info.notifications-autoadd.component.jsx

@@ -16,6 +16,7 @@ export default function ShopInfoNotificationsAutoadd({ bodyshop }) {
       <Text type="secondary">{t("bodyshop.labels.notifications.followers")}</Text>
       {employeeOptions.length > 0 ? (
         <Form.Item
+          normalize={(value) => (value || []).filter((id) => typeof id === "string" && id.trim() !== "")}
           name="notification_followers"
           rules={[
             {
@@ -42,11 +43,6 @@ export default function ShopInfoNotificationsAutoadd({ bodyshop }) {
             options={employeeOptions}
             placeholder={t("bodyshop.fields.notifications.placeholder")}
             showEmail={true}
-            onChange={(value) => {
-              // Filter out null or invalid values before passing to Form
-              const cleanedValue = value?.filter((id) => id != null && typeof id === "string" && id.trim() !== "");
-              return cleanedValue;
-            }}
           />
         </Form.Item>
       ) : (

client/src/components/shop-info/shop-info.responsibilitycenters.component.jsx

@@ -138,6 +138,15 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                   <Switch />
                 </Form.Item>
               )}
+              {bodyshop.pbs_serialnumber && (
+                <Form.Item
+                  label={t("bodyshop.fields.dms.ro_posting")}
+                  valuePropName="checked"
+                  name={["pbs_configuration", "ro_posting"]}
+                >
+                  <Switch />
+                </Form.Item>
+              )}
               {bodyshop.pbs_serialnumber && (
                 <Form.Item
                   label={t("bodyshop.fields.dms.appostingaccount")}

client/src/components/shop-info/shop-info.speedprint.component.jsx

@@ -4,10 +4,18 @@ import { useTranslation } from "react-i18next";
 import { TemplateList } from "../../utils/TemplateConstants";
 import FormListMoveArrows from "../form-list-move-arrows/form-list-move-arrows.component";
 import LayoutFormRow from "../layout-form-row/layout-form-row.component";
+import InstanceRenderManager from "../../utils/instanceRenderMgr";
 
 export default function ShopInfoSpeedPrint() {
   const { t } = useTranslation();
-  const TemplateListGenerated = TemplateList("job");
+  const allTemplates = TemplateList("job");
+  const TemplateListGenerated = InstanceRenderManager({
+    imex: Object.fromEntries(
+      Object.entries(allTemplates).filter(([, { enhanced_payroll }]) => !enhanced_payroll)
+    ),
+    rome: allTemplates
+  });
+
   return (
     <Form.List name={["speedprint"]}>
       {(fields, { add, remove, move }) => {

client/src/components/simplified-parts-jobs-list/simplified-parts-jobs-list.component.jsx

@@ -103,7 +103,7 @@ export function SimplifiedPartsJobsListComponent({
         return record.status || t("general.labels.na");
       },
       filteredValue: filter?.status || null,
-      filters: bodyshop.md_ro_statuses?.parts_statuses.map((s) => {
+      filters: bodyshop?.md_ro_statuses?.parts_statuses?.map((s) => {
         return { text: s, value: [s] };
       }),
       onFilter: (value, record) => value.includes(record.status)

client/src/components/tech-header/tech-header.component.jsx

@@ -16,7 +16,7 @@ const mapDispatchToProps = () => ({
 export function TechHeader({ technician }) {
   const { t } = useTranslation();
   return (
-    <Header style={{ textAlign: "center" }}>
+    <Header style={{ textAlign: "center", height: "auto", overflow: "visible" }}>
       <Typography.Title style={{ color: "#fff" }}>
         {technician
           ? t("tech.labels.loggedin", {

client/src/components/tech-job-clock-out-button/tech-job-clock-out-button.component.jsx

@@ -1,5 +1,5 @@
 import { useMutation, useQuery } from "@apollo/client";
-import { Button, Card, Col, Form, InputNumber, Popover, Row, Select } from "antd";
+import { Button, Card, Form, InputNumber, Popover, Select, Space } from "antd";
 import axios from "axios";
 import { useState } from "react";
 import { useTranslation } from "react-i18next";
@@ -124,103 +124,12 @@ export function TechClockOffButton({
             cost_center: isShiftTicket ? "timetickets.labels.shift" : technician ? technician.cost_center : null
           }}
         >
-          <Row gutter={[16, 16]}>
-            <Col span={!isShiftTicket ? 8 : 24}>
-              {!isShiftTicket ? (
-                <div>
-                  <Form.Item
-                    label={t("timetickets.fields.actualhrs")}
-                    name="actualhrs"
-                    rules={[
-                      {
-                        required: true
-                        //message: t("general.validation.required"),
-                      }
-                    ]}
-                  >
-                    <InputNumber min={0} precision={1} />
-                  </Form.Item>
-                  <Form.Item
-                    label={t("timetickets.fields.productivehrs")}
-                    name="productivehrs"
-                    rules={[
-                      {
-                        required: true
-                        //message: t("general.validation.required"),
-                      },
-                      ({ getFieldValue }) => ({
-                        validator(rule, value) {
-                          if (!bodyshop.tt_enforce_hours_for_tech_console) {
-                            return Promise.resolve();
-                          }
-                          if (!value || getFieldValue("cost_center") === null || !lineTicketData)
-                            return Promise.resolve();
-
-                          //Check the cost center,
-                          const totals = CalculateAllocationsTotals(
-                            bodyshop,
-                            lineTicketData.joblines,
-                            lineTicketData.timetickets,
-                            lineTicketData.jobs_by_pk.lbr_adjustments
-                          );
-
-                          const fieldTypeToCheck =
-                            bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber ? "mod_lbr_ty" : "cost_center";
-
-                          const costCenterDiff =
-                            Math.round(
-                              totals.find((total) => total[fieldTypeToCheck] === getFieldValue("cost_center"))
-                                ?.difference * 10
-                            ) / 10;
-
-                          if (value > costCenterDiff)
-                            return Promise.reject(t("timetickets.validation.hoursenteredmorethanavailable"));
-                          else {
-                            return Promise.resolve();
-                          }
-                        }
-                      })
-                    ]}
-                  >
-                    <InputNumber min={0} precision={1} />
-                  </Form.Item>
-                </div>
-              ) : null}
-              <Form.Item
-                name="cost_center"
-                label={t("timetickets.fields.cost_center")}
-                rules={[
-                  {
-                    required: true
-                    //message: t("general.validation.required"),
-                  }
-                ]}
-              >
-                <Select disabled={isShiftTicket}>
-                  {isShiftTicket ? (
-                    <Select.Option value="timetickets.labels.shift">{t("timetickets.labels.shift")}</Select.Option>
-                  ) : (
-                    emps &&
-                    emps.rates.map((item) => (
-                      <Select.Option key={item.cost_center}>
-                        {item.cost_center === "timetickets.labels.shift"
-                          ? t(item.cost_center)
-                          : bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber
-                            ? t(`joblines.fields.lbr_types.${item.cost_center.toUpperCase()}`)
-                            : item.cost_center}
-                      </Select.Option>
-                    ))
-                  )}
-                </Select>
-              </Form.Item>
-
-              {isShiftTicket ? (
-                <div></div>
-              ) : (
+          <Space direction="vertical">
+            {!isShiftTicket ? (
+              <div>
                 <Form.Item
-                  name="status"
-                  label={t("jobs.fields.status")}
-                  initialValue={lineTicketData && lineTicketData.jobs_by_pk.status}
+                  label={t("timetickets.fields.actualhrs")}
+                  name="actualhrs"
                   rules={[
                     {
                       required: true
@@ -228,35 +137,117 @@ export function TechClockOffButton({
                     }
                   ]}
                 >
-                  <Select>
-                    {bodyshop.md_ro_statuses.production_statuses.map((item) => (
-                      <Select.Option key={item}></Select.Option>
-                    ))}
-                  </Select>
+                  <InputNumber min={0} precision={1} />
                 </Form.Item>
-              )}
-              <Button type="primary" htmlType="submit" loading={loading}>
-                {t("general.actions.save")}
-              </Button>
-              <TechJobClockoutDelete completedCallback={completedCallback} timeTicketId={timeTicketId} />
-            </Col>
-            {!isShiftTicket && (
-              <Col span={16}>
-                <LaborAllocationContainer
-                  jobid={jobId || null}
-                  loading={queryLoading}
-                  lineTicketData={lineTicketData}
-                />
-              </Col>
+                <Form.Item
+                  label={t("timetickets.fields.productivehrs")}
+                  name="productivehrs"
+                  rules={[
+                    {
+                      required: true
+                      //message: t("general.validation.required"),
+                    },
+                    ({ getFieldValue }) => ({
+                      validator(rule, value) {
+                        if (!bodyshop.tt_enforce_hours_for_tech_console) {
+                          return Promise.resolve();
+                        }
+                        if (!value || getFieldValue("cost_center") === null || !lineTicketData)
+                          return Promise.resolve();
+                        //Check the cost center,
+                        const totals = CalculateAllocationsTotals(
+                          bodyshop,
+                          lineTicketData.joblines,
+                          lineTicketData.timetickets,
+                          lineTicketData.jobs_by_pk.lbr_adjustments
+                        );
+                        const fieldTypeToCheck =
+                          bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber ? "mod_lbr_ty" : "cost_center";
+                        const costCenterDiff =
+                          Math.round(
+                            totals.find((total) => total[fieldTypeToCheck] === getFieldValue("cost_center"))
+                              ?.difference * 10
+                          ) / 10;
+                        if (value > costCenterDiff)
+                          return Promise.reject(t("timetickets.validation.hoursenteredmorethanavailable"));
+                        else {
+                          return Promise.resolve();
+                        }
+                      }
+                    })
+                  ]}
+                >
+                  <InputNumber min={0} precision={1} />
+                </Form.Item>
+              </div>
+            ) : null}
+            <Form.Item
+              name="cost_center"
+              label={t("timetickets.fields.cost_center")}
+              rules={[
+                {
+                  required: true
+                  //message: t("general.validation.required"),
+                }
+              ]}
+            >
+              <Select disabled={isShiftTicket}>
+                {isShiftTicket ? (
+                  <Select.Option value="timetickets.labels.shift">{t("timetickets.labels.shift")}</Select.Option>
+                ) : (
+                  emps &&
+                  emps.rates.map((item) => (
+                    <Select.Option key={item.cost_center}>
+                      {item.cost_center === "timetickets.labels.shift"
+                        ? t(item.cost_center)
+                        : bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber
+                          ? t(`joblines.fields.lbr_types.${item.cost_center.toUpperCase()}`)
+                          : item.cost_center}
+                    </Select.Option>
+                  ))
+                )}
+              </Select>
+            </Form.Item>
+            {isShiftTicket ? (
+              <div></div>
+            ) : (
+              <Form.Item
+                name="status"
+                label={t("jobs.fields.status")}
+                initialValue={lineTicketData && lineTicketData.jobs_by_pk.status}
+                rules={[
+                  {
+                    required: true
+                    //message: t("general.validation.required"),
+                  }
+                ]}
+              >
+                <Select>
+                  {bodyshop.md_ro_statuses.production_statuses.map((item) => (
+                    <Select.Option key={item}></Select.Option>
+                  ))}
+                </Select>
+              </Form.Item>
             )}
-          </Row>
+            <Button type="primary" htmlType="submit" loading={loading}>
+              {t("general.actions.save")}
+            </Button>
+            <TechJobClockoutDelete completedCallback={completedCallback} timeTicketId={timeTicketId} />
+            {!isShiftTicket && (
+              <LaborAllocationContainer jobid={jobId || null} loading={queryLoading} lineTicketData={lineTicketData} />
+            )}
+          </Space>
         </Form>
       </div>
     </Card>
   );
 
   return (
-    <Popover content={overlay} trigger="click">
+    <Popover 
+      content={<div style={{ maxHeight: "75vh", overflowY: "auto" }}>{overlay}</div>} 
+      trigger="click"
+      getPopupContainer={() => document.querySelector('#time-ticket-modal')}
+    >
       <Button loading={loading} {...otherBtnProps}>
         {t("timetickets.actions.clockout")}
       </Button>

client/src/components/tech-lookup-jobs-list/tech-lookup-jobs-list.component.jsx

@@ -111,7 +111,7 @@ export function TechLookupJobsList({ bodyshop }) {
             .filter(onlyUnique)
             .map((s) => {
               return {
-                text: s || "No Status*",
+                text: s || t("dashboard.errors.status"),
                 value: [s]
               };
             })) ||

client/src/firebase/firebase.utils.js

@@ -5,7 +5,7 @@ import { getFirestore } from "@firebase/firestore";
 import { getMessaging, getToken, onMessage } from "@firebase/messaging";
 import { store } from "../redux/store";
 //import * as amplitude from '@amplitude/analytics-browser';
-import posthog from 'posthog-js'
+// import posthog from 'posthog-js'
 
 const config = JSON.parse(import.meta.env.VITE_APP_FIREBASE_CONFIG);
 initializeApp(config);
@@ -74,7 +74,6 @@ onMessage(messaging, (payload) => {
 
 export const logImEXEvent = (eventName, additionalParams, stateProp = null) => {
   try {
-
     const state = stateProp || store.getState();
 
     const eventParams = {
@@ -99,8 +98,7 @@ export const logImEXEvent = (eventName, additionalParams, stateProp = null) => {
     // );
     logEvent(analytics, eventName, eventParams);
     //amplitude.track(eventName, eventParams);
-    posthog.capture(eventName, eventParams);
-
+    //posthog.capture(eventName, eventParams);
   } finally {
     //If it fails, just keep going.
   }

client/src/graphql/bills.queries.js

@@ -42,7 +42,7 @@ export const QUERY_ALL_BILLS_PAGINATED = gql`
         ro_number
       }
     }
-    bills_aggregate {
+    bills_aggregate(where: $where) {
       aggregate {
         count(distinct: true)
       }

client/src/graphql/bodyshop.queries.js

@@ -363,3 +363,25 @@ export const GET_ACTIVE_EMPLOYEES_IN_SHOP = gql`
     }
   }
 `;
+export const QUERY_MINIMAL_BODYSHOP = gql`
+  query QUERY_MINIMAL_BODYSHOP {
+    bodyshops(where: { associations: { active: { _eq: true } } }) {
+      id
+      shopname
+      associations(where: { active: { _eq: true } }) {
+        user {
+          email
+        }
+      }
+    }
+  }
+`;
+export const QUERY_DASHBOARD_BODYSHOP = gql`
+  query QUERY_DASHBOARD_BODYSHOP {
+    dashboard_bodyshops: bodyshops(where: { associations: { active: { _eq: true } } }) {
+      id
+      prodtargethrs
+      md_ro_statuses
+    }
+  }
+`;

client/src/graphql/conversations.queries.js

@@ -2,7 +2,27 @@ import { gql } from "@apollo/client";
 
 export const UNREAD_CONVERSATION_COUNT = gql`
   query UNREAD_CONVERSATION_COUNT {
-    messages_aggregate(where: { read: { _eq: false }, isoutbound: { _eq: false } }) {
+    # How many conversations have at least one unread inbound, non-system message
+    conversations_aggregate(
+      where: {
+        archived: { _eq: false }
+        messages: { read: { _eq: false }, isoutbound: { _eq: false }, is_system: { _eq: false } }
+      }
+    ) {
+      aggregate {
+        count
+      }
+    }
+
+    # How many unread inbound, non-system messages exist (excluding archived conversations)
+    messages_aggregate(
+      where: {
+        read: { _eq: false }
+        isoutbound: { _eq: false }
+        is_system: { _eq: false }
+        conversation: { archived: { _eq: false } }
+      }
+    ) {
       aggregate {
         count
       }
@@ -19,7 +39,7 @@ export const CONVERSATION_LIST_QUERY = gql`
       unreadcnt
       archived
       label
-      messages_aggregate(where: { read: { _eq: false }, isoutbound: { _eq: false } }) {
+      messages_aggregate(where: { read: { _eq: false }, isoutbound: { _eq: false }, is_system: { _eq: false } }) {
         aggregate {
           count
         }
@@ -41,6 +61,7 @@ export const CONVERSATION_SUBSCRIPTION_BY_PK = gql`
   subscription CONVERSATION_SUBSCRIPTION_BY_PK($conversationId: uuid!) {
     messages(order_by: { created_at: asc_nulls_first }, where: { conversationid: { _eq: $conversationId } }) {
       id
+      conversationid
       status
       text
       is_system
@@ -76,6 +97,7 @@ export const GET_CONVERSATION_DETAILS = gql`
       }
       messages(order_by: { created_at: asc_nulls_first }) {
         id
+        conversationid
         status
         text
         is_system
@@ -110,7 +132,7 @@ export const CONVERSATION_ID_BY_PHONE = gql`
           ro_number
         }
       }
-      messages_aggregate(where: { read: { _eq: false }, isoutbound: { _eq: false } }) {
+      messages_aggregate(where: { read: { _eq: false }, isoutbound: { _eq: false }, is_system: { _eq: false } }) {
         aggregate {
           count
         }
@@ -139,7 +161,7 @@ export const CREATE_CONVERSATION = gql`
             ro_number
           }
         }
-        messages_aggregate(where: { read: { _eq: false }, isoutbound: { _eq: false } }) {
+        messages_aggregate(where: { read: { _eq: false }, isoutbound: { _eq: false }, is_system: { _eq: false } }) {
           aggregate {
             count
           }

client/src/graphql/jobs.queries.js

@@ -424,6 +424,7 @@ export const GET_JOB_BY_PK = gql`
       actual_delivery
       actual_in
       acv_amount
+      admin_clerk
       adjustment_bottom_line
       alt_transport
       area_of_damage
@@ -2347,12 +2348,13 @@ export const MARK_JOB_AS_UNINVOICED = gql`
   mutation MARK_JOB_AS_UNINVOICED($jobId: uuid!, $default_delivered: String!) {
     update_jobs_by_pk(
       pk_columns: { id: $jobId }
-      _set: { date_exported: null, date_invoiced: null, status: $default_delivered }
+      _set: { date_exported: null, date_invoiced: null, status: $default_delivered, admin_clerk: null }
     ) {
       id
       date_exported
       date_invoiced
       status
+      admin_clerk
     }
   }
 `;

client/src/graphql/user.queries.js

@@ -135,3 +135,12 @@ export const UPDATE_NOTIFICATIONS_AUTOADD = gql`
     }
   }
 `;
+
+export const QUERY_USER_DASHBOARD_LAYOUT = gql`
+  query QUERY_USER_DASHBOARD_LAYOUT($email: String!) {
+    users(where: { email: { _eq: $email } }) {
+      email
+      dashboardlayout
+    }
+  }
+`;

client/src/pages/bills/bills.page.component.jsx

@@ -16,7 +16,6 @@ import { DateFormatter } from "../../utils/DateFormatter";
 import { TemplateList } from "../../utils/TemplateConstants";
 import { pageLimit } from "../../utils/config";
 import { alphaSort, dateSort } from "../../utils/sorters";
-import useLocalStorage from "../../utils/useLocalStorage";
 import { QUERY_ALL_VENDORS } from "../../graphql/vendors.queries";
 import { logImEXEvent } from "../../firebase/firebase.utils";
 
@@ -24,16 +23,12 @@ const mapDispatchToProps = (dispatch) => ({
   setBillEnterContext: (context) => dispatch(setModalContext({ context: context, modal: "billEnter" }))
 });
 
-export function BillsListPage({ loading, data, refetch, total, setBillEnterContext }) {
+export function BillsListPage({ loading, data, refetch, total, setBillEnterContext, handleTableChange, sortedInfo }) {
   const search = queryString.parse(useLocation().search);
   const [openSearchResults, setOpenSearchResults] = useState([]);
   const [searchLoading, setSearchLoading] = useState(false);
   const { page } = search;
   const history = useNavigate();
-  const [state, setState] = useLocalStorage("bills_list_sort", {
-    sortedInfo: {},
-    filteredInfo: { vendorname: [] }
-  });
   const Templates = TemplateList("bill");
   const { t } = useTranslation();
 
@@ -50,7 +45,7 @@ export function BillsListPage({ loading, data, refetch, total, setBillEnterConte
       }),
       filters: (vendorsData?.vendors || []).map((v) => ({ text: v.name, value: v.id })),
       filteredValue: search.vendorIds ? search.vendorIds.split(",") : null,
-      sortOrder: state.sortedInfo.columnKey === "vendorname" && state.sortedInfo.order,
+      sortOrder: sortedInfo.columnKey === "vendorname" && sortedInfo.order,
       render: (text, record) => <span>{record.vendor.name}</span>
     },
     {
@@ -58,7 +53,7 @@ export function BillsListPage({ loading, data, refetch, total, setBillEnterConte
       dataIndex: "invoice_number",
       key: "invoice_number",
       sorter: (a, b) => alphaSort(a.invoice_number, b.invoice_number),
-      sortOrder: state.sortedInfo.columnKey === "invoice_number" && state.sortedInfo.order
+      sortOrder: sortedInfo.columnKey === "invoice_number" && sortedInfo.order
     },
     {
       title: t("jobs.fields.ro_number"),
@@ -68,7 +63,7 @@ export function BillsListPage({ loading, data, refetch, total, setBillEnterConte
       sortObject: (order) => ({
         job: { ro_number: order === "descend" ? "desc" : "asc" }
       }),
-      sortOrder: state.sortedInfo.columnKey === "ro_number" && state.sortedInfo.order,
+      sortOrder: sortedInfo.columnKey === "ro_number" && sortedInfo.order,
       render: (text, record) => record.job && <Link to={`/manage/jobs/${record.job.id}`}>{record.job.ro_number}</Link>
     },
     {
@@ -76,7 +71,7 @@ export function BillsListPage({ loading, data, refetch, total, setBillEnterConte
       dataIndex: "date",
       key: "date",
       sorter: (a, b) => dateSort(a.date, b.date),
-      sortOrder: state.sortedInfo.columnKey === "date" && state.sortedInfo.order,
+      sortOrder: sortedInfo.columnKey === "date" && sortedInfo.order,
       render: (text, record) => <DateFormatter>{record.date}</DateFormatter>
     },
     {
@@ -84,7 +79,7 @@ export function BillsListPage({ loading, data, refetch, total, setBillEnterConte
       dataIndex: "total",
       key: "total",
       sorter: (a, b) => a.total - b.total,
-      sortOrder: state.sortedInfo.columnKey === "total" && state.sortedInfo.order,
+      sortOrder: sortedInfo.columnKey === "total" && sortedInfo.order,
       render: (text, record) => <CurrencyFormatter>{record.total}</CurrencyFormatter>
     },
     {
@@ -92,7 +87,7 @@ export function BillsListPage({ loading, data, refetch, total, setBillEnterConte
       dataIndex: "is_credit_memo",
       key: "is_credit_memo",
       sorter: (a, b) => a.is_credit_memo - b.is_credit_memo,
-      sortOrder: state.sortedInfo.columnKey === "is_credit_memo" && state.sortedInfo.order,
+      sortOrder: sortedInfo.columnKey === "is_credit_memo" && sortedInfo.order,
       render: (text, record) => <Checkbox checked={record.is_credit_memo} />
     },
     {
@@ -100,7 +95,7 @@ export function BillsListPage({ loading, data, refetch, total, setBillEnterConte
       dataIndex: "exported",
       key: "exported",
       sorter: (a, b) => a.exported - b.exported,
-      sortOrder: state.sortedInfo.columnKey === "exported" && state.sortedInfo.order,
+      sortOrder: sortedInfo.columnKey === "exported" && sortedInfo.order,
       render: (text, record) => <Checkbox checked={record.exported} />
     },
     {
@@ -164,37 +159,7 @@ export function BillsListPage({ loading, data, refetch, total, setBillEnterConte
     }
   ];
 
-  const handleTableChange = (pagination, filters, sorter) => {
-    setState({
-      sortedInfo: sorter,
-      filteredInfo: { ...state.filteredInfo, vendorname: filters.vendorname || [] }
-    });
-
-    search.page = pagination.current;
-    if (filters.vendorname && filters.vendorname.length) {
-      search.vendorIds = filters.vendorname.join(",");
-    } else {
-      delete search.vendorIds;
-    }
-    if (sorter && sorter.column && sorter.column.sortObject) {
-      search.searchObj = JSON.stringify(sorter.column.sortObject(sorter.order));
-      delete search.sortcolumn;
-      delete search.sortorder;
-    } else {
-      delete search.searchObj;
-      search.sortcolumn = sorter.order ? sorter.columnKey : null;
-      search.sortorder = sorter.order;
-    }
-    history({ search: queryString.stringify(search) });
-    logImEXEvent("bills_list_sort_filter", { pagination, filters, sorter });
-  };
-
-  useEffect(() => {
-    if (!search.vendorIds && state.filteredInfo.vendorname && state.filteredInfo.vendorname.length) {
-      search.vendorIds = state.filteredInfo.vendorname.join(",");
-      history({ search: queryString.stringify(search) });
-    }
-  }, []);
+  // (State & URL handling moved to container - Option C)
 
   useEffect(() => {
     if (search.search && search.search.trim() !== "") {

client/src/pages/bills/bills.page.container.jsx

@@ -3,13 +3,14 @@ import queryString from "query-string";
 import { useEffect } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
-import { useLocation } from "react-router-dom";
+import { useLocation, useNavigate } from "react-router-dom";
 import AlertComponent from "../../components/alert/alert.component";
 import BillDetailEditContainer from "../../components/bill-detail-edit/bill-detail-edit.container";
 import RbacWrapper from "../../components/rbac-wrapper/rbac-wrapper.component";
 import { QUERY_ALL_BILLS_PAGINATED } from "../../graphql/bills.queries";
 import { setBreadcrumbs, setSelectedHeader } from "../../redux/application/application.actions";
 import BillsPageComponent from "./bills.page.component";
+import useLocalStorage from "../../utils/useLocalStorage";
 import { pageLimit } from "../../utils/config";
 import FeatureWrapperComponent from "../../components/feature-wrapper/feature-wrapper.component";
 import InstanceRenderManager from "../../utils/instanceRenderMgr";
@@ -23,7 +24,9 @@ const mapDispatchToProps = (dispatch) => ({
 
 export function BillsPageContainer({ setBreadcrumbs, setSelectedHeader }) {
   const { t } = useTranslation();
-  const searchParams = queryString.parse(useLocation().search);
+  const location = useLocation();
+  const history = useNavigate();
+  const searchParams = queryString.parse(location.search);
   const { page, sortcolumn, sortorder, searchObj } = searchParams;
 
   useEffect(() => {
@@ -37,6 +40,12 @@ export function BillsPageContainer({ setBreadcrumbs, setSelectedHeader }) {
     setBreadcrumbs([{ link: "/manage/bills", label: t("titles.bc.bills-list") }]);
   }, [t, setBreadcrumbs, setSelectedHeader]);
 
+  // Persisted table state (sorting & filtering)
+  const [persistState, setPersistState] = useLocalStorage("bills_list_sort", {
+    sortedInfo: {},
+    filteredInfo: { vendorname: [] }
+  });
+
   const { loading, error, data, refetch } = useQuery(QUERY_ALL_BILLS_PAGINATED, {
     fetchPolicy: "network-only",
     nextFetchPolicy: "network-only",
@@ -54,6 +63,90 @@ export function BillsPageContainer({ setBreadcrumbs, setSelectedHeader }) {
     }
   });
 
+  const handleTableChange = (pagination, filters, sorter) => {
+    const search = queryString.parse(location.search);
+
+    const vendorArr = filters?.vendorname ?? [];
+    const newVendorIds = vendorArr.length ? vendorArr.join(",") : undefined;
+    const vendorFilterChanged = search.vendorIds !== newVendorIds;
+
+    search.page = vendorFilterChanged || !search.page ? 1 : pagination.current;
+    newVendorIds ? (search.vendorIds = newVendorIds) : delete search.vendorIds;
+
+    const { columnKey, order, column } = sorter || {};
+    if (column?.sortObject) {
+      search.searchObj = JSON.stringify(column.sortObject(order));
+      delete search.sortcolumn;
+      delete search.sortorder;
+    } else {
+      delete search.searchObj;
+      search.sortcolumn = order ? columnKey : null;
+      search.sortorder = order ?? null; // keep explicit null to mirror prior behavior
+    }
+
+    setPersistState({
+      sortedInfo: sorter || {},
+      filteredInfo: { vendorname: vendorArr }
+    });
+
+    history({ search: queryString.stringify(search) });
+  };
+
+  useEffect(() => {
+    const search = queryString.parse(location.search);
+    let changed = false;
+
+    const vendorPersisted = persistState.filteredInfo.vendorname || [];
+    if (!search.vendorIds && vendorPersisted.length) {
+      search.vendorIds = vendorPersisted.join(",");
+      search.page = 1; // reset page when injecting filter
+      changed = true;
+    }
+
+    const { sortedInfo } = persistState;
+    if (!search.searchObj && !search.sortcolumn && sortedInfo?.order) {
+      const { columnKey, order } = sortedInfo;
+      if (columnKey) {
+        const dir = order === "descend" ? "desc" : "asc";
+        if (columnKey === "vendorname") {
+          search.searchObj = JSON.stringify({ vendor: { name: dir } });
+        } else if (columnKey === "ro_number") {
+          search.searchObj = JSON.stringify({ job: { ro_number: dir } });
+        } else {
+          search.sortcolumn = columnKey;
+          search.sortorder = order;
+        }
+        changed = true;
+      }
+    }
+
+    if (changed) {
+      history({ search: queryString.stringify(search) });
+      return;
+    }
+
+    const hasPersistSort = !!sortedInfo?.order;
+    const hasUrlSort = !!(search.searchObj || (search.sortcolumn && search.sortorder));
+    if (!hasPersistSort && hasUrlSort) {
+      let derived = {};
+      if (search.searchObj) {
+        try {
+          const o = JSON.parse(search.searchObj);
+          if (o.vendor?.name) {
+            derived = { columnKey: "vendorname", order: o.vendor.name === "desc" ? "descend" : "ascend" };
+          } else if (o.job?.ro_number) {
+            derived = { columnKey: "ro_number", order: o.job.ro_number === "desc" ? "descend" : "ascend" };
+          }
+        } catch {
+          /* ignore parse errors */
+        }
+      } else {
+        derived = { columnKey: search.sortcolumn, order: search.sortorder };
+      }
+      if (derived.order) setPersistState((prev) => ({ ...prev, sortedInfo: derived }));
+    }
+  }, [location.search]);
+
   if (error) return <AlertComponent message={error.message} type="error" />;
   return (
     <FeatureWrapperComponent
@@ -71,6 +164,8 @@ export function BillsPageContainer({ setBreadcrumbs, setSelectedHeader }) {
             loading={loading}
             refetch={refetch}
             total={data ? data.bills_aggregate.aggregate.count : 0}
+            handleTableChange={handleTableChange}
+            sortedInfo={persistState.sortedInfo || {}}
           />
 
           <BillDetailEditContainer />

client/src/pages/dms/dms.container.jsx

@@ -48,7 +48,7 @@ export const socket = SocketIO(
 
 export function DmsContainer({ bodyshop, setBreadcrumbs, setSelectedHeader, insertAuditTrail }) {
   const { t } = useTranslation();
-  const [logLevel, setLogLevel] = useState("DEBUG");
+  const [logLevel, setLogLevel] = useState(determineDmsType(bodyshop) === "pbs" ? "INFO" : "DEBUG");
   const history = useNavigate();
   const [logs, setLogs] = useState([]);
   const search = queryString.parse(useLocation().search);

client/src/pages/jobs-close/jobs-close.component.jsx

@@ -39,13 +39,14 @@ import { UPDATE_JOB } from "../../graphql/jobs.queries";
 import { insertAuditTrail } from "../../redux/application/application.actions";
 import { selectJobReadOnly } from "../../redux/application/application.selectors";
 import { setModalContext } from "../../redux/modals/modals.actions.js";
-import { selectBodyshop } from "../../redux/user/user.selectors";
+import { selectBodyshop, selectCurrentUser } from "../../redux/user/user.selectors";
 import AuditTrailMapping from "../../utils/AuditTrailMappings";
 import dayjs from "../../utils/day";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
-  jobRO: selectJobReadOnly
+  jobRO: selectJobReadOnly,
+  currentUser: selectCurrentUser
 });
 
 const mapDispatchToProps = (dispatch) => ({
@@ -59,7 +60,7 @@ const mapDispatchToProps = (dispatch) => ({
     )
 });
 
-export function JobsCloseComponent({ job, bodyshop, jobRO, insertAuditTrail, setPrintCenterContext }) {
+export function JobsCloseComponent({ job, bodyshop, jobRO, insertAuditTrail, setPrintCenterContext, currentUser }) {
   const { t } = useTranslation();
   const [form] = Form.useForm();
   const client = useApolloClient();
@@ -97,6 +98,7 @@ export function JobsCloseComponent({ job, bodyshop, jobRO, insertAuditTrail, set
           kmin: values.kmin,
           kmout: values.kmout,
           dms_allocation: values.dms_allocation,
+          admin_clerk: currentUser.email,
           ...(removefromproduction ? { inproduction: false } : {}),
           ...(values.qb_multiple_payers ? { qb_multiple_payers: values.qb_multiple_payers } : {})
         }

client/src/pages/tech-assigned-prod-jobs/tech-assigned-prod-jobs.component.jsx

@@ -97,7 +97,7 @@ export function TechAssignedProdJobs({ setTimeTicketTaskContext, technician, bod
             .filter(onlyUnique)
             .map((s) => {
               return {
-                text: s || "No Status*",
+                text: s || t("dashboard.errors.status"),
                 value: [s]
               };
             })) ||

client/src/redux/media/media.reducer.js

@@ -19,29 +19,19 @@ const mediaReducer = (state = INITIAL_STATE, action) => {
     case MediaActionTypes.TOGGLE_MEDIA_SELECTED:
       return {
         ...state,
-        [action.payload.jobid]: state[action.payload.jobid].map((p) => {
-          if (p.filename === action.payload.filename) {
-            p.isSelected = !p.isSelected;
-          }
-          return p;
-        })
+        [action.payload.jobid]: state[action.payload.jobid].map((p) =>
+          p.filename === action.payload.filename ? { ...p, isSelected: !p.isSelected } : p
+        )
       };
     case MediaActionTypes.SELECT_ALL_MEDIA_FOR_JOB:
       return {
         ...state,
-        [action.payload.jobid]: state[action.payload.jobid].map((p) => {
-          p.isSelected = true;
-
-          return p;
-        })
+        [action.payload.jobid]: state[action.payload.jobid].map((p) => ({ ...p, isSelected: true }))
       };
     case MediaActionTypes.DESELECT_ALL_MEDIA_FOR_JOB:
       return {
         ...state,
-        [action.payload.jobid]: state[action.payload.jobid].map((p) => {
-          p.isSelected = false;
-          return p;
-        })
+        [action.payload.jobid]: state[action.payload.jobid].map((p) => ({ ...p, isSelected: false }))
       };
     default:
       return state;

client/src/redux/media/media.sagas.js

@@ -17,9 +17,10 @@ export function* getJobMedia({ payload: jobid }) {
       const imagesFetch = yield cleanAxios.post(
         `${localmediaserverhttp}/jobs/list`,
         {
-          jobid
+          jobid,
+
         },
-        { headers: { ims_token: bodyshop.localmediatoken } }
+        { headers: { ims_token: bodyshop.localmediatoken, bodyshopid: bodyshop.id } }
       );
       const documentsFetch = yield cleanAxios.post(
         `${localmediaserverhttp}/bills/list`,

client/src/redux/media/media.selectors.js

@@ -2,4 +2,5 @@ import { createSelector } from "reselect";
 
 const selectMedia = (state) => state.media;
 
-export const selectAllMedia = createSelector([selectMedia], (media) => media);
+// Return a shallow copy to avoid identity selector warning and allow memoization to detect actual changes.
+export const selectAllMedia = createSelector([selectMedia], (media) => ({ ...media }));

client/src/redux/user/user.sagas.js

@@ -50,7 +50,7 @@ import {
 } from "./user.actions";
 import UserActionTypes from "./user.types";
 //import * as amplitude from '@amplitude/analytics-browser';
-import posthog from 'posthog-js';
+import posthog from "posthog-js";
 
 const fpPromise = FingerprintJS.load();
 
@@ -269,11 +269,11 @@ export function* signInSuccessSaga({ payload }) {
         instanceSeg,
         ...(isParts
           ? [
-            InstanceRenderManager({
-              imex: "ImexPartsManagement",
-              rome: "RomePartsManagement"
-            })
-          ]
+              InstanceRenderManager({
+                imex: "ImexPartsManagement",
+                rome: "RomePartsManagement"
+              })
+            ]
           : [])
       ];
       window.$crisp.push(["set", "session:segments", [segs]]);
@@ -375,17 +375,31 @@ export function* SetAuthLevelFromShopDetails({ payload }) {
       const isParts = yield select((state) => state.application.isPartsEntry === true);
       const instanceSeg = InstanceRenderManager({ imex: "imex", rome: "rome" });
 
-      let featureSegments;
-      if (payload.features?.allAccess === true) {
-        featureSegments = ["allAccess"];
-      } else {
-        const featureKeys = Object.keys(payload.features).filter(
-          (key) =>
-            payload.features[key] === true ||
-            (typeof payload.features[key] === "string" && !isNaN(Date.parse(payload.features[key])))
-        );
-        featureSegments = ["basic", ...featureKeys];
-      }
+      const featureSegments =
+        payload.features?.allAccess === true
+          ? ["allAccess"]
+          : [
+              "basic",
+              ...Object.keys(payload.features).filter(
+                (key) =>
+                  payload.features[key] === true ||
+                  (typeof payload.features[key] === "string" && !isNaN(Date.parse(payload.features[key])))
+              )
+            ];
+
+      const additionalSegments = [
+        payload.cdk_dealerid && "CDK",
+        payload.pbs_serialnumber && "PBS",
+        // payload.rr_dealerid && "Reynolds",
+        payload.accountingconfig.qbo === true && "QBO",
+        payload.accountingconfig.qbo === false &&
+          !payload.cdk_dealerid &&
+          !payload.pbs_serialnumber &&
+          // !payload.rr_dealerid &&
+          "QBD"
+      ].filter(Boolean);
+
+      featureSegments.push(...additionalSegments);
 
       const regionSeg = payload.region_config ? `region:${payload.region_config}` : null;
       const segments = [instanceSeg, ...(regionSeg ? [regionSeg] : []), ...featureSegments];

client/src/translations/en_us/common.json

@@ -281,6 +281,7 @@
       },
       "fields": {
         "ReceivableCustomField": "QBO Receivable Custom Field {{number}}",
+        "accumulatePayableLines": "Accumulate Payable Lines",
         "address1": "Address 1",
         "address2": "Address 2",
         "appt_alt_transport": "Appointment Alternative Transportation Options",
@@ -321,6 +322,7 @@
           "itc_local": "Local Tax is ITC?",
           "itc_state": "State Tax is ITC?",
           "mappingname": "DMS Mapping Name",
+          "ro_posting": "Create $0 RO?",
           "sendmaterialscosting": "Materials Cost as % of Sale",
           "srcco": "Source Company #/Dealer #"
         },
@@ -996,6 +998,7 @@
         "insco": "No Ins. Co.*",
         "refreshrequired": "You must refresh the dashboard data to see this component.",
         "status": "No Status*",
+        "status_normal": "No Status",
         "updatinglayout": "Error saving updated layout {{message}}"
       },
       "labels": {
@@ -1675,6 +1678,7 @@
         "actual_delivery": "Actual Delivery",
         "actual_in": "Actual In",
         "acv_amount": "ACV Amount",
+        "admin_clerk": "Admin Clerk",
         "adjustment_bottom_line": "Adjustments",
         "adjustmenthours": "Adjustment Hours",
         "alt_transport": "Alt. Trans.",
@@ -2426,7 +2430,8 @@
         "selectmedia": "Select Media",
         "sentby": "Sent by {{by}} at {{time}}",
         "typeamessage": "Send a message...",
-        "unarchive": "Unarchive"
+        "unarchive": "Unarchive",
+        "mark_unread": "Mark as unread"
       },
       "render": {
         "conversation_list": "Conversation List"
@@ -3205,6 +3210,7 @@
         "parts_not_recieved_vendor": "Parts Not Received by Vendor",
         "parts_received_not_scheduled": "Parts Received for Jobs Not Scheduled",
         "payments_by_date": "Payments by Date",
+        "payments_by_date_excel": "Payments by Date - Excel",
         "payments_by_date_payment": "Payments by Date and Payment Type",
         "payments_by_date_type": "Payments by Date and Customer Type",
         "production_by_category": "Production by Category",

client/src/translations/es/common.json

@@ -281,6 +281,7 @@
       },
       "fields": {
         "ReceivableCustomField": "",
+        "accumulatePayableLines": "",
         "address1": "",
         "address2": "",
         "appt_alt_transport": "",
@@ -321,6 +322,7 @@
           "itc_local": "",
           "itc_state": "",
           "mappingname": "",
+          "ro_posting": "",
           "sendmaterialscosting": "",
           "srcco": ""
         },
@@ -996,6 +998,7 @@
         "insco": "",
         "refreshrequired": "",
         "status": "",
+        "status_normal": "",
         "updatinglayout": ""
       },
       "labels": {
@@ -1676,6 +1679,7 @@
         "actual_in": "Real en",
         "acv_amount": "",
         "adjustment_bottom_line": "Ajustes",
+        "admin_clerk": "",
         "adjustmenthours": "",
         "alt_transport": "",
         "area_of_damage_impact": {
@@ -2426,7 +2430,8 @@
         "selectmedia": "",
         "sentby": "",
         "typeamessage": "Enviar un mensaje...",
-        "unarchive": ""
+        "unarchive": "",
+        "mark_unread": ""
       },
       "render": {
         "conversation_list": ""
@@ -3205,6 +3210,7 @@
         "parts_not_recieved_vendor": "",
         "parts_received_not_scheduled": "",
         "payments_by_date": "",
+        "payments_by_date_excel": "",
         "payments_by_date_payment": "",
         "payments_by_date_type": "",
         "production_by_category": "",

client/src/translations/fr/common.json

@@ -281,6 +281,7 @@
       },
       "fields": {
         "ReceivableCustomField": "",
+        "accumulatePayableLines": "",
         "address1": "",
         "address2": "",
         "appt_alt_transport": "",
@@ -321,6 +322,7 @@
           "itc_local": "",
           "itc_state": "",
           "mappingname": "",
+          "ro_posting": "",
           "sendmaterialscosting": "",
           "srcco": ""
         },
@@ -996,6 +998,7 @@
         "insco": "",
         "refreshrequired": "",
         "status": "",
+        "status_normal": "",
         "updatinglayout": ""
       },
       "labels": {
@@ -1675,6 +1678,7 @@
         "actual_delivery": "Livraison réelle",
         "actual_in": "En réel",
         "acv_amount": "",
+        "admin_clerk": "",
         "adjustment_bottom_line": "Ajustements",
         "adjustmenthours": "",
         "alt_transport": "",
@@ -2426,7 +2430,8 @@
         "selectmedia": "",
         "sentby": "",
         "typeamessage": "Envoyer un message...",
-        "unarchive": ""
+        "unarchive": "",
+        "mark_unread": ""
       },
       "render": {
         "conversation_list": ""
@@ -3205,6 +3210,7 @@
         "parts_not_recieved_vendor": "",
         "parts_received_not_scheduled": "",
         "payments_by_date": "",
+        "payments_by_date_excel": "",
         "payments_by_date_payment": "",
         "payments_by_date_type": "",
         "production_by_category": "",

client/src/utils/GraphQLClient.js

@@ -148,6 +148,26 @@ const cache = new InMemoryCache({
     Query: {
       fields: {
         // Note: This is required because we switch from a read to an unread state with a toggle,
+        conversations: {
+          keyArgs: ["where", "order_by"], // keep separate caches for archived/unarchived + sort
+          merge(existing = [], incoming = [], { args, readField }) {
+            const offset = args?.offset ?? 0;
+            const merged = existing ? existing.slice(0) : [];
+
+            for (let i = 0; i < incoming.length; i++) {
+              merged[offset + i] = incoming[i];
+            }
+
+            // Deduplicate by id (important when you also upsert via sockets)
+            const seen = new Set();
+            return merged.filter((ref) => {
+              const id = readField("id", ref);
+              if (!id || seen.has(id)) return false;
+              seen.add(id);
+              return true;
+            });
+          }
+        },
         notifications: {
           merge(existing = [], incoming = [], { readField }) {
             // Create a map to deduplicate by __ref

client/src/utils/TemplateConstants.js

@@ -15,21 +15,29 @@ export const EmailSettings = {
 
 export const TemplateList = (type, context) => {
   //const { bodyshop } = store.getState().user;
+
+  const casl = InstanceRenderManager({
+    imex: {
+      casl_authorization: {
+        title: i18n.t("printcenter.jobs.casl_authorization"),
+        description: "",
+        subject: i18n.t("printcenter.jobs.casl_authorization"),
+        key: "casl_authorization",
+        disabled: false,
+        group: "authorization",
+        regions: {
+          CA: true
+        }
+      }
+    },
+    rome: {}
+  });
+
   return {
     //If there's no type or the type is job, send it back.
     ...(!type || type === "job"
       ? {
-          casl_authorization: {
-            title: i18n.t("printcenter.jobs.casl_authorization"),
-            description: "",
-            subject: i18n.t("printcenter.jobs.casl_authorization"),
-            key: "casl_authorization",
-            disabled: false,
-            group: "authorization",
-            regions: {
-              CA: true
-            }
-          },
+          ...casl,
           fippa_authorization: {
             title: i18n.t("printcenter.jobs.fippa_authorization"),
             description: "",
@@ -1210,6 +1218,18 @@ export const TemplateList = (type, context) => {
             },
             group: "customers"
           },
+          payments_by_date_excel: {
+            title: i18n.t("reportcenter.templates.payments_by_date_excel"),
+            subject: i18n.t("reportcenter.templates.payments_by_date_excel"),
+            key: "payments_by_date_excel",
+            reporttype: "excel",
+            disabled: false,
+            rangeFilter: {
+              object: i18n.t("reportcenter.labels.objects.payments"),
+              field: i18n.t("payments.fields.date")
+            },
+            group: "customers"
+          },
           schedule: {
             title: i18n.t("reportcenter.templates.schedule"),
             subject: i18n.t("reportcenter.templates.schedule"),

client/src/utils/sentry.js

@@ -31,7 +31,8 @@ if (!import.meta.env.DEV) {
       "Module specifier, 'fs' does not start",
       "Module specifier, 'zlib' does not start with",
       "Messaging: This browser doesn't support the API's required to use the Firebase SDK.",
-      "Failed to update a ServiceWorker for scope"
+      "Failed to update a ServiceWorker for scope",
+      "Network Error"
     ],
     integrations: [
       // See docs for support of different versions of variation of react router

client/vite.config.js

@@ -24,11 +24,13 @@ const lightningCssTargets = browserslistToTargets(
   })
 );
 
-const currentDatePST = new Date()
-  .toLocaleDateString("en-US", { timeZone: "America/Los_Angeles", year: "numeric", month: "2-digit", day: "2-digit" })
-  .split("/")
-  .reverse()
-  .join("-");
+const pstFormatter = new Intl.DateTimeFormat("en-CA", {
+  timeZone: "America/Los_Angeles",
+  year: "numeric",
+  month: "2-digit",
+  day: "2-digit"
+});
+const currentDatePST = pstFormatter.format(new Date());
 
 const getFormattedTimestamp = () =>
   new Date().toLocaleTimeString("en-US", { hour12: true }).replace("AM", "a.m.").replace("PM", "p.m.");

docker-compose-cluster.yml

@@ -207,6 +207,9 @@ services:
         aws --endpoint-url=http://localstack:4566 secretsmanager create-secret --name CHATTER_PRIVATE_KEY --secret-string file:///tmp/certs/io-ftp-test.key
         aws --endpoint-url=http://localstack:4566 logs create-log-group --log-group-name development --region ca-central-1
         aws --endpoint-url=http://localstack:4566 s3api create-bucket --bucket imex-large-log --create-bucket-configuration LocationConstraint=ca-central-1
+        aws --endpoint-url=http://localstack:4566 s3api create-bucket --bucket imex-carfax-uploads --create-bucket-configuration LocationConstraint=ca-central-1
+        aws --endpoint-url=http://localstack:4566 s3api create-bucket --bucket rome-carfax-uploads --create-bucket-configuration LocationConstraint=ca-central-1
+        aws --endpoint-url=http://localstack:4566 s3api create-bucket --bucket rps-carfax-uploads --create-bucket-configuration LocationConstraint=ca-central-1
       "
 
 networks:

docker-compose.yml

@@ -120,6 +120,8 @@ services:
         aws --endpoint-url=http://localstack:4566 s3api create-bucket --bucket imex-job-totals --create-bucket-configuration LocationConstraint=ca-central-1
         aws --endpoint-url=http://localstack:4566 s3api create-bucket --bucket parts-estimates --create-bucket-configuration LocationConstraint=ca-central-1
         aws --endpoint-url=http://localstack:4566 s3api create-bucket --bucket imex-carfax-uploads --create-bucket-configuration LocationConstraint=ca-central-1
+        aws --endpoint-url=http://localstack:4566 s3api create-bucket --bucket rome-carfax-uploads --create-bucket-configuration LocationConstraint=ca-central-1
+        aws --endpoint-url=http://localstack:4566 s3api create-bucket --bucket rps-carfax-uploads --create-bucket-configuration LocationConstraint=ca-central-1
       "
   # Node App: The Main IMEX API
   node-app:

hasura/metadata/cron_triggers.yaml

@@ -8,7 +8,16 @@
       value_from_env: DATAPUMP_AUTH
 - name: CARFAX Data Pump
   webhook: '{{HASURA_API_URL}}/data/carfax'
-  schedule: 0 7 * * 6
+  schedule: 0 7 * * 0
+  include_in_metadata: true
+  payload: {}
+  headers:
+    - name: x-imex-auth
+      value_from_env: DATAPUMP_AUTH
+  comment: Project Mexico
+- name: CARFAX RPS Data Pump
+  webhook: '{{HASURA_API_URL}}/data/carfaxrps'
+  schedule: 15 7 * * 0
   include_in_metadata: true
   payload: {}
   headers:

hasura/metadata/tables.yaml

@@ -1156,7 +1156,11 @@
         enable_manual: false
         update:
           columns:
+            - imexshopid
+            - timezone
             - shopname
+            - notification_followers
+            - state
             - md_order_statuses
       retry_conf:
         interval_sec: 10
@@ -3615,6 +3619,7 @@
           - adj_strdis
           - adj_towdis
           - adjustment_bottom_line
+          - admin_clerk
           - agt_addr1
           - agt_addr2
           - agt_city
@@ -3697,6 +3702,7 @@
           - deliverchecklist
           - depreciation_taxes
           - dms_allocation
+          - dms_id
           - driveable
           - employee_body
           - employee_csr
@@ -3890,6 +3896,7 @@
           - adj_strdis
           - adj_towdis
           - adjustment_bottom_line
+          - admin_clerk
           - agt_addr1
           - agt_addr2
           - agt_city
@@ -3973,6 +3980,7 @@
           - deliverchecklist
           - depreciation_taxes
           - dms_allocation
+          - dms_id
           - driveable
           - employee_body
           - employee_csr
@@ -4178,6 +4186,7 @@
           - adj_strdis
           - adj_towdis
           - adjustment_bottom_line
+          - admin_clerk
           - agt_addr1
           - agt_addr2
           - agt_city
@@ -4261,6 +4270,7 @@
           - deliverchecklist
           - depreciation_taxes
           - dms_allocation
+          - dms_id
           - driveable
           - employee_body
           - employee_csr
@@ -4705,6 +4715,34 @@
           - key
           - value
         filter: {}
+- table:
+    name: media_analytics
+    schema: public
+  object_relationships:
+    - name: bodyshop
+      using:
+        foreign_key_constraint_on: bodyshopid
+  array_relationships:
+    - name: media_analytics_details
+      using:
+        foreign_key_constraint_on:
+          column: media_analytics_id
+          table:
+            name: media_analytics_detail
+            schema: public
+- table:
+    name: media_analytics_detail
+    schema: public
+  object_relationships:
+    - name: bodyshop
+      using:
+        foreign_key_constraint_on: bodyshopid
+    - name: job
+      using:
+        foreign_key_constraint_on: jobid
+    - name: media_analytic
+      using:
+        foreign_key_constraint_on: media_analytics_id
 - table:
     name: messages
     schema: public

hasura/migrations/1762378985244_create_table_public_media_analytics/down.sql

@@ -0,0 +1 @@
+DROP TABLE "public"."media_analytics";

hasura/migrations/1762378985244_create_table_public_media_analytics/up.sql

@@ -0,0 +1,18 @@
+CREATE TABLE "public"."media_analytics" ("id" uuid NOT NULL DEFAULT gen_random_uuid(), "created_at" timestamptz NOT NULL DEFAULT now(), "updated_at" timestamptz NOT NULL DEFAULT now(), "bodyshopid" uuid NOT NULL, "total_jobs" integer NOT NULL DEFAULT 0, "total_documents" integer NOT NULL DEFAULT 0, "file_type_stats" jsonb NOT NULL DEFAULT jsonb_build_object(), PRIMARY KEY ("id") , FOREIGN KEY ("bodyshopid") REFERENCES "public"."bodyshops"("id") ON UPDATE restrict ON DELETE restrict);COMMENT ON TABLE "public"."media_analytics" IS E'LMS Media Analytics';
+CREATE OR REPLACE FUNCTION "public"."set_current_timestamp_updated_at"()
+RETURNS TRIGGER AS $$
+DECLARE
+  _new record;
+BEGIN
+  _new := NEW;
+  _new."updated_at" = NOW();
+  RETURN _new;
+END;
+$$ LANGUAGE plpgsql;
+CREATE TRIGGER "set_public_media_analytics_updated_at"
+BEFORE UPDATE ON "public"."media_analytics"
+FOR EACH ROW
+EXECUTE PROCEDURE "public"."set_current_timestamp_updated_at"();
+COMMENT ON TRIGGER "set_public_media_analytics_updated_at" ON "public"."media_analytics"
+IS 'trigger to set value of column "updated_at" to current timestamp on row update';
+CREATE EXTENSION IF NOT EXISTS pgcrypto;

hasura/migrations/1762380389542_create_table_public_media_analytics_detail/down.sql

@@ -0,0 +1 @@
+DROP TABLE "public"."media_analytics_detail";

hasura/migrations/1762380389542_create_table_public_media_analytics_detail/up.sql

@@ -0,0 +1,2 @@
+CREATE TABLE "public"."media_analytics_detail" ("id" uuid NOT NULL DEFAULT gen_random_uuid(), "created_at" timestamptz NOT NULL DEFAULT now(), "media_analytics_id" uuid NOT NULL, "jobid" uuid NOT NULL, "bodyshopid" uuid NOT NULL, "document_count" integer NOT NULL, "total_size_bytes" integer NOT NULL, "file_type_stats" jsonb NOT NULL DEFAULT jsonb_build_object(), PRIMARY KEY ("id") , FOREIGN KEY ("media_analytics_id") REFERENCES "public"."media_analytics"("id") ON UPDATE restrict ON DELETE restrict, FOREIGN KEY ("jobid") REFERENCES "public"."jobs"("id") ON UPDATE restrict ON DELETE restrict, FOREIGN KEY ("bodyshopid") REFERENCES "public"."bodyshops"("id") ON UPDATE restrict ON DELETE restrict);
+CREATE EXTENSION IF NOT EXISTS pgcrypto;

hasura/migrations/1762393769918_alter_table_public_jobs_add_column_admin_clerk/down.sql

@@ -0,0 +1,4 @@
+-- Could not auto-generate a down migration.
+-- Please write an appropriate down migration for the SQL below:
+-- alter table "public"."jobs" add column "admin_clerk" text
+--  null;

hasura/migrations/1762393769918_alter_table_public_jobs_add_column_admin_clerk/up.sql

@@ -0,0 +1,2 @@
+alter table "public"."jobs" add column "admin_clerk" text
+ null;

hasura/migrations/1762461945311_alter_table_public_media_analytics_add_column_total_size_bytes/down.sql

@@ -0,0 +1,4 @@
+-- Could not auto-generate a down migration.
+-- Please write an appropriate down migration for the SQL below:
+-- alter table "public"."media_analytics" add column "total_size_bytes" integer
+--  null;

hasura/migrations/1762461945311_alter_table_public_media_analytics_add_column_total_size_bytes/up.sql

@@ -0,0 +1,2 @@
+alter table "public"."media_analytics" add column "total_size_bytes" integer
+ null;

hasura/migrations/1762461962953_alter_table_public_media_analytics_add_column_total_size_mb/down.sql

@@ -0,0 +1,4 @@
+-- Could not auto-generate a down migration.
+-- Please write an appropriate down migration for the SQL below:
+-- alter table "public"."media_analytics" add column "total_size_mb" numeric
+--  null;

hasura/migrations/1762461962953_alter_table_public_media_analytics_add_column_total_size_mb/up.sql

@@ -0,0 +1,2 @@
+alter table "public"."media_analytics" add column "total_size_mb" numeric
+ null;

hasura/migrations/1762464155142_alter_table_public_media_analytics_detail_add_column_total_size_mb/down.sql

@@ -0,0 +1,4 @@
+-- Could not auto-generate a down migration.
+-- Please write an appropriate down migration for the SQL below:
+-- alter table "public"."media_analytics_detail" add column "total_size_mb" numeric
+--  null;

hasura/migrations/1762464155142_alter_table_public_media_analytics_detail_add_column_total_size_mb/up.sql

@@ -0,0 +1,2 @@
+alter table "public"."media_analytics_detail" add column "total_size_mb" numeric
+ null;

hasura/migrations/1762464955745_alter_table_public_media_analytics_detail_alter_column_jobid/down.sql

@@ -0,0 +1 @@
+alter table "public"."media_analytics_detail" alter column "jobid" set not null;

hasura/migrations/1762464955745_alter_table_public_media_analytics_detail_alter_column_jobid/up.sql

@@ -0,0 +1 @@
+alter table "public"."media_analytics_detail" alter column "jobid" drop not null;

hasura/migrations/1762546299465_alter_table_public_media_analytics_alter_column_total_size_bytes/down.sql

@@ -0,0 +1 @@
+ALTER TABLE "public"."media_analytics" ALTER COLUMN "total_size_bytes" TYPE integer;

hasura/migrations/1762546299465_alter_table_public_media_analytics_alter_column_total_size_bytes/up.sql

@@ -0,0 +1 @@
+ALTER TABLE "public"."media_analytics" ALTER COLUMN "total_size_bytes" TYPE numeric;

hasura/migrations/1762546323722_alter_table_public_media_analytics_detail_alter_column_total_size_bytes/down.sql

@@ -0,0 +1 @@
+ALTER TABLE "public"."media_analytics_detail" ALTER COLUMN "total_size_bytes" TYPE integer;

hasura/migrations/1762546323722_alter_table_public_media_analytics_detail_alter_column_total_size_bytes/up.sql

@@ -0,0 +1 @@
+ALTER TABLE "public"."media_analytics_detail" ALTER COLUMN "total_size_bytes" TYPE numeric;