IO-3236 HasFeatureAccess Date

Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
Merged in feature/IO-3217-OTSL-Labor-Type (pull request #2319 )
2025-05-20 17:16:27 -07:00 · 2025-05-19 21:02:01 +00:00 · 2025-05-15 22:47:26 +00:00 · 2025-05-15 15:47:04 -07:00 · 2025-05-15 15:46:45 -07:00 · 2025-05-15 22:39:39 +00:00
190 changed files with 10594 additions and 8128 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -127,4 +127,6 @@ vitest-report*/
 vitest-coverage/
 *.vitest.log
 test-output.txt
 server/job/test/fixtures
 .github
--- a/3
+++ b/3
@@ -56,4 +56,5 @@ COPY . .
 EXPOSE 4000 9229
 # Start the application
-CMD ["nodemon", "--legacy-watch", "--inspect=0.0.0.0:9229", "server.js"]
+RUN echo "Starting the application..."
 CMD ["nodemon", "--ignore", "./server/job/test/fixtures", "--legacy-watch", "--inspect=0.0.0.0:9229", "server.js"]
--- a/_reference/localEmailViewer/package-lock.json
+++ b/_reference/localEmailViewer/package-lock.json
--- a/_reference/localEmailViewer/package.json
+++ b/_reference/localEmailViewer/package.json
@@ -11,8 +11,8 @@
  "license": "ISC",
  "description": "",
  "dependencies": {
-    "express": "^4.21.1",
+    "express": "^5.1.0",
-    "mailparser": "^3.7.1",
+    "mailparser": "^3.7.2",
    "node-fetch": "^3.3.2"
  }
 }
--- a/bodyshop_translations.babel
+++ b/bodyshop_translations.babel
--- a/client/index.html
+++ b/client/index.html
@@ -74,50 +74,8 @@
      })();
    </script>
    <% } %>
-    <script>
+    <script>!function(w,d,i,s){function l(){if(!d.getElementById(i)){var f=d.getElementsByTagName(s)[0],e=d.createElement(s);e.type="text/javascript",e.async=!0,e.src="https://canny.io/sdk.js",f.parentNode.insertBefore(e,f)}}if("function"!=typeof w.Canny){var c=function(){c.q.push(arguments)};c.q=[],w.Canny=c,"complete"===d.readyState?l():w.attachEvent?w.attachEvent("onload",l):w.addEventListener("load",l,!1)}}(window,document,"canny-jssdk","script");</script>
      !(function () {
        "use strict";
        var e = [
          "debug",
          "destroy",
          "do",
          "help",
          "identify",
          "is",
          "off",
          "on",
          "ready",
          "render",
          "reset",
          "safe",
          "set"
        ];
        if (window.noticeable) console.warn("Noticeable SDK code snippet loaded more than once");
        else {
          var n = (window.noticeable = window.noticeable || []);
          function t(e) {
            return function () {
              var t = Array.prototype.slice.call(arguments);
              return t.unshift(e), n.push(t), n;
            };
          }
          !(function () {
            for (var o = 0; o < e.length; o++) {
              var r = e[o];
              n[r] = t(r);
            }
          })(),
            (function () {
              var e = document.createElement("script");
              (e.async = !0), (e.src = "https://sdk.noticeable.io/l.js");
              var n = document.head;
              n.insertBefore(e, n.firstChild);
            })();
        }
      })();
    </script>
  </head>
  <body>
    <noscript>You need to enable JavaScript to run this app.</noscript>
--- a/client/package-lock.json
+++ b/client/package-lock.json
--- a/client/package.json
+++ b/client/package.json
@@ -8,25 +8,25 @@
  "private": true,
  "proxy": "http://localhost:4000",
  "dependencies": {
-    "@ant-design/pro-layout": "^7.22.3",
+    "@ant-design/pro-layout": "^7.22.4",
-    "@apollo/client": "^3.13.5",
+    "@apollo/client": "^3.13.6",
    "@emotion/is-prop-valid": "^1.3.1",
    "@fingerprintjs/fingerprintjs": "^4.6.1",
-    "@firebase/analytics": "^0.10.12",
+    "@firebase/analytics": "^0.10.13",
-    "@firebase/app": "^0.11.3",
+    "@firebase/app": "^0.12.1",
-    "@firebase/auth": "^1.9.1",
+    "@firebase/auth": "^1.10.2",
-    "@firebase/firestore": "^4.7.10",
+    "@firebase/firestore": "^4.7.12",
-    "@firebase/messaging": "^0.12.17",
+    "@firebase/messaging": "^0.12.18",
    "@jsreport/browser-client": "^3.1.0",
-    "@reduxjs/toolkit": "^2.6.1",
+    "@reduxjs/toolkit": "^2.8.1",
-    "@sentry/cli": "^2.42.4",
+    "@sentry/cli": "^2.45.0",
-    "@sentry/react": "^9.9.0",
+    "@sentry/react": "^9.18.0",
-    "@sentry/vite-plugin": "^3.2.2",
+    "@sentry/vite-plugin": "^3.4.0",
-    "@splitsoftware/splitio-react": "^2.0.1",
+    "@splitsoftware/splitio-react": "^2.1.1",
    "@tanem/react-nprogress": "^5.0.53",
-    "antd": "^5.24.5",
+    "antd": "^5.25.1",
    "apollo-link-logger": "^2.0.1",
-    "apollo-link-sentry": "^4.2.0",
+    "apollo-link-sentry": "^4.3.0",
    "autosize": "^6.0.1",
    "axios": "^1.8.4",
    "classnames": "^2.5.1",
@@ -37,18 +37,18 @@
    "dotenv": "^16.4.7",
    "env-cmd": "^10.1.0",
    "exifr": "^7.1.3",
-    "graphql": "^16.10.0",
+    "graphql": "^16.11.0",
    "i18next": "^24.2.3",
-    "i18next-browser-languagedetector": "^8.0.4",
+    "i18next-browser-languagedetector": "^8.1.0",
    "immutability-helper": "^3.1.1",
-    "libphonenumber-js": "^1.12.6",
+    "libphonenumber-js": "^1.12.8",
    "logrocket": "^9.0.2",
    "markerjs2": "^2.32.4",
    "memoize-one": "^6.0.0",
    "normalize-url": "^8.0.1",
    "object-hash": "^3.0.0",
    "prop-types": "^15.8.1",
-    "query-string": "^9.1.1",
+    "query-string": "^9.1.2",
    "raf-schd": "^4.0.3",
    "react": "^18.3.1",
    "react-big-calendar": "^1.18.0",
@@ -69,17 +69,17 @@
    "react-resizable": "^3.0.5",
    "react-router-dom": "^6.30.0",
    "react-sticky": "^6.0.3",
-    "react-virtuoso": "^4.12.5",
+    "react-virtuoso": "^4.12.7",
-    "recharts": "^2.15.0",
+    "recharts": "^2.15.2",
    "redux": "^5.0.1",
    "redux-actions": "^3.0.3",
    "redux-persist": "^6.0.0",
    "redux-saga": "^1.3.0",
    "redux-state-sync": "^3.1.4",
    "reselect": "^5.1.1",
-    "sass": "^1.86.0",
+    "sass": "^1.88.0",
    "socket.io-client": "^4.8.1",
-    "styled-components": "^6.1.16",
+    "styled-components": "^6.1.18",
    "subscriptions-transport-ws": "^0.11.0",
    "use-memo-one": "^1.1.3",
    "vite-plugin-ejs": "^1.7.0",
@@ -129,38 +129,38 @@
  "devDependencies": {
    "@ant-design/icons": "^6.0.0",
    "@babel/plugin-proposal-private-property-in-object": "^7.21.11",
-    "@babel/preset-react": "^7.26.3",
+    "@babel/preset-react": "^7.27.1",
-    "@dotenvx/dotenvx": "^1.39.0",
+    "@dotenvx/dotenvx": "^1.44.0",
    "@emotion/babel-plugin": "^11.13.5",
    "@emotion/react": "^11.14.0",
-    "@eslint/js": "^9.23.0",
+    "@eslint/js": "^9.26.0",
    "@playwright/test": "^1.51.1",
-    "@sentry/webpack-plugin": "^3.2.2",
+    "@sentry/webpack-plugin": "^3.4.0",
    "@testing-library/dom": "^10.4.0",
    "@testing-library/jest-dom": "^6.6.3",
-    "@testing-library/react": "^16.2.0",
+    "@testing-library/react": "^16.3.0",
    "@vitejs/plugin-react": "^4.3.4",
-    "browserslist": "^4.24.4",
+    "browserslist": "^4.24.5",
    "browserslist-to-esbuild": "^2.1.1",
    "chalk": "^5.4.1",
    "eslint": "^8.57.1",
    "eslint-config-react-app": "^7.0.1",
-    "eslint-plugin-react": "^7.37.4",
+    "eslint-plugin-react": "^7.37.5",
    "globals": "^15.15.0",
    "jsdom": "^26.0.0",
-    "memfs": "^4.17.0",
+    "memfs": "^4.17.1",
    "os-browserify": "^0.3.0",
    "playwright": "^1.51.1",
    "react-error-overlay": "^6.1.0",
    "redux-logger": "^3.0.6",
    "source-map-explorer": "^2.5.3",
-    "vite": "^6.2.3",
+    "vite": "^6.3.5",
-    "vite-plugin-babel": "^1.3.0",
+    "vite-plugin-babel": "^1.3.1",
    "vite-plugin-eslint": "^1.8.1",
    "vite-plugin-node-polyfills": "^0.23.0",
-    "vite-plugin-pwa": "^0.21.2",
+    "vite-plugin-pwa": "^1.0.0",
    "vite-plugin-style-import": "^2.0.0",
-    "vitest": "^3.0.9",
+    "vitest": "^3.1.3",
    "workbox-window": "^7.3.0"
  }
 }
--- a/client/src/App/App.jsx
+++ b/client/src/App/App.jsx
@@ -21,8 +21,8 @@ import "./App.styles.scss";
 import Eula from "../components/eula/eula.component";
 import InstanceRenderMgr from "../utils/instanceRenderMgr";
 import ProductFruitsWrapper from "./ProductFruitsWrapper.jsx";
 import { SocketProvider } from "../contexts/SocketIO/useSocket.jsx";
 import { NotificationProvider } from "../contexts/Notifications/notificationContext.jsx";
 import SocketProvider from "../contexts/SocketIO/socketProvider.jsx";
 const ResetPassword = lazy(() => import("../pages/reset-password/reset-password.component"));
 const ManagePage = lazy(() => import("../pages/manage/manage.page.container"));
@@ -142,11 +142,10 @@ export function App({ bodyshop, checkUserSession, currentUser, online, setOnline
    >
      <ProductFruitsWrapper
        currentUser={currentUser}
-        workspaceCode={InstanceRenderMgr({
+        bodyshop={bodyshop}
-          imex: null,
+        workspaceCode={bodyshop?.tours_enabled ? "9BkbEseqNqxw8jUH" : ""}
          rome: "9BkbEseqNqxw8jUH"
        })}
      />
      <NotificationProvider>
        <Routes>
          <Route
--- a/client/src/App/ProductFruitsWrapper.jsx
+++ b/client/src/App/ProductFruitsWrapper.jsx
@@ -1,8 +1,16 @@
 import React from "react";
 import { ProductFruits } from "react-product-fruits";
 import PropTypes from "prop-types";
 import { ProductFruits } from "react-product-fruits";
 import dayjs from "dayjs";
 const ProductFruitsWrapper = React.memo(({ currentUser, bodyshop, workspaceCode }) => {
  const featureProps = bodyshop?.features
    ? Object.entries(bodyshop.features).reduce((acc, [key, value]) => {
        acc[key] = value === true || (typeof value === "string" && dayjs(value).isAfter(dayjs()));
        return acc;
      }, {})
    : {};
 const ProductFruitsWrapper = React.memo(({ currentUser, workspaceCode }) => {
  return (
    workspaceCode &&
    currentUser?.authorized === true &&
@@ -14,7 +22,8 @@ const ProductFruitsWrapper = React.memo(({ currentUser, workspaceCode }) => {
        language="en"
        user={{
          email: currentUser.email,
-          username: currentUser.email
+          username: currentUser.email,
          props: featureProps
        }}
      />
    )
@@ -28,5 +37,6 @@ ProductFruitsWrapper.propTypes = {
    authorized: PropTypes.bool,
    email: PropTypes.string
  }),
-  workspaceCode: PropTypes.string
+  workspaceCode: PropTypes.string,
  bodyshop: PropTypes.object
 };
--- a/client/src/components/bill-detail-edit/bill-detail-edit-return.component.jsx
+++ b/client/src/components/bill-detail-edit/bill-detail-edit-return.component.jsx
@@ -14,8 +14,21 @@ const mapStateToProps = createStructuredSelector({
  bodyshop: selectBodyshop
 });
 const mapDispatchToProps = (dispatch) => ({
-  setPartsOrderContext: (context) => dispatch(setModalContext({ context: context, modal: "partsOrder" })),
+  setPartsOrderContext: (context) =>
-  insertAuditTrail: ({ jobid, operation, type }) => dispatch(insertAuditTrail({ jobid, operation, type }))
+    dispatch(
      setModalContext({
        context: context,
        modal: "partsOrder"
      })
    ),
  insertAuditTrail: ({ jobid, operation, type }) =>
    dispatch(
      insertAuditTrail({
        jobid,
        operation,
        type
      })
    )
 });
 export default connect(mapStateToProps, mapDispatchToProps)(BillDetailEditReturn);
@@ -69,7 +82,7 @@ export function BillDetailEditReturn({ setPartsOrderContext, insertAuditTrail, b
      <Modal
        open={open}
        onCancel={() => setOpen(false)}
-        destroyOnClose
+        destroyOnHidden
        title={t("bills.actions.return")}
        onOk={() => form.submit()}
      >
--- a/client/src/components/bill-detail-edit/bill-detail-edit.container.jsx
+++ b/client/src/components/bill-detail-edit/bill-detail-edit.container.jsx
@@ -29,7 +29,7 @@ export default function BillDetailEditcontainer() {
        delete search.billid;
        history({ search: queryString.stringify(search) });
      }}
-      destroyOnClose
+      destroyOnHidden
      open={search.billid}
    >
      <BillDetailEditComponent />
--- a/client/src/components/bill-enter-modal/bill-enter-modal.container.jsx
+++ b/client/src/components/bill-enter-modal/bill-enter-modal.container.jsx
@@ -412,7 +412,7 @@ function BillEnterModalContainer({ billEnterModal, toggleModalVisible, bodyshop,
          )}
        </Space>
      }
-      destroyOnClose
+      destroyOnHidden
    >
      <Form
        onFinish={handleFinish}
--- a/client/src/components/ca-bc-etf-table-modal/ca-bc-etf-table-modal.container.jsx
+++ b/client/src/components/ca-bc-etf-table-modal/ca-bc-etf-table-modal.container.jsx
@@ -75,7 +75,7 @@ export function ContractsFindModalContainer({ caBcEtfTableModal, toggleModalVisi
      title={t("payments.labels.findermodal")}
      onCancel={() => toggleModalVisible()}
      onOk={() => toggleModalVisible()}
-      destroyOnClose
+      destroyOnHidden
      forceRender
    >
      <Form form={form} layout="vertical" autoComplete="no" onFinish={handleFinish}>
--- a/client/src/components/card-payment-modal/card-payment-modal.container.jsx
+++ b/client/src/components/card-payment-modal/card-payment-modal.container.jsx
@@ -40,7 +40,7 @@ function CardPaymentModalContainer({ cardPaymentModal, toggleModalVisible, bodys
        </Button>
      ]}
      width="80%"
-      destroyOnClose
+      destroyOnHidden
    >
      <CardPaymentModalComponent />
    </Modal>
--- a/client/src/components/chat-affix/chat-affix.container.jsx
+++ b/client/src/components/chat-affix/chat-affix.container.jsx
@@ -3,11 +3,11 @@ import { getToken } from "@firebase/messaging";
 import axios from "axios";
 import { useEffect } from "react";
 import { useTranslation } from "react-i18next";
 import { useSocket } from "../../contexts/SocketIO/useSocket.jsx";
 import { messaging, requestForToken } from "../../firebase/firebase.utils";
 import ChatPopupComponent from "../chat-popup/chat-popup.component";
 import "./chat-affix.styles.scss";
 import { registerMessagingHandlers, unregisterMessagingHandlers } from "./registerMessagingSocketHandlers";
 import { useSocket } from "../../contexts/SocketIO/useSocket.js";
 export function ChatAffixContainer({ bodyshop, chatVisible }) {
  const { t } = useTranslation();
--- a/client/src/components/chat-archive-button/chat-archive-button.component.jsx
+++ b/client/src/components/chat-archive-button/chat-archive-button.component.jsx
@@ -3,10 +3,10 @@ import { Button } from "antd";
 import { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { TOGGLE_CONVERSATION_ARCHIVE } from "../../graphql/conversations.queries";
 import { useSocket } from "../../contexts/SocketIO/useSocket.jsx";
 import { createStructuredSelector } from "reselect";
 import { selectBodyshop } from "../../redux/user/user.selectors.js";
 import { connect } from "react-redux";
 import { useSocket } from "../../contexts/SocketIO/useSocket.js";
 const mapStateToProps = createStructuredSelector({
  bodyshop: selectBodyshop
--- a/client/src/components/chat-conversation-title-tags/chat-conversation-title-tags.component.jsx
+++ b/client/src/components/chat-conversation-title-tags/chat-conversation-title-tags.component.jsx
@@ -4,10 +4,10 @@ import { Link } from "react-router-dom";
 import { logImEXEvent } from "../../firebase/firebase.utils";
 import { REMOVE_CONVERSATION_TAG } from "../../graphql/job-conversations.queries";
 import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
 import { useSocket } from "../../contexts/SocketIO/useSocket.jsx";
 import { createStructuredSelector } from "reselect";
 import { selectBodyshop } from "../../redux/user/user.selectors.js";
 import { connect } from "react-redux";
 import { useSocket } from "../../contexts/SocketIO/useSocket.js";
 const mapStateToProps = createStructuredSelector({
  bodyshop: selectBodyshop
--- a/client/src/components/chat-conversation/chat-conversation.container.jsx
+++ b/client/src/components/chat-conversation/chat-conversation.container.jsx
@@ -3,11 +3,11 @@ import axios from "axios";
 import { useCallback, useEffect, useState } from "react";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { useSocket } from "../../contexts/SocketIO/useSocket.jsx";
 import { CONVERSATION_SUBSCRIPTION_BY_PK, GET_CONVERSATION_DETAILS } from "../../graphql/conversations.queries";
 import { selectSelectedConversation } from "../../redux/messaging/messaging.selectors";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import ChatConversationComponent from "./chat-conversation.component";
 import { useSocket } from "../../contexts/SocketIO/useSocket.js";
 const mapStateToProps = createStructuredSelector({
  selectedConversation: selectSelectedConversation,
--- a/client/src/components/chat-label/chat-label.component.jsx
+++ b/client/src/components/chat-label/chat-label.component.jsx
@@ -4,11 +4,11 @@ import { Input, Spin, Tag, Tooltip } from "antd";
 import { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { UPDATE_CONVERSATION_LABEL } from "../../graphql/conversations.queries";
 import { useSocket } from "../../contexts/SocketIO/useSocket.jsx";
 import { createStructuredSelector } from "reselect";
 import { selectBodyshop } from "../../redux/user/user.selectors.js";
 import { connect } from "react-redux";
 import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
 import { useSocket } from "../../contexts/SocketIO/useSocket.js";
 const mapStateToProps = createStructuredSelector({
  bodyshop: selectBodyshop
--- a/client/src/components/chat-new-conversation/chat-new-conversation.component.jsx
+++ b/client/src/components/chat-new-conversation/chat-new-conversation.component.jsx
@@ -5,7 +5,7 @@ import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { openChatByPhone } from "../../redux/messaging/messaging.actions";
 import PhoneFormItem, { PhoneItemFormatterValidation } from "../form-items-formatted/phone-form-item.component";
-import { useSocket } from "../../contexts/SocketIO/useSocket.jsx";
+import { useSocket } from "../../contexts/SocketIO/useSocket.js";
 const mapStateToProps = createStructuredSelector({
  //currentUser: selectCurrentUser
--- a/client/src/components/chat-open-button/chat-open-button.component.jsx
+++ b/client/src/components/chat-open-button/chat-open-button.component.jsx
@@ -7,7 +7,7 @@ import PhoneNumberFormatter from "../../utils/PhoneFormatter";
 import { createStructuredSelector } from "reselect";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import { searchingForConversation } from "../../redux/messaging/messaging.selectors";
-import { useSocket } from "../../contexts/SocketIO/useSocket.jsx";
+import { useSocket } from "../../contexts/SocketIO/useSocket.js";
 import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
 const mapStateToProps = createStructuredSelector({
--- a/client/src/components/chat-popup/chat-popup.component.jsx
+++ b/client/src/components/chat-popup/chat-popup.component.jsx
@@ -12,9 +12,9 @@ import ChatConversationListComponent from "../chat-conversation-list/chat-conver
 import ChatConversationContainer from "../chat-conversation/chat-conversation.container";
 import ChatNewConversation from "../chat-new-conversation/chat-new-conversation.component";
 import LoadingSpinner from "../loading-spinner/loading-spinner.component";
 import { useSocket } from "../../contexts/SocketIO/useSocket.jsx";
 import "./chat-popup.styles.scss";
 import { useSocket } from "../../contexts/SocketIO/useSocket.js";
 const mapStateToProps = createStructuredSelector({
  selectedConversation: selectSelectedConversation,
--- a/client/src/components/chat-tag-ro/chat-tag-ro.container.jsx
+++ b/client/src/components/chat-tag-ro/chat-tag-ro.container.jsx
@@ -8,10 +8,10 @@ import { logImEXEvent } from "../../firebase/firebase.utils";
 import { INSERT_CONVERSATION_TAG } from "../../graphql/job-conversations.queries";
 import { SEARCH_FOR_JOBS } from "../../graphql/jobs.queries";
 import ChatTagRo from "./chat-tag-ro.component";
 import { useSocket } from "../../contexts/SocketIO/useSocket.jsx";
 import { createStructuredSelector } from "reselect";
 import { selectBodyshop } from "../../redux/user/user.selectors.js";
 import { connect } from "react-redux";
 import { useSocket } from "../../contexts/SocketIO/useSocket.js";
 const mapStateToProps = createStructuredSelector({
  bodyshop: selectBodyshop
--- a/client/src/components/contracts-find-modal/contracts-find-modal.container.jsx
+++ b/client/src/components/contracts-find-modal/contracts-find-modal.container.jsx
@@ -63,7 +63,7 @@ export function ContractsFindModalContainer({
      title={t("contracts.labels.findermodal")}
      onCancel={() => toggleModalVisible()}
      onOk={() => toggleModalVisible()}
-      destroyOnClose
+      destroyOnHidden
      forceRender
    >
      <Form form={form} layout="vertical" autoComplete="no" onFinish={handleFinish}>
--- a/client/src/components/email-overlay/email-overlay.container.jsx
+++ b/client/src/components/email-overlay/email-overlay.container.jsx
@@ -152,7 +152,7 @@ export function EmailOverlayContainer({ emailConfig, modalVisible, toggleEmailOv
  }, [modalVisible]); // eslint-disable-line react-hooks/exhaustive-deps
  return (
    <Modal
-      destroyOnClose={true}
+      destroyOnHidden
      open={modalVisible}
      maskClosable={false}
      width={"80%"}
--- a/client/src/components/employee-search-select/employee-search-select.component.jsx
+++ b/client/src/components/employee-search-select/employee-search-select.component.jsx
@@ -5,7 +5,7 @@ import { useTranslation } from "react-i18next";
 const { Option } = Select;
 //To be used as a form element only.
-const EmployeeSearchSelect = ({ options, ...props }) => {
+const EmployeeSearchSelect = ({ options, showEmail, ...props }) => {
  const { t } = useTranslation();
  return (
@@ -21,12 +21,16 @@ const EmployeeSearchSelect = ({ options, ...props }) => {
      {options
        ? options.map((o) => (
            <Option key={o.id} value={o.id} search={`${o.employee_number}  ${o.first_name} ${o.last_name}`}>
-              <Space>
+              <Space size="small">
-                {`${o.employee_number}  ${o.first_name} ${o.last_name}`}
+                {`${o.employee_number ?? ""}  ${o.first_name} ${o.last_name}`}
-
+                <Tag color="green" style={{ padding: "0.1 0.1rem", marginRight: "1px", marginLeft: "1px" }}>
                <Tag color="green">
                  {o.flat_rate ? t("timetickets.labels.flat_rate") : t("timetickets.labels.straight_time")}
                </Tag>
                {showEmail && o.user_email ? (
                  <Tag color="blue" style={{ padding: "0.1 0.1rem", marginRight: "1px", marginLeft: "1px" }}>
                    {o.user_email}
                  </Tag>
                ) : null}
              </Space>
            </Option>
          ))
--- a/client/src/components/feature-wrapper/feature-wrapper.component.jsx
+++ b/client/src/components/feature-wrapper/feature-wrapper.component.jsx
@@ -81,8 +81,9 @@ export function HasFeatureAccess({ featureName, bodyshop, bypass, debug = false
  }
  return (
    bodyshop?.features?.allAccess ||
-    bodyshop?.features?.[featureName] ||
+    (typeof bodyshop?.features?.[featureName] === "boolean"
-    dayjs(bodyshop?.features[featureName]).isAfter(dayjs())
+      ? bodyshop?.features?.[featureName]
      : dayjs(bodyshop?.features?.[featureName]).isAfter(dayjs()))
  );
 }
--- a/client/src/components/header/header.component.jsx
+++ b/client/src/components/header/header.component.jsx
@@ -40,7 +40,6 @@ import { RiSurveyLine } from "react-icons/ri";
 import { connect } from "react-redux";
 import { Link } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
 import { useSocket } from "../../contexts/SocketIO/useSocket.jsx";
 import { GET_UNREAD_COUNT } from "../../graphql/notifications.queries.js";
 import { selectRecentItems, selectSelectedHeader } from "../../redux/application/application.selectors";
 import { setModalContext } from "../../redux/modals/modals.actions";
@@ -51,6 +50,8 @@ import InstanceRenderManager from "../../utils/instanceRenderMgr";
 import { HasFeatureAccess } from "../feature-wrapper/feature-wrapper.component";
 import LockWrapper from "../lock-wrapper/lock-wrapper.component";
 import NotificationCenterContainer from "../notification-center/notification-center.container.jsx";
 import { useSocket } from "../../contexts/SocketIO/useSocket.js";
 import { useIsEmployee } from "../../utils/useIsEmployee.js";
 // Redux mappings
 const mapStateToProps = createStructuredSelector({
@@ -98,6 +99,7 @@ function Header({
  const baseTitleRef = useRef(document.title || "");
  const lastSetTitleRef = useRef("");
  const userAssociationId = bodyshop?.associations?.[0]?.id;
  const isEmployee = useIsEmployee(bodyshop, currentUser);
  const {
    data: unreadData,
@@ -682,7 +684,7 @@ function Header({
          icon: unreadLoading ? (
            <Spin size="small" />
          ) : (
-            <Badge offset={[8, 0]} size="small" count={unreadCount}>
+            <Badge offset={[8, 0]} size="small" count={isEmployee ? unreadCount : 0}>
              <BellFilled />
            </Badge>
          ),
--- a/client/src/components/inventory-upsert-modal/inventory-upsert-modal.container.jsx
+++ b/client/src/components/inventory-upsert-modal/inventory-upsert-modal.container.jsx
@@ -98,7 +98,7 @@ export function InventoryUpsertModalContainer({ currentUser, bodyshop, inventory
      onCancel={() => {
        toggleModalVisible();
      }}
-      destroyOnClose
+      destroyOnHidden
    >
      <Form form={form} onFinish={handleFinish} layout="vertical">
        <InventoryUpsertModal form={form} />
--- a/client/src/components/job-at-change/schedule-event.component.jsx
+++ b/client/src/components/job-at-change/schedule-event.component.jsx
@@ -1,5 +1,5 @@
 import { AlertFilled } from "@ant-design/icons";
-import { useMutation } from "@apollo/client";
+import { useLazyQuery, useMutation } from "@apollo/client";
 import { Button, Divider, Dropdown, Form, Input, Popover, Select, Space } from "antd";
 import parsePhoneNumber from "libphonenumber-js";
 import queryString from "query-string";
@@ -8,24 +8,30 @@ import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { Link, useLocation, useNavigate } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
-import { useSocket } from "../../contexts/SocketIO/useSocket.jsx";
+import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
 import { useSocket } from "../../contexts/SocketIO/useSocket.js";
 import { UPDATE_APPOINTMENT } from "../../graphql/appointments.queries";
 import { GET_JOB_BY_PK_QUICK_INTAKE, JOB_PRODUCTION_TOGGLE } from "../../graphql/jobs.queries";
 import { insertAuditTrail } from "../../redux/application/application.actions";
 import { openChatByPhone, setMessage } from "../../redux/messaging/messaging.actions";
 import { setModalContext } from "../../redux/modals/modals.actions";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import AuditTrailMapping from "../../utils/AuditTrailMappings";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";
 import { DateTimeFormatterFunction } from "../../utils/DateFormatter";
 import dayjs from "../../utils/day";
 import { GenerateDocument } from "../../utils/RenderTemplate";
 import { TemplateList } from "../../utils/TemplateConstants";
 import ChatOpenButton from "../chat-open-button/chat-open-button.component";
 import DataLabel from "../data-label/data-label.component";
 import FormDateTimePickerComponent from "../form-date-time-picker/form-date-time-picker.component";
 import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
 import ProductionListColumnComment from "../production-list-columns/production-list-columns.comment.component";
 import ScheduleManualEvent from "../schedule-manual-event/schedule-manual-event.component";
 import { HasFeatureAccess } from "./../feature-wrapper/feature-wrapper.component";
 import ScheduleAtChange from "./job-at-change.component";
 import ScheduleEventColor from "./schedule-event.color.component";
 import ScheduleEventNote from "./schedule-event.note.component";
 import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
 const mapStateToProps = createStructuredSelector({
  bodyshop: selectBodyshop
@@ -33,7 +39,8 @@ const mapStateToProps = createStructuredSelector({
 const mapDispatchToProps = (dispatch) => ({
  setScheduleContext: (context) => dispatch(setModalContext({ context: context, modal: "schedule" })),
  openChatByPhone: (phone) => dispatch(openChatByPhone(phone)),
-  setMessage: (text) => dispatch(setMessage(text))
+  setMessage: (text) => dispatch(setMessage(text)),
  insertAuditTrail: ({ jobid, operation }) => dispatch(insertAuditTrail({ jobid, operation }))
 });
 export function ScheduleEventComponent({
@@ -43,16 +50,42 @@ export function ScheduleEventComponent({
  event,
  refetch,
  handleCancel,
-  setScheduleContext
+  setScheduleContext,
  insertAuditTrail
 }) {
  const { t } = useTranslation();
  const [open, setOpen] = useState(false);
  const history = useNavigate();
  const searchParams = queryString.parse(useLocation().search);
  const [updateAppointment] = useMutation(UPDATE_APPOINTMENT);
  const [mutationUpdateJob] = useMutation(JOB_PRODUCTION_TOGGLE);
  const [title, setTitle] = useState(event.title);
  const { socket } = useSocket();
  const notification = useNotification();
  const [form] = Form.useForm();
  const [popOverVisible, setPopOverVisible] = useState(false);
  const [getJobDetails] = useLazyQuery(GET_JOB_BY_PK_QUICK_INTAKE, {
    variables: { id: event.job?.id },
    onCompleted: (data) => {
      if (data?.jobs_by_pk) {
        const totalHours =
          (data.jobs_by_pk.labhrs?.aggregate?.sum?.mod_lb_hrs || 0) +
          (data.jobs_by_pk.larhrs?.aggregate?.sum?.mod_lb_hrs || 0);
        form.setFieldsValue({
          actual_in: data.jobs_by_pk.actual_in ? data.jobs_by_pk.actual_in : dayjs(),
          scheduled_completion: data.jobs_by_pk.scheduled_completion
            ? data.jobs_by_pk.scheduled_completion
            : totalHours && bodyshop.ss_configuration.nobusinessdays
              ? dayjs().businessDaysAdd(totalHours / (bodyshop.target_touchtime || 1), "day")
              : dayjs().add(totalHours / (bodyshop.target_touchtime || 1), "day"),
          scheduled_delivery: data.jobs_by_pk.scheduled_delivery
        });
      }
    },
    fetchPolicy: "network-only"
  });
  const blockContent = (
    <Space direction="vertical" wrap>
@@ -89,6 +122,74 @@ export function ScheduleEventComponent({
    </Space>
  );
  const handleConvert = async (values) => {
    const res = await mutationUpdateJob({
      variables: {
        jobId: event.job.id,
        job: {
          ...values,
          status: bodyshop.md_ro_statuses.default_arrived,
          inproduction: true
        }
      }
    });
    if (!res.errors) {
      notification["success"]({
        message: t("jobs.successes.converted")
      });
      insertAuditTrail({
        jobid: event.job.id,
        operation: AuditTrailMapping.jobintake(
          res.data.update_jobs.returning[0].status,
          DateTimeFormatterFunction(values.scheduled_completion)
        )
      });
      setPopOverVisible(false);
      refetch();
    }
  };
  const popMenu = (
    <div onClick={(e) => e.stopPropagation()}>
      <Form layout="vertical" form={form} onFinish={handleConvert}>
        <Form.Item
          name={["actual_in"]}
          label={t("jobs.fields.actual_in")}
          rules={[
            {
              required: true
              //message: t("general.validation.required"),
            }
          ]}
        >
          <FormDateTimePickerComponent disabled={event.ro_number} />
        </Form.Item>
        <Form.Item
          name={["scheduled_completion"]}
          label={t("jobs.fields.scheduled_completion")}
          rules={[
            {
              required: true
              //message: t("general.validation.required"),
            }
          ]}
        >
          <FormDateTimePickerComponent disabled={event.ro_number} />
        </Form.Item>
        <Form.Item name={["scheduled_delivery"]} label={t("jobs.fields.scheduled_delivery")}>
          <FormDateTimePickerComponent disabled={event.ro_number} />
        </Form.Item>
        <Space wrap>
          <Button type="primary" onClick={() => form.submit()}>
            {t("general.actions.save")}
          </Button>
        </Space>
      </Form>
    </div>
  );
  const popoverContent = (
    <div style={{ maxWidth: "40vw" }}>
      {!event.isintake ? (
@@ -294,7 +395,7 @@ export function ScheduleEventComponent({
        ) : (
          <ScheduleManualEvent event={event} />
        )}
-        {event.isintake ? (
+        {event.isintake && HasFeatureAccess({ featureName: "checklist", bodyshop }) ? (
          <Link
            to={{
              pathname: `/manage/jobs/${event.job && event.job.id}/intake`,
@@ -303,7 +404,23 @@ export function ScheduleEventComponent({
          >
            <Button disabled={event.arrived}>{t("appointments.actions.intake")}</Button>
          </Link>
-        ) : null}
+        ) : (
          <Popover //open={open}
            content={popMenu}
            open={popOverVisible}
            onOpenChange={setPopOverVisible}
            onClick={(e) => {
              if (event.job?.id) {
                e.stopPropagation();
                getJobDetails();
              }
            }}
            getPopupContainer={(trigger) => trigger.parentNode}
            trigger="click"
          >
            <Button disabled={event.arrived}>{t("jobs.actions.intake_quick")}</Button>
          </Popover>
        )}
      </Space>
    </div>
  );
--- a/client/src/components/job-costing-modal/job-costing-modal.container.jsx
+++ b/client/src/components/job-costing-modal/job-costing-modal.container.jsx
@@ -49,7 +49,7 @@ export function JobCostingModalContainer({ jobCostingModal, toggleModalVisible }
      }}
      cancelButtonProps={{ style: { display: "none" } }}
      width="90%"
-      destroyOnClose
+      destroyOnHidden
    >
      {!costingData ? (
        <LoadingSpinner loading={true} />
--- a/client/src/components/job-detail-cards/job-detail-cards.component.jsx
+++ b/client/src/components/job-detail-cards/job-detail-cards.component.jsx
@@ -6,7 +6,8 @@ import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { Link, useLocation, useNavigate } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
-import { useSocket } from "../../contexts/SocketIO/useSocket.jsx";
+import { useSocket } from "../../contexts/SocketIO/useSocket.js";
 import { logImEXEvent } from "../../firebase/firebase.utils";
 import { QUERY_JOB_CARD_DETAILS, UPDATE_JOB } from "../../graphql/jobs.queries";
 import { insertAuditTrail } from "../../redux/application/application.actions.js";
@@ -31,7 +32,13 @@ const mapStateToProps = createStructuredSelector({
 });
 const mapDispatchToProps = (dispatch) => ({
-  setPrintCenterContext: (context) => dispatch(setModalContext({ context: context, modal: "printCenter" })),
+  setPrintCenterContext: (context) =>
    dispatch(
      setModalContext({
        context: context,
        modal: "printCenter"
      })
    ),
  insertAuditTrail: ({ jobid, operation, type }) =>
    dispatch(
      insertAuditTrail({
@@ -86,7 +93,7 @@ export function JobDetailCards({ bodyshop, setPrintCenterContext, insertAuditTra
  };
  return (
-    <Drawer open={!!selected} destroyOnClose width={drawerPercentage} placement="right" onClose={handleDrawerClose}>
+    <Drawer open={!!selected} destroyOnHidden width={drawerPercentage} placement="right" onClose={handleDrawerClose}>
      {loading ? <LoadingSpinner /> : null}
      {error ? <AlertComponent message={error.message} type="error" /> : null}
      {data ? (
--- a/client/src/components/job-reconciliation-modal/job-reconciliation-modal.component.jsx
+++ b/client/src/components/job-reconciliation-modal/job-reconciliation-modal.component.jsx
@@ -1,9 +1,9 @@
 import { Col, Row } from "antd";
-import React, { useState } from "react";
+import { useState } from "react";
 import InstanceRenderManager from "../../utils/instanceRenderMgr";
 import JobReconciliationBillsTable from "../job-reconciliation-bills-table/job-reconciliation-bills-table.component";
 import JobReconciliationPartsTable from "../job-reconciliation-parts-table/job-reconciliation-parts-table.component";
 import JobReconciliationTotals from "../job-reconciliation-totals/job-reconciliation-totals.component";
 import InstanceRenderManager from "../../utils/instanceRenderMgr";
 export default function JobReconciliationModalComponent({ job, bills }) {
  const jobLineState = useState([]);
@@ -20,7 +20,7 @@ export default function JobReconciliationModalComponent({ job, bills }) {
  const filterFunction = InstanceRenderManager({
    imex: (j) =>
-      (j.part_type !== null && j.part_type !== "PAE") ||
+      (j.part_type !== null && j.part_type !== "PAE" && j.act_price !== 0 && j.part_qty !== 0) ||
      (j.line_desc && j.line_desc.toLowerCase().includes("towing") && j.lbr_op === "OP13") ||
      j.db_ref === "936004", //ADD SHIPPING LINE.
    rome: (j) =>
--- a/client/src/components/job-reconciliation-modal/job-reconciliation.modal.container.jsx
+++ b/client/src/components/job-reconciliation-modal/job-reconciliation.modal.container.jsx
@@ -44,7 +44,7 @@ function JobReconciliationModalContainer({ reconciliationModal, toggleModalVisib
      onOk={handleCancel}
      onCancel={handleCancel}
      cancelButtonProps={{ display: "none" }}
-      destroyOnClose
+      destroyOnHidden
      className="imex-reconciliation-modal"
    >
      {loading && <LoadingSpinner loading={loading} />}
--- a/client/src/components/job-watcher-toggle/job-watcher-toggle.component.jsx
+++ b/client/src/components/job-watcher-toggle/job-watcher-toggle.component.jsx
@@ -24,7 +24,8 @@ export default function JobWatcherToggleComponent({
  handleToggleSelf,
  handleRemoveWatcher,
  handleWatcherSelect,
-  handleTeamSelect
+  handleTeamSelect,
  isEmployee
 }) {
  const { t } = useTranslation();
@@ -66,22 +67,32 @@ export default function JobWatcherToggleComponent({
      <List>
        <List.Item
          actions={[
-            <Button
+            <Tooltip title={!isEmployee ? t("notifications.tooltips.not-employee") : ""} placement="top">
-              type={isWatching ? "primary" : "default"}
+              <span>
-              danger={!isWatching}
+                <Button
-              icon={isWatching ? <EyeOutlined /> : <EyeFilled />}
+                  type={isWatching ? "primary" : "default"}
-              size="medium"
+                  danger={!isWatching}
-              onClick={handleToggleSelf}
+                  icon={isWatching ? <EyeOutlined /> : <EyeFilled />}
-              loading={adding || removing}
+                  size="medium"
-            >
+                  onClick={handleToggleSelf}
-              {isWatching ? t("notifications.labels.unwatch") : t("notifications.labels.watch")}
+                  loading={adding || removing}
-            </Button>
+                  disabled={!isEmployee || adding || removing}
                >
                  {isWatching ? t("notifications.labels.unwatch") : t("notifications.labels.watch")}
                </Button>
              </span>
            </Tooltip>
          ]}
        >
          <List.Item.Meta>
            <Text type="secondary" style={{ marginBottom: 8, display: "block" }}>
              {t("notifications.labels.watching-issue")}
            </Text>
            {!isEmployee && (
              <Text type="danger" style={{ marginBottom: 8, display: "block" }}>
                {t("notifications.tooltips.not-employee")}
              </Text>
            )}
          </List.Item.Meta>
        </List.Item>
      </List>
@@ -98,12 +109,16 @@ export default function JobWatcherToggleComponent({
      <EmployeeSearchSelectComponent
        style={{ minWidth: "100%" }}
        options={
-          bodyshop?.employees?.filter((e) =>
+          bodyshop?.employees?.filter(
-            jobWatchers.every((w) => w.user_email !== e.user_email && e.active && e.user_email)
+            (e) =>
              e.user_email && // Ensure user_email is not null or undefined
              e.active && // Ensure employee is active
              jobWatchers.every((w) => w.user_email !== e.user_email) // Ensure not already a watcher
          ) || []
        }
        placeholder={t("notifications.labels.employee-search")}
        value={selectedWatcher}
        showEmail={true}
        onChange={(value) => {
          setSelectedWatcher(value);
          handleWatcherSelect(value);
--- a/client/src/components/job-watcher-toggle/job-watcher-toggle.container.jsx
+++ b/client/src/components/job-watcher-toggle/job-watcher-toggle.container.jsx
@@ -6,6 +6,7 @@ import { createStructuredSelector } from "reselect";
 import { selectBodyshop, selectCurrentUser } from "../../redux/user/user.selectors.js";
 import { useSplitTreatments } from "@splitsoftware/splitio-react";
 import JobWatcherToggleComponent from "./job-watcher-toggle.component.jsx";
 import { useIsEmployee } from "../../utils/useIsEmployee.js";
 const mapStateToProps = createStructuredSelector({
  bodyshop: selectBodyshop,
@@ -21,13 +22,14 @@ function JobWatcherToggleContainer({ job, currentUser, bodyshop }) {
    splitKey: bodyshop && bodyshop.imexshopid
  });
-  const userEmail = currentUser.email;
+  const isEmployee = useIsEmployee(bodyshop, currentUser);
  const jobid = job.id;
  const [open, setOpen] = useState(false);
  const [selectedWatcher, setSelectedWatcher] = useState(null);
  const [selectedTeam, setSelectedTeam] = useState(null);
  const userEmail = currentUser.email;
  const jobid = job.id;
  // Fetch current watchers with refetch capability
  const {
    data: watcherData,
@@ -139,13 +141,13 @@ function JobWatcherToggleContainer({ job, currentUser, bodyshop }) {
  });
  const handleToggleSelf = useCallback(async () => {
-    if (adding || removing) return;
+    if (adding || removing || !isEmployee) return;
    if (isWatching) {
      await removeWatcher({ variables: { jobid, userEmail } });
    } else {
      await addWatcher({ variables: { jobid, userEmail } });
    }
-  }, [isWatching, addWatcher, removeWatcher, jobid, userEmail, adding, removing]);
+  }, [isWatching, addWatcher, removeWatcher, jobid, userEmail, adding, removing, isEmployee]);
  const handleRemoveWatcher = useCallback(
    async (email) => {
@@ -187,7 +189,16 @@ function JobWatcherToggleContainer({ job, currentUser, bodyshop }) {
        setSelectedTeam(null);
        return;
      }
-      await Promise.all(newWatchers.map((email) => addWatcher({ variables: { jobid, userEmail: email } })));
+      await Promise.all(
        newWatchers.map((email) =>
          addWatcher({
            variables: {
              jobid,
              userEmail: email
            }
          })
        )
      );
    },
    [jobWatchers, addWatcher, jobid, adding]
  );
@@ -212,6 +223,7 @@ function JobWatcherToggleContainer({ job, currentUser, bodyshop }) {
      handleWatcherSelect={handleWatcherSelect}
      handleTeamSelect={handleTeamSelect}
      currentUser={currentUser}
      isEmployee={isEmployee} // Pass isEmployee to the component
    />
  );
 }
--- a/client/src/components/jobs-admin-dates/jobs-admin-dates.component.jsx
+++ b/client/src/components/jobs-admin-dates/jobs-admin-dates.component.jsx
@@ -106,7 +106,12 @@ export function JobsAdminDatesChange({ insertAuditTrail, job }) {
          <Form.Item label={t("jobs.fields.date_open")} name="date_open">
            <DateTimePicker />
          </Form.Item>
-
+          <Form.Item label={t("jobs.fields.estimate_sent_approval")} name="estimate_sent_approval">
            <DateTimePicker />
          </Form.Item>
          <Form.Item label={t("jobs.fields.estimate_approved")} name="estimate_approved">
            <DateTimePicker />
          </Form.Item>
          <Form.Item label={t("jobs.fields.date_scheduled")} name="date_scheduled">
            <DateTimePicker />
          </Form.Item>
--- a/client/src/components/jobs-available-table/jobs-available-table.container.jsx
+++ b/client/src/components/jobs-available-table/jobs-available-table.container.jsx
@@ -4,11 +4,12 @@ import { Col, Row } from "antd";
 import Axios from "axios";
 import _ from "lodash";
 import queryString from "query-string";
-import React, { useCallback, useEffect, useState } from "react";
+import { useCallback, useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { useLocation, useNavigate } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
 import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
 import { logImEXEvent } from "../../firebase/firebase.utils";
 import {
  DELETE_AVAILABLE_JOB,
@@ -33,7 +34,6 @@ import OwnerFindModalContainer from "../owner-find-modal/owner-find-modal.contai
 import { GetSupplementDelta } from "./jobs-available-supplement.estlines.util";
 import HeaderFields from "./jobs-available-supplement.headerfields";
 import JobsAvailableTableComponent from "./jobs-available-table.component";
 import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
 const mapStateToProps = createStructuredSelector({
  bodyshop: selectBodyshop,
@@ -195,7 +195,7 @@ export function JobsAvailableContainer({ bodyshop, currentUser, insertAuditTrail
      await deleteJob({
        variables: { id: estData.id }
-      }).then((r) => {
+      }).then(() => {
        refetch();
        setInsertLoading(false);
      });
@@ -315,7 +315,7 @@ export function JobsAvailableContainer({ bodyshop, currentUser, insertAuditTrail
      deleteJob({
        variables: { id: estData.id }
-      }).then((r) => {
+      }).then(() => {
        refetch();
        setInsertLoading(false);
      });
@@ -372,7 +372,7 @@ export function JobsAvailableContainer({ bodyshop, currentUser, insertAuditTrail
    loadEstData({ variables: { id: record.id } });
    modalSearchState[1](record.clm_no);
    setJobModalVisible(true);
-    // eslint-disable-next-line react-hooks/exhaustive-deps
+    // eslint-disable-next-line
  }, []);
  useEffect(() => {
@@ -456,7 +456,7 @@ function replaceEmpty(someObj, replaceValue = null) {
  return JSON.parse(temp);
 }
-async function CheckTaxRatesUSA(estData, bodyshop) {
+async function CheckTaxRatesUSA(estData) {
  if (!estData.parts_tax_rates?.PAM) {
    estData.parts_tax_rates.PAM = estData.parts_tax_rates.PAC;
  }
@@ -568,7 +568,7 @@ async function CheckTaxRates(estData, bodyshop) {
  });
  //}
 }
-function ResolveCCCLineIssues(estData, bodyshop) {
+function ResolveCCCLineIssues(estData) {
  //Find all misc amounts, populate them to the act price.
  //This needs to be done before cleansing unq_seq since some misc prices could move over.
  estData.joblines.data.forEach((line) => {
@@ -585,6 +585,9 @@ function ResolveCCCLineIssues(estData, bodyshop) {
          //  line.notes += ` | ET/UT Update (prev = ${line.mod_lbr_ty})`;
          line.mod_lbr_ty = "LAR";
        }
        if (line.mod_lbr_ty === "OTSL") {
          line.mod_lbr_ty = line.mod_lbr_hrs === 0 ? null : "LAB";
        }
      }
    });
  });
--- a/client/src/components/jobs-detail-dates/jobs-detail-dates.component.jsx
+++ b/client/src/components/jobs-detail-dates/jobs-detail-dates.component.jsx
@@ -7,6 +7,7 @@ import { selectJobReadOnly } from "../../redux/application/application.selectors
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import DateTimePicker from "../form-date-time-picker/form-date-time-picker.component";
 import FormRow from "../layout-form-row/layout-form-row.component";
 import dayjs from "../../utils/day";
 const mapStateToProps = createStructuredSelector({
  jobRO: selectJobReadOnly,
@@ -40,6 +41,20 @@ export function JobsDetailDatesComponent({ jobRO, job, bodyshop }) {
        <Form.Item label={t("jobs.fields.date_rentalresp")} name="date_rentalresp">
          <DateTimePicker disabled={jobRO} />
        </Form.Item>
        <Form.Item label={t("jobs.fields.estimate_sent_approval")} name="estimate_sent_approval">
          <DateTimePicker
            disabled={true}
            value={job.estimate_sent_approval ? dayjs(job.estimate_sent_approval) : null}
            placeholder={t("general.labels.na")}
          />
        </Form.Item>
        <Form.Item label={t("jobs.fields.estimate_approved")} name="estimate_approved">
          <DateTimePicker
            disabled={true}
            value={job.estimate_approved ? dayjs(job.estimate_approved) : null}
            placeholder={t("general.labels.na")}
          />
        </Form.Item>
      </FormRow>
      <FormRow header={t("jobs.forms.scheddates")}>
@@ -76,21 +91,15 @@ export function JobsDetailDatesComponent({ jobRO, job, bodyshop }) {
          <DateTimePicker disabled={jobRO} />
        </Form.Item>
        <Form.Item shouldUpdate>
-          {() => {
+          {() => (
-            return (
+            <Form.Item
-              <Form.Item
+              label={t("jobs.fields.actual_completion")}
-                label={t("jobs.fields.actual_completion")}
+              name="actual_completion"
-                name="actual_completion"
+              rules={[{ required: jobInPostProduction }]}
-                rules={[
+            >
-                  {
+              <DateTimePicker disabled={jobRO} />
-                    required: jobInPostProduction
+            </Form.Item>
-                  }
+          )}
                ]}
              >
                <DateTimePicker disabled={jobRO} />
              </Form.Item>
            );
          }}
        </Form.Item>
        <Form.Item label={t("jobs.fields.scheduled_delivery")} name="scheduled_delivery">
          <DateTimePicker disabled={jobRO} />
@@ -103,15 +112,12 @@ export function JobsDetailDatesComponent({ jobRO, job, bodyshop }) {
        <Form.Item label={t("jobs.fields.date_invoiced")} name="date_invoiced">
          <DateTimePicker disabled={true || jobRO} />
        </Form.Item>
        <Form.Item label={t("jobs.fields.date_exported")} name="date_exported">
          <DateTimePicker disabled={true || jobRO} />
        </Form.Item>
        <Form.Item label={t("jobs.fields.date_void")} name="date_void">
          <DateTimePicker disabled={true || jobRO} />
        </Form.Item>
        <Form.Item label={t("jobs.fields.date_lost_sale")} name="date_lost_sale">
          <DateTimePicker disabled={true || jobRO} />
        </Form.Item>
--- a/client/src/components/jobs-detail-general/jobs-detail-general.component.jsx
+++ b/client/src/components/jobs-detail-general/jobs-detail-general.component.jsx
@@ -1,5 +1,4 @@
 import { Col, Form, Input, InputNumber, Row, Select, Space, Switch } from "antd";
 import React from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
@@ -188,6 +187,12 @@ export function JobsDetailGeneral({ bodyshop, jobRO, job, form }) {
            <Form.Item label={t("jobs.fields.tlos_ind")} name="tlos_ind" valuePropName="checked">
              <Switch disabled={jobRO} />
            </Form.Item>
            <Form.Item label={t("jobs.fields.hit_and_run")} name="hit_and_run" valuePropName="checked">
              <Switch disabled={jobRO} />
            </Form.Item>
            <Form.Item label={t("jobs.fields.acv_amount")} name="acv_amount">
              <CurrencyInput disabled={jobRO} min={0} />
            </Form.Item>
          </FormRow>
        </Col>
        <Col {...lossColDamage}>
--- a/client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.component.jsx
+++ b/client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.component.jsx
@@ -9,7 +9,7 @@ import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { Link, useNavigate } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
-import { useSocket } from "../../contexts/SocketIO/useSocket.jsx";
+import { useSocket } from "../../contexts/SocketIO/useSocket.js";
 import { auth, logImEXEvent } from "../../firebase/firebase.utils";
 import { CANCEL_APPOINTMENTS_BY_JOB_ID, INSERT_MANUAL_APPT } from "../../graphql/appointments.queries";
 import { GET_CURRENT_QUESTIONSET_ID, INSERT_CSI } from "../../graphql/csi.queries";
@@ -133,6 +133,16 @@ export function JobsDetailHeaderActions({
  const { socket } = useSocket();
  const notification = useNotification();
  const isDevEnv = import.meta.env.DEV;
  const isProdEnv = import.meta.env.PROD;
  const userEmail = currentUser?.email || "";
  const devEmails = ["imex.dev", "rome.dev"];
  const prodEmails = ["imex.prod", "rome.prod", "imex.test", "rome.test"];
  const hasValidEmail = (emails) => emails.some((email) => userEmail.endsWith(email));
  const canSubmitForTesting = (isDevEnv && hasValidEmail(devEmails)) || (isProdEnv && hasValidEmail(prodEmails));
  const {
    treatments: { ImEXPay }
  } = useSplitTreatments({
@@ -171,7 +181,7 @@ export function JobsDetailHeaderActions({
      { defaultOpenStatus: bodyshop.md_ro_statuses.default_imported },
      (newJobId) => {
        history(`/manage/jobs/${newJobId}`);
-        notification["success"]({
+        notification.success({
          message: t("jobs.successes.duplicated")
        });
      },
@@ -181,7 +191,7 @@ export function JobsDetailHeaderActions({
  const handleDuplicateConfirm = () =>
    DuplicateJob(client, job.id, { defaultOpenStatus: bodyshop.md_ro_statuses.default_imported }, (newJobId) => {
      history(`/manage/jobs/${newJobId}`);
-      notification["success"]({
+      notification.success({
        message: t("jobs.successes.duplicated")
      });
    });
@@ -217,13 +227,13 @@ export function JobsDetailHeaderActions({
    const result = await deleteJob({ variables: { id: job.id } });
    if (!result.errors) {
-      notification["success"]({
+      notification.success({
        message: t("jobs.successes.delete")
      });
      //go back to jobs list.
      history(`/manage/`);
    } else {
-      notification["error"]({
+      notification.error({
        message: t("jobs.errors.deleted", {
          error: JSON.stringify(result.errors)
        })
@@ -275,9 +285,9 @@ export function JobsDetailHeaderActions({
        });
        if (!result.errors) {
-          notification["success"]({ message: t("csi.successes.created") });
+          notification.success({ message: t("csi.successes.created") });
        } else {
-          notification["error"]({
+          notification.error({
            message: t("csi.errors.creating", {
              message: JSON.stringify(result.errors)
            })
@@ -316,7 +326,7 @@ export function JobsDetailHeaderActions({
              `${window.location.protocol}//${window.location.host}/csi/${result.data.insert_csi.returning[0].id}`
            );
          } else {
-            notification["error"]({
+            notification.error({
              message: t("messaging.error.invalidphone")
            });
          }
@@ -328,7 +338,7 @@ export function JobsDetailHeaderActions({
          );
        }
      } else {
-        notification["error"]({
+        notification.error({
          message: t("csi.errors.notconfigured")
        });
      }
@@ -358,7 +368,7 @@ export function JobsDetailHeaderActions({
          });
          setMessage(`${window.location.protocol}//${window.location.host}/csi/${job.csiinvites[0].id}`);
        } else {
-          notification["error"]({
+          notification.error({
            message: t("messaging.error.invalidphone")
          });
        }
@@ -398,7 +408,7 @@ export function JobsDetailHeaderActions({
    });
    if (!result.errors) {
-      notification["success"]({
+      notification.success({
        message: t("jobs.successes.voided")
      });
      insertAuditTrail({
@@ -409,7 +419,7 @@ export function JobsDetailHeaderActions({
      //go back to jobs list.
      history(`/manage/`);
    } else {
-      notification["error"]({
+      notification.error({
        message: t("jobs.errors.voiding", {
          error: JSON.stringify(result.errors)
        })
@@ -442,7 +452,7 @@ export function JobsDetailHeaderActions({
        console.log("handle -> XML", QbXmlResponse);
      } catch (error) {
        console.log("Error getting QBXML from Server.", error);
-        notification["error"]({
+        notification.error({
          message: t("jobs.errors.exporting", {
            error: "Unable to retrieve QBXML. " + JSON.stringify(error.message)
          })
@@ -460,7 +470,7 @@ export function JobsDetailHeaderActions({
        });
      } catch (error) {
        console.log("Error connecting to quickbooks or partner.", error);
-        notification["error"]({
+        notification.error({
          message: t("jobs.errors.exporting-partner")
        });
@@ -556,7 +566,7 @@ export function JobsDetailHeaderActions({
      }
    });
    if (!jobUpdate.errors) {
-      notification["success"]({
+      notification.success({
        message: t("appointments.successes.canceled")
      });
      insertAuditTrail({
@@ -931,11 +941,11 @@ export function JobsDetailHeaderActions({
        });
        if (!result.errors) {
-          notification["success"]({
+          notification.success({
            message: t("jobs.successes.partsqueue")
          });
        } else {
-          notification["error"]({
+          notification.error({
            message: t("jobs.errors.saving", {
              error: JSON.stringify(result.errors)
            })
@@ -1111,6 +1121,27 @@ export function JobsDetailHeaderActions({
    });
  }
  if (canSubmitForTesting) {
    menuItems.push({
      key: "submitfortesting",
      id: "job-actions-submitfortesting",
      label: t("menus.jobsactions.submit-for-testing"),
      onClick: async () => {
        try {
          await axios.post("/job/totals-recorder", { id: job.id });
          notification.success({
            message: t("general.messages.submit-for-testing")
          });
        } catch (err) {
          console.error(`Error submitting job for testing: ${err?.message}`);
          notification.error({
            message: t("general.errors.submit-for-testing-error")
          });
        }
      }
    });
  }
  const menu = {
    items: menuItems,
    key: "popovermenu"
--- a/client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.toggle-production.jsx
+++ b/client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.toggle-production.jsx
@@ -5,6 +5,7 @@ import { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
 import { GET_JOB_BY_PK_QUICK_INTAKE, JOB_PRODUCTION_TOGGLE } from "../../graphql/jobs.queries";
 import { insertAuditTrail } from "../../redux/application/application.actions";
 import { selectJobReadOnly } from "../../redux/application/application.selectors";
@@ -12,7 +13,6 @@ import { selectBodyshop } from "../../redux/user/user.selectors";
 import AuditTrailMapping from "../../utils/AuditTrailMappings";
 import { DateTimeFormatterFunction } from "../../utils/DateFormatter";
 import FormDateTimePickerComponent from "../form-date-time-picker/form-date-time-picker.component";
 import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
 import LoadingSpinner from "../loading-spinner/loading-spinner.component.jsx";
 const mapStateToProps = createStructuredSelector({
@@ -44,9 +44,16 @@ export function JobsDetailHeaderActionsToggleProduction({
    variables: { id: job.id },
    onCompleted: (data) => {
      if (data?.jobs_by_pk) {
        const totalHours =
          (data.jobs_by_pk.labhrs?.aggregate?.sum?.mod_lb_hrs || 0) +
          (data.jobs_by_pk.larhrs?.aggregate?.sum?.mod_lb_hrs || 0);
        form.setFieldsValue({
          actual_in: data.jobs_by_pk.actual_in ? data.jobs_by_pk.actual_in : dayjs(),
-          scheduled_completion: data.jobs_by_pk.scheduled_completion,
+          scheduled_completion: data.jobs_by_pk.scheduled_completion
            ? data.jobs_by_pk.scheduled_completion
            : totalHours && bodyshop.ss_configuration.nobusinessdays
              ? dayjs().businessDaysAdd(totalHours / (bodyshop.target_touchtime || 1), "day")
              : dayjs().add(totalHours / (bodyshop.target_touchtime || 1), "day"),
          actual_completion: data.jobs_by_pk.actual_completion,
          scheduled_delivery: data.jobs_by_pk.scheduled_delivery,
          actual_delivery: data.jobs_by_pk.actual_delivery
--- a/client/src/components/jobs-detail-header/jobs-detail-header.component.jsx
+++ b/client/src/components/jobs-detail-header/jobs-detail-header.component.jsx
@@ -1,15 +1,18 @@
 import { BranchesOutlined, ExclamationCircleFilled, PauseCircleOutlined, WarningFilled } from "@ant-design/icons";
-import { Card, Col, Divider, Row, Space, Tag, Tooltip } from "antd";
+import { Card, Checkbox, Col, Divider, Row, Space, Tag, Tooltip } from "antd";
-import React, { useState } from "react";
+import { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { Link } from "react-router-dom";
 import { useMutation } from "@apollo/client";
 import { createStructuredSelector } from "reselect";
 import { selectJobReadOnly } from "../../redux/application/application.selectors";
 import { setModalContext } from "../../redux/modals/modals.actions";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import { UPDATE_JOB } from "../../graphql/jobs.queries";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";
 import { DateTimeFormatter } from "../../utils/DateFormatter";
 import dayjs from "../../utils/day";
 import PhoneNumberFormatter from "../../utils/PhoneFormatter";
 import ChatOpenButton from "../chat-open-button/chat-open-button.component";
 import DataLabel from "../data-label/data-label.component";
@@ -21,7 +24,7 @@ import ProductionListColumnComment from "../production-list-columns/production-l
 import ProductionListColumnProductionNote from "../production-list-columns/production-list-columns.productionnote.component";
 import VehicleVinDisplay from "../vehicle-vin-display/vehicle-vin-display.component";
 import "./jobs-detail-header.styles.scss";
-import dayjs from "../../utils/day";
+import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
 const mapStateToProps = createStructuredSelector({
  jobRO: selectJobReadOnly,
@@ -29,41 +32,55 @@ const mapStateToProps = createStructuredSelector({
 });
 const mapDispatchToProps = (dispatch) => ({
-  setPrintCenterContext: (context) => dispatch(setModalContext({ context: context, modal: "printCenter" }))
+  setPrintCenterContext: (context) =>
    dispatch(
      setModalContext({
        context: context,
        modal: "printCenter"
      })
    )
 });
 const colSpan = {
-  xs: {
+  xs: { span: 24 },
-    span: 24
+  sm: { span: 24 },
-  },
+  md: { span: 12 },
-  sm: {
+  lg: { span: 6 },
-    span: 24
+  xl: { span: 6 }
  },
  md: {
    span: 12
  },
  lg: {
    span: 6
  },
  xl: {
    span: 6
  }
 };
 export function JobsDetailHeader({ job, bodyshop, disabled }) {
  const { t } = useTranslation();
  const { notification } = useNotification();
  const [notesClamped, setNotesClamped] = useState(true);
-  const vehicleTitle = `${job.v_model_yr || ""} ${job.v_color || ""}
+  const [updateJob] = useMutation(UPDATE_JOB);
-  ${job.v_make_desc || ""} 
+  const vehicleTitle =
-  ${job.v_model_desc || ""}`.trim();
+    `${job.v_model_yr || ""} ${job.v_color || ""} ${job.v_make_desc || ""} ${job.v_model_desc || ""}`.trim();
  const bodyHrs = job.joblines.filter((j) => j.mod_lbr_ty !== "LAR").reduce((acc, val) => acc + val.mod_lb_hrs, 0);
  const refinishHrs = job.joblines
    .filter((line) => line.mod_lbr_ty === "LAR")
    .reduce((acc, val) => acc + val.mod_lb_hrs, 0);
  const ownerTitle = OwnerNameDisplayFunction(job).trim();
  // Handle checkbox changes
  const handleCheckboxChange = async (field, checked) => {
    const value = checked ? dayjs().toISOString() : null;
    try {
      await updateJob({
        variables: {
          jobId: job.id,
          job: { [field]: value }
        },
        refetchQueries: ["GET_JOB_BY_PK"],
        awaitRefetchQueries: true
      });
    } catch (error) {
      notification.error({
        message: t("jobs.errors.saving", { error: error.message })
      });
    }
  };
  return (
    <Row gutter={[16, 16]} style={{ alignItems: "stretch" }}>
      <Col {...colSpan}>
@@ -72,11 +89,7 @@ export function JobsDetailHeader({ job, bodyshop, disabled }) {
            <DataLabel label={t("jobs.fields.status")}>
              <Space wrap>
                {job.status}
-                {job.inproduction && (
+                {job.inproduction && <Tag color="#f50">{t("jobs.labels.inproduction")}</Tag>}
                  <Tag color="#f50" key="production">
                    {t("jobs.labels.inproduction")}
                  </Tag>
                )}
                {job.suspended && <PauseCircleOutlined style={{ color: "orangered" }} />}
                {job.iouparent && (
                  <Link to={`/manage/jobs/${job.iouparent}`}>
@@ -110,7 +123,6 @@ export function JobsDetailHeader({ job, bodyshop, disabled }) {
              <span style={{ margin: "0rem .5rem" }}>/</span>
              <CurrencyFormatter>{job.owner_owing}</CurrencyFormatter>
            </DataLabel>
            <DataLabel label={t("jobs.fields.alt_transport")}>
              {job.alt_transport}
              <JobAltTransportChange job={job} />
@@ -127,11 +139,39 @@ export function JobsDetailHeader({ job, bodyshop, disabled }) {
                ))}
              </DataLabel>
            )}
            <DataLabel label={t("jobs.fields.production_vars.note")}>
              <ProductionListColumnProductionNote record={job} />
            </DataLabel>
-
+            <DataLabel label={t("jobs.fields.estimate_sent_approval")}>
              <Space>
                <Checkbox
                  checked={!!job.estimate_sent_approval}
                  onChange={(e) => handleCheckboxChange("estimate_sent_approval", e.target.checked)}
                  disabled={disabled}
                >
                  {job.estimate_sent_approval && (
                    <span style={{ color: "#888" }}>
                      <DateTimeFormatter>{job.estimate_sent_approval}</DateTimeFormatter>
                    </span>
                  )}
                </Checkbox>
              </Space>
            </DataLabel>
            <DataLabel label={t("jobs.fields.estimate_approved")}>
              <Space>
                <Checkbox
                  checked={!!job.estimate_approved}
                  onChange={(e) => handleCheckboxChange("estimate_approved", e.target.checked)}
                  disabled={disabled}
                >
                  {job.estimate_approved && (
                    <span style={{ color: "#888" }}>
                      <DateTimeFormatter>{job.estimate_approved}</DateTimeFormatter>
                    </span>
                  )}
                </Checkbox>
              </Space>
            </DataLabel>
            <Space wrap>
              {job.special_coverage_policy && (
                <Tag color="tomato">
@@ -149,6 +189,14 @@ export function JobsDetailHeader({ job, bodyshop, disabled }) {
                  </Space>
                </Tag>
              )}
              {job.hit_and_run && (
                <Tag color="green">
                  <Space>
                    <WarningFilled />
                    <span>{t("jobs.fields.hit_and_run")}</span>
                  </Space>
                </Tag>
              )}
            </Space>
          </div>
        </Card>
--- a/client/src/components/jobs-documents-imgproxy-gallery/jobs-document-imgproxy-gallery.download.component.jsx
+++ b/client/src/components/jobs-documents-imgproxy-gallery/jobs-document-imgproxy-gallery.download.component.jsx
@@ -1,12 +1,10 @@
 import { Button, Space } from "antd";
 import axios from "axios";
-import React, { useState } from "react";
+import { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { logImEXEvent } from "../../firebase/firebase.utils";
 import cleanAxios from "../../utils/CleanAxios";
 import formatBytes from "../../utils/formatbytes";
 //import yauzl from "yauzl";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { selectBodyshop } from "../../redux/user/user.selectors";
@@ -28,7 +26,7 @@ const mapDispatchToProps = (dispatch) => ({
 export default connect(mapStateToProps, mapDispatchToProps)(JobsDocumentsImgproxyDownloadButton);
-export function JobsDocumentsImgproxyDownloadButton({ bodyshop, galleryImages, identifier }) {
+export function JobsDocumentsImgproxyDownloadButton({ bodyshop, galleryImages, identifier, jobId }) {
  const { t } = useTranslation();
  const [download, setDownload] = useState(null);
  const [loading, setLoading] = useState(false);
@@ -46,6 +44,7 @@ export function JobsDocumentsImgproxyDownloadButton({ bodyshop, galleryImages, i
      };
    });
  }
  function standardMediaDownload(bufferData) {
    const a = document.createElement("a");
    const url = window.URL.createObjectURL(new Blob([bufferData]));
@@ -53,13 +52,14 @@ export function JobsDocumentsImgproxyDownloadButton({ bodyshop, galleryImages, i
    a.download = `${identifier || "documents"}.zip`;
    a.click();
  }
  const handleDownload = async () => {
    logImEXEvent("jobs_documents_download");
    setLoading(true);
    const zipUrl = await axios({
      url: "/media/imgproxy/download",
      method: "POST",
-      data: { documentids: imagesToDownload.map((_) => _.id) }
+      data: { jobId, documentids: imagesToDownload.map((_) => _.id) }
    });
    const theDownloadedZip = await cleanAxios({
--- a/client/src/components/jobs-documents-imgproxy-gallery/jobs-documents-imgproxy-gallery.component.jsx
+++ b/client/src/components/jobs-documents-imgproxy-gallery/jobs-documents-imgproxy-gallery.component.jsx
@@ -75,7 +75,7 @@ function JobsDocumentsImgproxyComponent({
              <SyncOutlined />
            </Button>
            <JobsDocumentsGallerySelectAllComponent galleryImages={galleryImages} setGalleryImages={setGalleryImages} />
-            <JobsDocumentsDownloadButton galleryImages={galleryImages} identifier={downloadIdentifier} />
+            <JobsDocumentsDownloadButton galleryImages={galleryImages} identifier={downloadIdentifier} jobId={jobId} />
            <JobsDocumentsDeleteButton
              galleryImages={galleryImages}
              deletionCallback={billsCallback || fetchThumbnails || refetch}
--- a/client/src/components/jobs-find-modal/jobs-find-modal.container.jsx
+++ b/client/src/components/jobs-find-modal/jobs-find-modal.container.jsx
@@ -65,7 +65,7 @@ export default connect(
    <Modal
      title={t("jobs.labels.existing_jobs")}
      width={"80%"}
-      destroyOnClose
+      destroyOnHidden
      okButtonProps={{ disabled: selectedJob ? false : true }}
      {...modalProps}
    >
--- a/client/src/components/note-upsert-modal/note-upsert-modal.container.jsx
+++ b/client/src/components/note-upsert-modal/note-upsert-modal.container.jsx
@@ -20,7 +20,14 @@ const mapStateToProps = createStructuredSelector({
 });
 const mapDispatchToProps = (dispatch) => ({
  toggleModalVisible: () => dispatch(toggleModalVisible("noteUpsert")),
-  insertAuditTrail: ({ jobid, operation, type }) => dispatch(insertAuditTrail({ jobid, operation, type }))
+  insertAuditTrail: ({ jobid, operation, type }) =>
    dispatch(
      insertAuditTrail({
        jobid,
        operation,
        type
      })
    )
 });
 export function NoteUpsertModalContainer({ currentUser, noteUpsertModal, toggleModalVisible, insertAuditTrail }) {
@@ -123,7 +130,7 @@ export function NoteUpsertModalContainer({ currentUser, noteUpsertModal, toggleM
      onCancel={() => {
        toggleModalVisible();
      }}
-      destroyOnClose
+      destroyOnHidden
    >
      <Form form={form} onFinish={handleFinish} layout="vertical">
        <NoteUpsertModalComponent form={form} />
--- a/client/src/components/notification-center/notification-center.component.jsx
+++ b/client/src/components/notification-center/notification-center.component.jsx
@@ -1,11 +1,11 @@
 import { Virtuoso } from "react-virtuoso";
-import { Badge, Button, Space, Spin, Switch, Tooltip, Typography } from "antd";
+import { Alert, Badge, Button, Space, Spin, Switch, Tooltip, Typography } from "antd";
 import { CheckCircleFilled, CheckCircleOutlined, EyeFilled, EyeOutlined } from "@ant-design/icons";
 import { useTranslation } from "react-i18next";
 import { useNavigate } from "react-router-dom";
 import "./notification-center.styles.scss";
 import day from "../../utils/day.js";
-import { forwardRef, useRef, useEffect } from "react";
+import { forwardRef, useEffect, useRef } from "react";
 import { DateTimeFormat } from "../../utils/DateFormatter.jsx";
 const { Text, Title } = Typography;
@@ -26,7 +26,8 @@ const NotificationCenterComponent = forwardRef(
      markAllRead,
      loadMore,
      onNotificationClick,
-      unreadCount
+      unreadCount,
      isEmployee
    },
    ref
  ) => {
@@ -93,7 +94,12 @@ const NotificationCenterComponent = forwardRef(
                ) : (
                  <EyeOutlined className="notification-toggle-icon" />
                )}
-                <Switch checked={showUnreadOnly} onChange={(checked) => toggleUnreadOnly(checked)} size="small" />
+                <Switch
                  checked={showUnreadOnly}
                  onChange={(checked) => toggleUnreadOnly(checked)}
                  size="small"
                  disabled={!isEmployee}
                />
              </Space>
            </Tooltip>
            <Tooltip title={t("notifications.labels.mark-all-read")}>
@@ -106,14 +112,20 @@ const NotificationCenterComponent = forwardRef(
            </Tooltip>
          </div>
        </div>
-        <Virtuoso
+        {!isEmployee ? (
-          ref={virtuosoRef}
+          <div style={{ padding: 10 }}>
-          style={{ height: "400px", width: "100%" }}
+            <Alert message={t("notifications.labels.employee-notification")} type="warning" />
-          data={notifications}
+          </div>
-          totalCount={notifications.length}
+        ) : (
-          endReached={loadMore}
+          <Virtuoso
-          itemContent={renderNotification}
+            ref={virtuosoRef}
-        />
+            style={{ height: "400px", width: "100%" }}
            data={notifications}
            totalCount={notifications.length}
            endReached={loadMore}
            itemContent={renderNotification}
          />
        )}
      </div>
    );
  }
--- a/client/src/components/notification-center/notification-center.container.jsx
+++ b/client/src/components/notification-center/notification-center.container.jsx
@@ -3,10 +3,11 @@ import { useQuery } from "@apollo/client";
 import { connect } from "react-redux";
 import NotificationCenterComponent from "./notification-center.component";
 import { GET_NOTIFICATIONS } from "../../graphql/notifications.queries";
 import { INITIAL_NOTIFICATIONS, useSocket } from "../../contexts/SocketIO/useSocket.jsx";
 import { createStructuredSelector } from "reselect";
-import { selectBodyshop } from "../../redux/user/user.selectors.js";
+import { selectBodyshop, selectCurrentUser } from "../../redux/user/user.selectors.js";
 import day from "../../utils/day.js";
 import { INITIAL_NOTIFICATIONS, useSocket } from "../../contexts/SocketIO/useSocket.js";
 import { useIsEmployee } from "../../utils/useIsEmployee.js";
 // This will be used to poll for notifications when the socket is disconnected
 const NOTIFICATION_POLL_INTERVAL_SECONDS = 60;
@@ -17,17 +18,18 @@ const NOTIFICATION_POLL_INTERVAL_SECONDS = 60;
 * @param onClose
 * @param bodyshop
 * @param unreadCount
 * @param currentUser
 * @returns {JSX.Element}
 * @constructor
 */
-const NotificationCenterContainer = ({ visible, onClose, bodyshop, unreadCount }) => {
+const NotificationCenterContainer = ({ visible, onClose, bodyshop, unreadCount, currentUser }) => {
  const [showUnreadOnly, setShowUnreadOnly] = useState(false);
  const [notifications, setNotifications] = useState([]);
  const [isLoading, setIsLoading] = useState(false);
  const { isConnected, markNotificationRead, markAllNotificationsRead } = useSocket();
  const notificationRef = useRef(null);
  const userAssociationId = bodyshop?.associations?.[0]?.id;
  const isEmployee = useIsEmployee(bodyshop, currentUser);
  const baseWhereClause = useMemo(() => {
    return { associationid: { _eq: userAssociationId } };
@@ -51,7 +53,7 @@ const NotificationCenterContainer = ({ visible, onClose, bodyshop, unreadCount }
    fetchPolicy: "cache-and-network",
    notifyOnNetworkStatusChange: true,
    pollInterval: isConnected ? 0 : day.duration(NOTIFICATION_POLL_INTERVAL_SECONDS, "seconds").asMilliseconds(),
-    skip: !userAssociationId,
+    skip: !userAssociationId || !isEmployee,
    onError: (err) => {
      console.error(`Error polling Notifications: ${err?.message || ""}`);
      setTimeout(() => refetch(), day.duration(2, "seconds").asMilliseconds());
@@ -71,7 +73,7 @@ const NotificationCenterContainer = ({ visible, onClose, bodyshop, unreadCount }
  }, [visible, onClose]);
  useEffect(() => {
-    if (data?.notifications) {
+    if (data?.notifications && isEmployee) {
      const processedNotifications = data.notifications
        .map((notif) => {
          let scenarioText;
@@ -101,11 +103,13 @@ const NotificationCenterContainer = ({ visible, onClose, bodyshop, unreadCount }
        })
        .sort((a, b) => new Date(b.created_at) - new Date(a.created_at));
      setNotifications(processedNotifications);
    } else if (!isEmployee) {
      setNotifications([]); // Clear notifications if not an employee
    }
-  }, [data]);
+  }, [data, isEmployee]);
  const loadMore = useCallback(() => {
-    if (!queryLoading && data?.notifications.length) {
+    if (!queryLoading && data?.notifications.length && isEmployee) {
      setIsLoading(true); // Show spinner during fetchMore
      fetchMore({
        variables: { offset: data.notifications.length, where: whereClause },
@@ -121,13 +125,14 @@ const NotificationCenterContainer = ({ visible, onClose, bodyshop, unreadCount }
        })
        .finally(() => setIsLoading(false)); // Hide spinner when done
    }
-  }, [data?.notifications?.length, fetchMore, queryLoading, whereClause]);
+  }, [data?.notifications?.length, fetchMore, queryLoading, whereClause, isEmployee]);
  const handleToggleUnreadOnly = (value) => {
    setShowUnreadOnly(value);
  };
  const handleMarkAllRead = useCallback(() => {
    if (!isEmployee) return; // Do nothing if not an employee
    setIsLoading(true);
    markAllNotificationsRead()
      .then(() => {
@@ -147,7 +152,7 @@ const NotificationCenterContainer = ({ visible, onClose, bodyshop, unreadCount }
      })
      .catch((e) => console.error(`Error marking all notifications read: ${e?.message || ""}`))
      .finally(() => setIsLoading(false));
-  }, [markAllNotificationsRead, userAssociationId, showUnreadOnly]);
+  }, [markAllNotificationsRead, userAssociationId, showUnreadOnly, isEmployee]);
  const handleNotificationClick = useCallback(
    (notificationId) => {
@@ -170,17 +175,18 @@ const NotificationCenterContainer = ({ visible, onClose, bodyshop, unreadCount }
  );
  useEffect(() => {
-    if (visible && !isConnected) {
+    if (visible && !isConnected && isEmployee) {
      setIsLoading(true);
      refetch()
        .catch((err) => console.error(`Error re-fetching notifications: ${err?.message || ""}`))
        .finally(() => setIsLoading(false));
    }
-  }, [visible, isConnected, refetch]);
+  }, [visible, isConnected, refetch, isEmployee]);
  return (
    <NotificationCenterComponent
      ref={notificationRef}
      isEmployee={isEmployee}
      visible={visible}
      onClose={onClose}
      notifications={notifications}
@@ -196,7 +202,8 @@ const NotificationCenterContainer = ({ visible, onClose, bodyshop, unreadCount }
 };
 const mapStateToProps = createStructuredSelector({
-  bodyshop: selectBodyshop
+  bodyshop: selectBodyshop,
  currentUser: selectCurrentUser
 });
 export default connect(mapStateToProps, null)(NotificationCenterContainer);
--- a/client/src/components/notification-settings/notification-settings-form.component.jsx
+++ b/client/src/components/notification-settings/notification-settings-form.component.jsx
@@ -1,32 +1,41 @@
 import { useMutation, useQuery } from "@apollo/client";
 import { useEffect, useState } from "react";
-import { Button, Card, Checkbox, Form, Space, Table } from "antd";
+import { Alert, Button, Card, Checkbox, Divider, Form, Space, Switch, Table, Typography } from "antd";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
-import { selectCurrentUser } from "../../redux/user/user.selectors";
+import { selectBodyshop, selectCurrentUser } from "../../redux/user/user.selectors";
 import AlertComponent from "../alert/alert.component";
-import { QUERY_NOTIFICATION_SETTINGS, UPDATE_NOTIFICATION_SETTINGS } from "../../graphql/user.queries.js";
+import {
  QUERY_NOTIFICATION_SETTINGS,
  UPDATE_NOTIFICATION_SETTINGS,
  UPDATE_NOTIFICATIONS_AUTOADD
 } from "../../graphql/user.queries.js";
 import { notificationScenarios } from "../../utils/jobNotificationScenarios.js";
 import LoadingSpinner from "../loading-spinner/loading-spinner.component.jsx";
 import PropTypes from "prop-types";
 import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
 import ColumnHeaderCheckbox from "../notification-settings/column-header-checkbox.component.jsx";
 import { useIsEmployee } from "../../utils/useIsEmployee.js";
 /**
 * Notifications Settings Form
 * @param currentUser
 * @param bodyshop
 * @returns {JSX.Element}
 * @constructor
 */
-const NotificationSettingsForm = ({ currentUser }) => {
+const NotificationSettingsForm = ({ currentUser, bodyshop }) => {
  const { t } = useTranslation();
  const [form] = Form.useForm();
  const [initialValues, setInitialValues] = useState({});
  const [isDirty, setIsDirty] = useState(false);
  const [autoAddEnabled, setAutoAddEnabled] = useState(false);
  const [initialAutoAdd, setInitialAutoAdd] = useState(false);
  const notification = useNotification();
  const isEmployee = useIsEmployee(bodyshop, currentUser);
-  // Fetch notification settings.
+  // Fetch notification settings and notifications_autoadd
  const { loading, error, data } = useQuery(QUERY_NOTIFICATION_SETTINGS, {
    fetchPolicy: "network-only",
    nextFetchPolicy: "network-only",
@@ -34,13 +43,16 @@ const NotificationSettingsForm = ({ currentUser }) => {
    skip: !currentUser
  });
-  const [updateNotificationSettings, { loading: saving }] = useMutation(UPDATE_NOTIFICATION_SETTINGS);
+  const [updateNotificationSettings, { loading: savingSettings }] = useMutation(UPDATE_NOTIFICATION_SETTINGS);
  const [updateNotificationsAutoAdd, { loading: savingAutoAdd }] = useMutation(UPDATE_NOTIFICATIONS_AUTOADD);
-  // Populate form with fetched data.
+  // Populate form with fetched data
  useEffect(() => {
    if (data?.associations?.length > 0) {
      const settings = data.associations[0].notification_settings || {};
-      // Ensure each scenario has an object with { app, email, fcm }.
+      const autoAdd = data.associations[0].notifications_autoadd ?? false;
      // Ensure each scenario has an object with { app, email, fcm }
      const formattedValues = notificationScenarios.reduce((acc, scenario) => {
        acc[scenario] = settings[scenario] ?? { app: false, email: false, fcm: false };
        return acc;
@@ -48,32 +60,66 @@ const NotificationSettingsForm = ({ currentUser }) => {
      setInitialValues(formattedValues);
      form.setFieldsValue(formattedValues);
-      setIsDirty(false); // Reset dirty state when new data loads.
+      setAutoAddEnabled(autoAdd);
      setInitialAutoAdd(autoAdd);
      setIsDirty(false); // Reset dirty state when new data loads
    }
  }, [data, form]);
  // Handle toggle of notifications_autoadd
  const handleAutoAddToggle = async (checked) => {
    if (data?.associations?.length > 0) {
      const userId = data.associations[0].id;
      try {
        const result = await updateNotificationsAutoAdd({
          variables: { id: userId, autoadd: checked }
        });
        if (!result?.errors) {
          setAutoAddEnabled(checked);
          setInitialAutoAdd(checked);
          notification.success({ message: t("notifications.labels.auto-add-success") });
          setIsDirty(false); // Reset dirty state if only auto-add was changed
        } else {
          throw new Error("Failed to update auto-add setting");
        }
      } catch (err) {
        setAutoAddEnabled(!checked); // Revert on error
        notification.error({ message: t("notifications.labels.auto-add-failure") });
      }
    }
  };
  // Handle save of notification settings
  const handleSave = async (values) => {
    if (data?.associations?.length > 0) {
      const userId = data.associations[0].id;
-      // Save the updated notification settings.
+      try {
-      const result = await updateNotificationSettings({ variables: { id: userId, ns: values } });
+        const result = await updateNotificationSettings({ variables: { id: userId, ns: values } });
-      if (!result?.errors) {
+        if (!result?.errors) {
-        notification.success({ message: t("notifications.labels.notification-settings-success") });
+          notification.success({ message: t("notifications.labels.notification-settings-success") });
-        setInitialValues(values);
+          setInitialValues(values);
-        setIsDirty(false);
+          setIsDirty(false);
-      } else {
+        } else {
          throw new Error("Failed to update notification settings");
        }
      } catch (err) {
        notification.error({ message: t("notifications.labels.notification-settings-failure") });
      }
    }
  };
-  // Mark the form as dirty on any manual change.
+  // Mark the form as dirty on any manual change
  const handleFormChange = () => {
    setIsDirty(true);
  };
  // Check if auto-add has changed
  const isAutoAddDirty = autoAddEnabled !== initialAutoAdd;
  // Handle reset of form and auto-add
  const handleReset = () => {
    form.setFieldsValue(initialValues);
    setAutoAddEnabled(initialAutoAdd);
    setIsDirty(false);
  };
@@ -139,17 +185,30 @@ const NotificationSettingsForm = ({ currentUser }) => {
        title={t("notifications.labels.notificationscenarios")}
        extra={
          <Space>
-            <Button type="default" onClick={handleReset} disabled={!isDirty}>
+            <Typography.Text type="secondary">{t("notifications.labels.auto-add")}</Typography.Text>
            <Switch
              checked={autoAddEnabled}
              onChange={handleAutoAddToggle}
              loading={savingAutoAdd}
              // checkedChildren={t("notifications.labels.auto-add-on")}
              // unCheckedChildren={t("notifications.labels.auto-add-off")}
            />
            <Button type="default" onClick={handleReset} disabled={!isDirty && !isAutoAddDirty}>
              {t("general.actions.clear")}
            </Button>
-
+            <Button type="primary" htmlType="submit" disabled={!isDirty} loading={savingSettings}>
            <Button type="primary" htmlType="submit" disabled={!isDirty} loading={saving}>
              {t("notifications.labels.save")}
            </Button>
          </Space>
        }
      >
        {!isEmployee && (
          <div style={{ width: "100%", marginBottom: "10px" }}>
            <Alert message={t("notifications.labels.employee-notification")} type="warning" />
          </div>
        )}
        <Table dataSource={dataSource} columns={columns} pagination={false} bordered rowKey="key" />
        <Divider />
      </Card>
    </Form>
  );
@@ -158,11 +217,13 @@ const NotificationSettingsForm = ({ currentUser }) => {
 NotificationSettingsForm.propTypes = {
  currentUser: PropTypes.shape({
    email: PropTypes.string.isRequired
-  }).isRequired
+  }).isRequired,
  bodyshop: PropTypes.object.isRequired
 };
 const mapStateToProps = createStructuredSelector({
-  currentUser: selectCurrentUser
+  currentUser: selectCurrentUser,
  bodyshop: selectBodyshop
 });
 export default connect(mapStateToProps)(NotificationSettingsForm);
--- a/client/src/components/parts-order-modal/parts-order-modal.container.jsx
+++ b/client/src/components/parts-order-modal/parts-order-modal.container.jsx
@@ -333,7 +333,7 @@ export function PartsOrderModalContainer({
      onOk={() => form.submit()}
      okButtonProps={{ loading: saving }}
      cancelButtonProps={{ loading: saving }}
-      destroyOnClose
+      destroyOnHidden
      width="75%"
      forceRender
    >
--- a/client/src/components/parts-queue-card/parts-queue-card.component.jsx
+++ b/client/src/components/parts-queue-card/parts-queue-card.component.jsx
@@ -46,7 +46,7 @@ export default function PartsQueueDetailCard() {
  };
  return (
-    <Drawer open={!!selected} destroyOnClose width={drawerPercentage} placement="right" onClose={handleDrawerClose}>
+    <Drawer open={!!selected} destroyOnHidden width={drawerPercentage} placement="right" onClose={handleDrawerClose}>
      {loading ? <LoadingSpinner /> : null}
      {error ? <AlertComponent message={error.message} type="error" /> : null}
      {data ? (
--- a/client/src/components/parts-receive-modal/parts-receive-modal.container.jsx
+++ b/client/src/components/parts-receive-modal/parts-receive-modal.container.jsx
@@ -90,7 +90,7 @@ export function PartsReceiveModalContainer({ partsReceiveModal, toggleModalVisib
      onCancel={() => toggleModalVisible()}
      onOk={() => form.submit()}
      okButtonProps={{ loading: loading }}
-      destroyOnClose
+      destroyOnHidden
      forceRender
      width="50%"
    >
--- a/client/src/components/payment-modal/payment-modal.container.jsx
+++ b/client/src/components/payment-modal/payment-modal.container.jsx
@@ -134,7 +134,7 @@ function PaymentModalContainer({ paymentModal, toggleModalVisible, bodyshop }) {
    <Modal
      title={!context || (context && !context.id) ? t("payments.labels.new") : t("payments.labels.edit")}
      open={open}
-      destroyOnClose
+      destroyOnHidden
      okText={t("general.actions.save")}
      onOk={() => form.submit()}
      width="50%"
--- a/client/src/components/payments-generate-link/payments-generate-link.component.jsx
+++ b/client/src/components/payments-generate-link/payments-generate-link.component.jsx
@@ -10,7 +10,7 @@ import { createStructuredSelector } from "reselect";
 import { openChatByPhone, setMessage } from "../../redux/messaging/messaging.actions";
 import { selectBodyshop, selectCurrentUser } from "../../redux/user/user.selectors";
 import CurrencyFormItemComponent from "../form-items-formatted/currency-form-item.component";
-import { useSocket } from "../../contexts/SocketIO/useSocket.jsx";
+import { useSocket } from "../../contexts/SocketIO/useSocket.js";
 const mapStateToProps = createStructuredSelector({
  bodyshop: selectBodyshop,
--- a/client/src/components/print-center-modal/print-center-modal.container.jsx
+++ b/client/src/components/print-center-modal/print-center-modal.container.jsx
@@ -32,7 +32,7 @@ export function PrintCenterModalContainer({ printCenterModal, toggleModalVisible
      okText={t("general.actions.close")}
      width="90%"
      title={t("printcenter.labels.title")}
-      destroyOnClose
+      destroyOnHidden
    >
      <PrintCenterModalComponent context={context} />
    </Modal>
--- a/client/src/components/production-board-kanban/production-board-kanban.container.jsx
+++ b/client/src/components/production-board-kanban/production-board-kanban.container.jsx
@@ -12,7 +12,7 @@ import { QUERY_KANBAN_SETTINGS } from "../../graphql/user.queries";
 import { selectBodyshop, selectCurrentUser } from "../../redux/user/user.selectors";
 import ProductionBoardKanbanComponent from "./production-board-kanban.component";
 import { useSplitTreatments } from "@splitsoftware/splitio-react";
-import { useSocket } from "../../contexts/SocketIO/useSocket.jsx";
+import { useSocket } from "../../contexts/SocketIO/useSocket.js";
 const mapStateToProps = createStructuredSelector({
  bodyshop: selectBodyshop,
--- a/client/src/components/production-board-kanban/settings/FilterSettings.jsx
+++ b/client/src/components/production-board-kanban/settings/FilterSettings.jsx
@@ -1,7 +1,6 @@
 import React from "react";
 import { Card, Form, Select } from "antd";
 import { useTranslation } from "react-i18next";
 import PropTypes from "prop-types";
 import { useTranslation } from "react-i18next";
 const FilterSettings = ({
  selectedMdInsCos,
--- a/client/src/components/production-board-kanban/settings/InformationSettings.jsx
+++ b/client/src/components/production-board-kanban/settings/InformationSettings.jsx
@@ -1,10 +1,9 @@
 import { Card, Checkbox, Col, Form, Row } from "antd";
 import React from "react";
 import PropTypes from "prop-types";
 const InformationSettings = ({ t }) => (
-  <Card title={t("production.settings.information")}>
+  <Card title={t("production.settings.information")} style={{ maxWidth: "100%", overflowX: "auto" }}>
-    <Row gutter={[16, 16]}>
+    <Row gutter={[16, 16]} wrap>
      {[
        "model_info",
        "ownr_nm",
@@ -21,7 +20,7 @@ const InformationSettings = ({ t }) => (
        "subtotal",
        "tasks"
      ].map((item) => (
-        <Col span={4} key={item}>
+        <Col xs={24} sm={12} md={8} lg={6} key={item}>
          <Form.Item name={item} valuePropName="checked">
            <Checkbox>{t(`production.labels.${item}`)}</Checkbox>
          </Form.Item>
--- a/client/src/components/production-board-kanban/settings/LayoutSettings.jsx
+++ b/client/src/components/production-board-kanban/settings/LayoutSettings.jsx
@@ -1,9 +1,8 @@
 import { Card, Col, Form, Radio, Row } from "antd";
 import React from "react";
 import PropTypes from "prop-types";
 const LayoutSettings = ({ t }) => (
-  <Card title={t("production.settings.layout")}>
+  <Card title={t("production.settings.layout")} style={{ maxWidth: "100%", overflowX: "auto" }}>
    <Row gutter={[16, 16]}>
      {[
        {
@@ -48,9 +47,9 @@ const LayoutSettings = ({ t }) => (
          ]
        }
      ].map(({ name, label, options }) => (
-        <Col span={4} key={name}>
+        <Col xs={24} sm={16} md={10} lg={8} key={name}>
          <Form.Item name={name} label={label}>
-            <Radio.Group>
+            <Radio.Group style={{ display: "flex", flexWrap: "nowrap" }}>
              {options.map((option) => (
                <Radio.Button key={option.value.toString()} value={option.value}>
                  {option.label}
--- a/client/src/components/production-board-kanban/settings/StatisticsSettings.jsx
+++ b/client/src/components/production-board-kanban/settings/StatisticsSettings.jsx
@@ -1,8 +1,7 @@
 import { Card, Checkbox, Form } from "antd";
 import PropTypes from "prop-types";
 import { DragDropContext, Draggable, Droppable } from "../trello-board/dnd/lib/index.js";
 import { statisticsItems } from "./defaultKanbanSettings.js";
 import { Card, Checkbox, Form } from "antd";
 import React from "react";
 import PropTypes from "prop-types";
 const StatisticsSettings = ({ t, statisticsOrder, setStatisticsOrder, setHasChanges }) => {
  const onDragEnd = (result) => {
--- a/client/src/components/production-board-kanban/settings/production-board-kanban.settings.component.jsx
+++ b/client/src/components/production-board-kanban/settings/production-board-kanban.settings.component.jsx
@@ -1,17 +1,17 @@
 import { SettingOutlined } from "@ant-design/icons";
 import { useMutation } from "@apollo/client";
 import { Button, Card, Col, Form, Popover, Row, Tabs } from "antd";
 import { isFunction } from "lodash";
 import PropTypes from "prop-types";
 import { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { useNotification } from "../../../contexts/Notifications/notificationContext.jsx";
 import { UPDATE_KANBAN_SETTINGS } from "../../../graphql/user.queries.js";
 import { defaultKanbanSettings, mergeWithDefaults } from "./defaultKanbanSettings.js";
 import LayoutSettings from "./LayoutSettings.jsx";
 import InformationSettings from "./InformationSettings.jsx";
 import StatisticsSettings from "./StatisticsSettings.jsx";
 import FilterSettings from "./FilterSettings.jsx";
-import PropTypes from "prop-types";
+import InformationSettings from "./InformationSettings.jsx";
-import { isFunction } from "lodash";
+import LayoutSettings from "./LayoutSettings.jsx";
-import { useNotification } from "../../../contexts/Notifications/notificationContext.jsx";
+import StatisticsSettings from "./StatisticsSettings.jsx";
 import { SettingOutlined } from "@ant-design/icons";
 function ProductionBoardKanbanSettings({ associationSettings, parentLoading, bodyshop, data, onSettingsChange }) {
  const [form] = Form.useForm();
@@ -87,7 +87,7 @@ function ProductionBoardKanbanSettings({ associationSettings, parentLoading, bod
  };
  const overlay = (
-    <Card style={{ minWidth: "80vw" }}>
+    <Card style={{ maxWidth: "80vw", width: "100%"}}>
      <Form form={form} onFinish={handleFinish} layout="vertical" onValuesChange={handleValuesChange}>
        <Tabs
          defaultActiveKey="1"
--- a/client/src/components/production-board-kanban/trello-board/controllers/BoardContainer.jsx
+++ b/client/src/components/production-board-kanban/trello-board/controllers/BoardContainer.jsx
@@ -100,26 +100,28 @@ const BoardContainer = ({
  const onLaneDrag = useCallback(
    async ({ draggableId, type, source, reason, mode, destination, combine }) => {
      setIsDragging(false);
      setDragTime(source.droppableId);
      if (!type || type !== "lane" || !source || !destination || isEqual(source, destination)) return;
-      setIsProcessing(true);
+      // Only update drag time if it's a valid drop with a different destination
      if (type === "lane" && source && destination && !isEqual(source, destination)) {
        setDragTime(source.droppableId);
        setIsProcessing(true);
-      dispatch(
+        dispatch(
-        actions.moveCardAcrossLanes({
+          actions.moveCardAcrossLanes({
-          fromLaneId: source.droppableId,
+            fromLaneId: source.droppableId,
-          toLaneId: destination.droppableId,
+            toLaneId: destination.droppableId,
-          cardId: draggableId,
+            cardId: draggableId,
-          index: destination.index
+            index: destination.index
-        })
+          })
-      );
+        );
-      try {
+        try {
-        await onDragEnd({ draggableId, type, source, reason, mode, destination, combine });
+          await onDragEnd({ draggableId, type, source, reason, mode, destination, combine });
-      } catch (err) {
+        } catch (err) {
-        console.error("Error in onLaneDrag", err);
+          console.error("Error in onLaneDrag", err);
-      } finally {
+        } finally {
-        setIsProcessing(false);
+          setIsProcessing(false);
        }
      }
    },
    [dispatch, onDragEnd, setDragTime]
--- a/client/src/components/production-board-kanban/trello-board/controllers/Lane.jsx
+++ b/client/src/components/production-board-kanban/trello-board/controllers/Lane.jsx
@@ -120,15 +120,14 @@ const Lane = ({
      const Component = orientation === "vertical" ? VirtuosoGrid : Virtuoso;
      const FinalComponent = collapsed ? "div" : Component;
      const commonProps = {
-        useWindowScroll: true,
+        data: renderedCards,
-        data: renderedCards
+        customScrollParent: laneRef.current
      };
      const verticalProps = {
        ...commonProps,
        listClassName: "grid-container",
        itemClassName: "grid-item",
        customScrollParent: laneRef.current,
        components: {
          List: ListComponent,
          Item: ItemComponent
@@ -142,7 +141,6 @@ const Lane = ({
        components: { Item: HeightPreservingItem },
        overscan: { main: 3, reverse: 3 },
        itemContent: (index, item) => renderDraggable(index, item),
        scrollerRef: provided.innerRef,
        style: {
          minWidth: maxCardWidth,
          minHeight: maxLaneHeight
@@ -180,13 +178,14 @@ const Lane = ({
          override={orientation !== "horizontal" && (collapsed || !renderedCards.length)}
        >
          <div
-            {...provided.droppableProps}
+            ref={laneRef} // Ensure laneRef is set here
-            ref={provided.innerRef}
+            style={{ height: "100%", width: "100%" }} // Make it scrollable
            className={`react-trello-lane ${collapsed ? "lane-collapsed" : ""}`}
            style={{ ...provided.droppableProps.style }}
          >
-            <FinalComponent {...finalComponentProps} />
+            <div {...provided.droppableProps} ref={provided.innerRef} style={{ ...provided.droppableProps.style }}>
-            {shouldRenderPlaceholder && provided.placeholder}
+              <FinalComponent {...finalComponentProps} />
              {shouldRenderPlaceholder && provided.placeholder}
            </div>
          </div>
        </HeightMemoryWrapper>
      );
--- a/client/src/components/production-list-detail/production-list-detail.component.jsx
+++ b/client/src/components/production-list-detail/production-list-detail.component.jsx
@@ -7,7 +7,7 @@ import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { useLocation, useNavigate } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
-import { useSocket } from "../../contexts/SocketIO/useSocket.jsx";
+import { useSocket } from "../../contexts/SocketIO/useSocket.js";
 import { logImEXEvent } from "../../firebase/firebase.utils.js";
 import { QUERY_JOB_CARD_DETAILS, UPDATE_JOB } from "../../graphql/jobs.queries";
 import { insertAuditTrail } from "../../redux/application/application.actions.js";
--- a/client/src/components/production-list-table/production-list-table.container.jsx
+++ b/client/src/components/production-list-table/production-list-table.container.jsx
@@ -10,7 +10,7 @@ import {
 import ProductionListTable from "./production-list-table.component";
 import _ from "lodash";
 import { useSplitTreatments } from "@splitsoftware/splitio-react";
-import { useSocket } from "../../contexts/SocketIO/useSocket.jsx";
+import { useSocket } from "../../contexts/SocketIO/useSocket.js";
 export default function ProductionListTableContainer({ bodyshop, subscriptionType = "direct" }) {
  const client = useApolloClient();
--- a/client/src/components/profile-my/profile-my.component.jsx
+++ b/client/src/components/profile-my/profile-my.component.jsx
@@ -8,7 +8,7 @@ import { selectCurrentUser } from "../../redux/user/user.selectors";
 import { logImEXEvent, updateCurrentPassword } from "../../firebase/firebase.utils";
 import LayoutFormRow from "../layout-form-row/layout-form-row.component";
 import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
-import { useSocket } from "../../contexts/SocketIO/useSocket.jsx";
+import { useSocket } from "../../contexts/SocketIO/useSocket.js";
 import NotificationSettingsForm from "../notification-settings/notification-settings-form.component.jsx";
 const mapStateToProps = createStructuredSelector({
--- a/client/src/components/profile-shops/profile-shops.container.jsx
+++ b/client/src/components/profile-shops/profile-shops.container.jsx
@@ -54,6 +54,9 @@ export function ProfileShopsContainer({ bodyshop, currentUser }) {
    //Force window refresh.
    //Ping the new partner to refresh.
    axios.post("http://localhost:1337/refresh");
    window.location.reload();
  };
--- a/client/src/components/report-center-modal/report-center-modal.container.jsx
+++ b/client/src/components/report-center-modal/report-center-modal.container.jsx
@@ -28,7 +28,7 @@ export function ReportCenterModalContainer({ reportCenterModal, toggleModalVisib
      onOk={() => toggleModalVisible()}
      onCancel={() => toggleModalVisible()}
      cancelButtonProps={{ style: { display: "none" } }}
-      destroyOnClose
+      destroyOnHidden
      width="80%"
    >
      <RbacWrapperComponent action="shop:reportcenter">
--- a/client/src/components/schedule-job-modal/schedule-job-modal.component.jsx
+++ b/client/src/components/schedule-job-modal/schedule-job-modal.component.jsx
@@ -1,6 +1,6 @@
 import { Button, Col, Form, Input, Row, Select, Space, Switch, Typography } from "antd";
 import axios from "axios";
-import React, { useState } from "react";
+import { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
@@ -8,16 +8,16 @@ import { calculateScheduleLoad } from "../../redux/application/application.actio
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import { DateFormatter } from "../../utils/DateFormatter";
 import dayjs from "../../utils/day";
 import BlurWrapper from "../feature-wrapper/blur-wrapper.component";
 import { HasFeatureAccess } from "../feature-wrapper/feature-wrapper.component";
 import DateTimePicker from "../form-date-time-picker/form-date-time-picker.component";
 import EmailInput from "../form-items-formatted/email-form-item.component";
 import LayoutFormRow from "../layout-form-row/layout-form-row.component";
 import LockWrapperComponent from "../lock-wrapper/lock-wrapper.component";
 import ScheduleDayViewContainer from "../schedule-day-view/schedule-day-view.container";
 import ScheduleExistingAppointmentsList from "../schedule-existing-appointments-list/schedule-existing-appointments-list.component";
 import "./schedule-job-modal.scss";
 import LockWrapperComponent from "../lock-wrapper/lock-wrapper.component";
 import BlurWrapper from "../feature-wrapper/blur-wrapper.component";
 import UpsellComponent, { upsellEnum } from "../upsell/upsell.component";
 import "./schedule-job-modal.scss";
 const mapStateToProps = createStructuredSelector({
  bodyshop: selectBodyshop
@@ -60,10 +60,12 @@ export function ScheduleJobModalComponent({
      const totalHours =
        lbrHrsData.jobs_by_pk.labhrs.aggregate.sum.mod_lb_hrs + lbrHrsData.jobs_by_pk.larhrs.aggregate.sum.mod_lb_hrs;
-      if (values.start && !values.scheduled_completion)
+      if (values.start && !values.scheduled_completion) {
-        form.setFieldsValue({
+        const addDays = bodyshop.ss_configuration.nobusinessdays
-          scheduled_completion: dayjs(values.start).businessDaysAdd(totalHours / bodyshop.target_touchtime, "day")
+          ? dayjs(values.start).add(totalHours / (bodyshop.target_touchtime || 1), "day")
-        });
+          : dayjs(values.start).businessDaysAdd(totalHours / (bodyshop.target_touchtime || 1), "day");
        form.setFieldsValue({ scheduled_completion: addDays });
      }
    }
  };
--- a/client/src/components/schedule-job-modal/schedule-job-modal.container.jsx
+++ b/client/src/components/schedule-job-modal/schedule-job-modal.container.jsx
@@ -209,7 +209,7 @@ export function ScheduleJobModalContainer({
      onOk={() => form.submit()}
      width={"90%"}
      maskClosable={false}
-      destroyOnClose
+      destroyOnHidden
      okButtonProps={{
        loading: loading
      }}
--- a/client/src/components/scoreboard-jobs-list/scoreboard-jobs-list.component.jsx
+++ b/client/src/components/scoreboard-jobs-list/scoreboard-jobs-list.component.jsx
@@ -106,7 +106,7 @@ export default function ScoreboardJobsList({ scoreBoardlist }) {
    <>
      <Modal
        open={state.open}
-        destroyOnClose
+        destroyOnHidden
        width="80%"
        closable={false}
        cancelButtonProps={{ style: { display: "none" } }}
--- a/client/src/components/shop-info/shop-info.component.jsx
+++ b/client/src/components/shop-info/shop-info.component.jsx
@@ -1,4 +1,3 @@
 import { useSplitTreatments } from "@splitsoftware/splitio-react";
 import { Button, Card, Tabs } from "antd";
 import React from "react";
@@ -24,6 +23,8 @@ import ShopInfoRoGuard from "./shop-info.roguard.component";
 import ShopInfoIntellipay from "./shop-intellipay-config.component";
 import { HasFeatureAccess } from "../feature-wrapper/feature-wrapper.component";
 import LockWrapperComponent from "../lock-wrapper/lock-wrapper.component";
 import { useSocket } from "../../contexts/SocketIO/useSocket.js";
 import ShopInfoNotificationsAutoadd from "./shop-info.notifications-autoadd.component.jsx";
 const mapStateToProps = createStructuredSelector({
  bodyshop: selectBodyshop
@@ -41,6 +42,7 @@ export function ShopInfoComponent({ bodyshop, form, saveLoading }) {
    names: ["CriticalPartsScanning", "Enhanced_Payroll"],
    splitKey: bodyshop.imexshopid
  });
  const { scenarioNotificationsOn } = useSocket();
  const { t } = useTranslation();
  const history = useNavigate();
@@ -137,9 +139,21 @@ export function ShopInfoComponent({ bodyshop, form, saveLoading }) {
    {
      key: "intellipay",
-      label: InstanceRenderManager({ rome: t("bodyshop.labels.romepay"), imex: t("bodyshop.labels.imexpay") }),
+      label: InstanceRenderManager({
        rome: t("bodyshop.labels.romepay"),
        imex: t("bodyshop.labels.imexpay")
      }),
      children: <ShopInfoIntellipay form={form} />
-    }
+    },
    ...(scenarioNotificationsOn
      ? [
          {
            key: "notifications_autoadd",
            label: t("bodyshop.labels.notifications.followers"),
            children: <ShopInfoNotificationsAutoadd form={form} bodyshop={bodyshop} />
          }
        ]
      : [])
  ];
  return (
    <Card
--- a/client/src/components/shop-info/shop-info.general.component.jsx
+++ b/client/src/components/shop-info/shop-info.general.component.jsx
@@ -906,6 +906,7 @@ export function ShopInfoGeneral({ form, bodyshop }) {
                      add();
                    }}
                    style={{ width: "100%" }}
                    id="insurancecos-add-button"
                  >
                    {t("general.actions.add")}
                  </Button>
--- a/client/src/components/shop-info/shop-info.notifications-autoadd.component.jsx
+++ b/client/src/components/shop-info/shop-info.notifications-autoadd.component.jsx
@@ -0,0 +1,57 @@
 import { Form, Typography } from "antd";
 import { useTranslation } from "react-i18next";
 import EmployeeSearchSelectComponent from "../employee-search-select/employee-search-select.component.jsx";
 const { Text, Paragraph } = Typography;
 export default function ShopInfoNotificationsAutoadd({ bodyshop }) {
  const { t } = useTranslation();
  // Filter employee options to ensure active employees with valid IDs
  const employeeOptions = bodyshop?.employees?.filter((e) => e.active && e.user_email && e.id) || [];
  return (
    <div>
      <Paragraph>{t("bodyshop.fields.notifications.description")}</Paragraph>
      <Text type="secondary">{t("bodyshop.labels.notifications.followers")}</Text>
      {employeeOptions.length > 0 ? (
        <Form.Item
          name="notification_followers"
          rules={[
            {
              type: "array",
              message: t("general.validation.array")
            },
            {
              validator: async (_, value) => {
                if (!value || value.length === 0) {
                  return Promise.resolve(); // Allow empty array
                }
                const hasInvalid = value.some((id) => id == null || typeof id !== "string" || id.trim() === "");
                if (hasInvalid) {
                  return Promise.reject(new Error(t("bodyshop.fields.notifications.invalid_followers")));
                }
                return Promise.resolve();
              }
            }
          ]}
        >
          <EmployeeSearchSelectComponent
            style={{ minWidth: "100%" }}
            mode="multiple"
            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>
      ) : (
        <Text type="secondary">{t("bodyshop.fields.no_employees_available")}</Text>
      )}
    </div>
  );
 }
--- a/client/src/components/shop-info/shop-info.scheduling.component.jsx
+++ b/client/src/components/shop-info/shop-info.scheduling.component.jsx
@@ -1,16 +1,15 @@
 import { DeleteFilled } from "@ant-design/icons";
 import { Button, Divider, Form, Input, InputNumber, Select, Space, Switch, TimePicker } from "antd";
 import React from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import { HasFeatureAccess } from "../feature-wrapper/feature-wrapper.component";
 import ColorpickerFormItemComponent from "../form-items-formatted/colorpicker-form-item.component";
 import FormListMoveArrows from "../form-list-move-arrows/form-list-move-arrows.component";
 import LayoutFormRow from "../layout-form-row/layout-form-row.component";
 import { ColorPicker } from "./shop-info.rostatus.component";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 const mapStateToProps = createStructuredSelector({
  bodyshop: selectBodyshop
 });
@@ -78,6 +77,13 @@ export function ShopInfoSchedulingComponent({ form, bodyshop }) {
        >
          <InputNumber min={0} />
        </Form.Item>
        <Form.Item
          name={["ss_configuration", "nobusinessdays"]}
          label={t("bodyshop.fields.ss_configuration.nobusinessdays")}
          valuePropName="checked"
        >
          <Switch />
        </Form.Item>
        <Form.Item
          name={["md_lost_sale_reasons"]}
          label={t("bodyshop.fields.md_lost_sale_reasons")}
--- a/client/src/components/shop-template-test-render/shop-template-test-render.component.jsx
+++ b/client/src/components/shop-template-test-render/shop-template-test-render.component.jsx
@@ -25,23 +25,6 @@ export function ShopTemplateTestRender({ bodyshop, query, emailEditorRef, style
      emailEditorRef.current.exportHtml(async (data) => {
        try {
          // const inlineHtml = await axios.post("/render/inlinecss", {
          //   html: data.html,
          //   url: `${window.location.protocol}://${window.location.host}/`,
          // });
          // const { data: contextData } = await client.query({
          //   query: gql(query),
          //   variables: variables,
          //
          // });
          // const renderResponse = await axios.post("/render", {
          //   view: inlineHtml.data,
          //   context: { ...contextData, bodyshop: bodyshop },
          // });
          //  displayTemplateInWindowNoprint(renderResponse.data);
          setLoading(false);
        } catch (error) {
          setLoading(false);
--- a/client/src/components/task-upsert-modal/task-upsert-modal.container.jsx
+++ b/client/src/components/task-upsert-modal/task-upsert-modal.container.jsx
@@ -275,7 +275,7 @@ export function TaskUpsertModalContainer({ bodyshop, currentUser, taskUpsert, to
        toggleModalVisible();
      }}
      okButtonProps={{ disabled: !isTouched }}
-      destroyOnClose
+      destroyOnHidden
    >
      <Form
        form={form}
--- a/client/src/components/tech-lookup-jobs-drawer/tech-lookup-jobs-drawer.component.jsx
+++ b/client/src/components/tech-lookup-jobs-drawer/tech-lookup-jobs-drawer.component.jsx
@@ -70,7 +70,7 @@ export function TechLookupJobsDrawer({ bodyshop, setPrintCenterContext }) {
  };
  return (
-    <Drawer open={!!selected} destroyOnClose width={drawerPercentage} placement="right" onClose={handleDrawerClose}>
+    <Drawer open={!!selected} destroyOnHidden width={drawerPercentage} placement="right" onClose={handleDrawerClose}>
      {loading ? <LoadingSpinner /> : null}
      {error ? <AlertComponent message={error.message} type="error" /> : null}
      {data ? (
--- a/client/src/components/time-ticket-list/time-ticket-list-team-pay.component.jsx
+++ b/client/src/components/time-ticket-list/time-ticket-list-team-pay.component.jsx
@@ -39,7 +39,7 @@ export function TimeTicketListTeamPay({ bodyshop, context, actions }) {
  return (
    <>
-      <Modal width={"80%"} open={visible} destroyOnClose onOk={handleOk} onCancel={() => setVisible(false)}>
+      <Modal width={"80%"} open={visible} destroyOnHidden onOk={handleOk} onCancel={() => setVisible(false)}>
        <Form layout="vertical" form={form} initialValues={{ jobid: jobId }}>
          <LayoutFormRow grow noDivider>
            <Form.Item shouldUpdate>
--- a/client/src/components/time-ticket-modal/time-ticket-modal.component.jsx
+++ b/client/src/components/time-ticket-modal/time-ticket-modal.component.jsx
@@ -1,7 +1,6 @@
 import { useLazyQuery } from "@apollo/client";
 import { useSplitTreatments } from "@splitsoftware/splitio-react";
-import { Form, Input, InputNumber, Select, Switch } from "antd";
+import { Card, Form, Input, InputNumber, Select, Space, Switch } from "antd";
 import React from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
@@ -19,6 +18,7 @@ import LayoutFormRow from "../layout-form-row/layout-form-row.component";
 import LoadingSkeleton from "../loading-skeleton/loading-skeleton.component";
 import { HasRbacAccess } from "../rbac-wrapper/rbac-wrapper.component";
 import TimeTicketList from "../time-ticket-list/time-ticket-list.component";
 import JobEmployeeAssignmentsContainer from "./../job-employee-assignments/job-employee-assignments.container";
 const mapStateToProps = createStructuredSelector({
  bodyshop: selectBodyshop,
@@ -319,10 +319,15 @@ export function TimeTicketModalComponent({
 }
 export function LaborAllocationContainer({ jobid, loading, lineTicketData, hideTimeTickets = false }) {
  const { t } = useTranslation();
  if (loading) return <LoadingSkeleton />;
  if (!lineTicketData) return null;
  if (!jobid) return null;
  return (
-    <div>
+    <Space direction="vertical" style={{ width: "100%" }}>
      <Card style={{ height: "100%" }} title={t("jobs.labels.employeeassignments")}>
        <JobEmployeeAssignmentsContainer job={lineTicketData.jobs_by_pk} />
      </Card>
      <LaborAllocationsTable
        jobId={jobid}
        joblines={lineTicketData.joblines}
@@ -332,6 +337,6 @@ export function LaborAllocationContainer({ jobid, loading, lineTicketData, hideT
      {!hideTimeTickets && (
        <TimeTicketList loading={loading} timetickets={jobid ? lineTicketData.timetickets : []} techConsole />
      )}
-    </div>
+    </Space>
  );
 }
--- a/client/src/components/time-ticket-modal/time-ticket-modal.container.jsx
+++ b/client/src/components/time-ticket-modal/time-ticket-modal.container.jsx
@@ -2,10 +2,11 @@ import { PageHeader } from "@ant-design/pro-layout";
 import { useMutation, useQuery } from "@apollo/client";
 import { useSplitTreatments } from "@splitsoftware/splitio-react";
 import { Button, Form, Modal, Space } from "antd";
-import React, { useEffect, useState } from "react";
+import { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
 import { QUERY_ACTIVE_EMPLOYEES } from "../../graphql/employees.queries";
 import { INSERT_NEW_TIME_TICKET, UPDATE_TIME_TICKET } from "../../graphql/timetickets.queries";
 import { toggleModalVisible } from "../../redux/modals/modals.actions";
@@ -14,7 +15,6 @@ import { selectBodyshop } from "../../redux/user/user.selectors";
 import dayjs from "../../utils/day";
 import TimeTicketsCommitToggleComponent from "../time-tickets-commit-toggle/time-tickets-commit-toggle.component";
 import TimeTicketModalComponent from "./time-ticket-modal.component";
 import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
 const mapStateToProps = createStructuredSelector({
  timeTicketModal: selectTimeTicket,
@@ -81,7 +81,7 @@ export function TimeTicketModalContainer({ timeTicketModal, toggleModalVisible,
    }
  };
-  const handleMutationSuccess = (response) => {
+  const handleMutationSuccess = () => {
    notification["success"]({
      message: t("timetickets.successes.created")
    });
@@ -123,7 +123,7 @@ export function TimeTicketModalContainer({ timeTicketModal, toggleModalVisible,
    if (timeTicketModal.open) form.resetFields();
  }, [timeTicketModal.open, form]);
-  const handleFieldsChange = (changedFields, allFields) => {
+  const handleFieldsChange = (changedFields) => {
    if (!!changedFields.employeeid && !!EmployeeAutoCompleteData) {
      const emps = EmployeeAutoCompleteData.employees.filter((e) => e.id === changedFields.employeeid);
      form.setFieldsValue({
@@ -181,7 +181,8 @@ export function TimeTicketModalContainer({ timeTicketModal, toggleModalVisible,
          )}
        </Space>
      }
-      destroyOnClose
+      destroyOnHidden
      id="time-ticket-modal"
    >
      <Form
        onFinish={handleFinish}
--- a/client/src/components/time-ticket-task-modal/time-ticket-task-modal.container.jsx
+++ b/client/src/components/time-ticket-task-modal/time-ticket-task-modal.container.jsx
@@ -119,7 +119,7 @@ export function TimeTickeTaskModalContainer({
  return (
    <Modal
-      destroyOnClose
+      destroyOnHidden
      open={open}
      onCancel={() => {
        toggleModalVisible();
--- a/client/src/components/update-alert/update-alert.component.jsx
+++ b/client/src/components/update-alert/update-alert.component.jsx
@@ -113,7 +113,7 @@ export function UpdateAlert({ updateAvailable }) {
          </Col>
          <Col sm={24} md={8} lg={6}>
            <Space wrap>
-              <Button onClick={() => window.open("https://imex-online.noticeable.news/", "_blank")}>
+              <Button onClick={() => window.open("https://shopmanagement.canny.io/changelog", "_blank")}>
                {i18n.t("general.actions.viewreleasenotes")}
              </Button>
              <Button loading={loading} type="primary" onClick={() => ReloadNewVersion()}>
--- a/client/src/contexts/SocketIO/socketProvider.jsx
+++ b/client/src/contexts/SocketIO/socketProvider.jsx
@@ -1,4 +1,5 @@
-import { createContext, useContext, useEffect, useRef, useState } from "react";
+// SocketProvider.js
 import { useEffect, useRef, useState } from "react";
 import SocketIO from "socket.io-client";
 import { auth } from "../../firebase/firebase.utils";
 import { store } from "../../redux/store";
@@ -15,10 +16,7 @@ import {
 import { useMutation } from "@apollo/client";
 import { useTranslation } from "react-i18next";
 import { useSplitTreatments } from "@splitsoftware/splitio-react";
-
+import { SocketContext, INITIAL_NOTIFICATIONS } from "./useSocket.js";
 const SocketContext = createContext(null);
 const INITIAL_NOTIFICATIONS = 10;
 /**
 * Socket Provider - Scenario Notifications / Web Socket related items
@@ -216,7 +214,6 @@ const SocketProvider = ({ children, bodyshop, navigate, currentUser }) => {
      };
      const handleNotification = (data) => {
        // Scenario Notifications have been disabled, bail.
        if (Realtime_Notifications_UI?.treatment !== "on") {
          return;
        }
@@ -336,7 +333,6 @@ const SocketProvider = ({ children, bodyshop, navigate, currentUser }) => {
      };
      const handleSyncNotificationRead = ({ notificationId, timestamp }) => {
        // Scenario Notifications have been disabled, bail.
        if (Realtime_Notifications_UI?.treatment !== "on") {
          return;
        }
@@ -378,7 +374,6 @@ const SocketProvider = ({ children, bodyshop, navigate, currentUser }) => {
      };
      const handleSyncAllNotificationsRead = ({ timestamp }) => {
        // Scenario Notifications have been disabled, bail.
        if (Realtime_Notifications_UI?.treatment !== "on") {
          return;
        }
@@ -490,11 +485,4 @@ const SocketProvider = ({ children, bodyshop, navigate, currentUser }) => {
  );
 };
-const useSocket = () => {
+export default SocketProvider;
  const context = useContext(SocketContext);
  // NOTE: Not sure if we absolutely require this, does cause slipups on dev env
  if (!context) throw new Error("useSocket must be used within a SocketProvider");
  return context;
 };
 export { SocketContext, SocketProvider, INITIAL_NOTIFICATIONS, useSocket };
--- a/client/src/contexts/SocketIO/useSocket.js
+++ b/client/src/contexts/SocketIO/useSocket.js
@@ -0,0 +1,13 @@
 import { createContext, useContext } from "react";
 const SocketContext = createContext(null);
 const INITIAL_NOTIFICATIONS = 10;
 const useSocket = () => {
  const context = useContext(SocketContext);
  if (!context) throw new Error("useSocket must be used within a SocketProvider");
  return context;
 };
 export { SocketContext, INITIAL_NOTIFICATIONS, useSocket };
--- a/client/src/graphql/bodyshop.queries.js
+++ b/client/src/graphql/bodyshop.queries.js
@@ -57,6 +57,7 @@ export const QUERY_BODYSHOP = gql`
      logo_img_path
      md_ro_statuses
      md_order_statuses
      tours_enabled
      md_functionality_toggles
      shopname
      state
@@ -140,6 +141,7 @@ export const QUERY_BODYSHOP = gql`
      use_paint_scale_data
      intellipay_config
      md_ro_guard
      notification_followers
      employee_teams(order_by: { name: asc }, where: { active: { _eq: true } }) {
        id
        name
@@ -186,6 +188,7 @@ export const UPDATE_SHOP = gql`
        phone
        federal_tax_id
        id
        tours_enabled
        insurance_vendor_id
        logo_img_path
        md_ro_statuses
@@ -269,6 +272,7 @@ export const UPDATE_SHOP = gql`
        md_tasks_presets
        intellipay_config
        md_ro_guard
        notification_followers
        employee_teams(order_by: { name: asc }, where: { active: { _eq: true } }) {
          id
          name
--- a/client/src/graphql/jobs-lines.queries.js
+++ b/client/src/graphql/jobs-lines.queries.js
@@ -35,6 +35,30 @@ export const GET_LINE_TICKET_BY_PK = gql`
      lbr_adjustments
      converted
      status
      employee_body
      employee_body_rel {
        id
        first_name
        last_name
      }
      employee_csr
      employee_csr_rel {
        id
        first_name
        last_name
      }
      employee_prep
      employee_prep_rel {
        id
        first_name
        last_name
      }
      employee_refinish
      employee_refinish_rel {
        id
        first_name
        last_name
      }
    }
    joblines(where: { jobid: { _eq: $id }, removed: { _eq: false } }) {
      id
--- a/client/src/graphql/jobs.queries.js
+++ b/client/src/graphql/jobs.queries.js
@@ -423,6 +423,7 @@ export const GET_JOB_BY_PK = gql`
      actual_completion
      actual_delivery
      actual_in
      acv_amount
      adjustment_bottom_line
      alt_transport
      area_of_damage
@@ -511,6 +512,7 @@ export const GET_JOB_BY_PK = gql`
      est_ph1
      flat_rate_ats
      federal_tax_rate
      hit_and_run
      id
      inproduction
      ins_addr1
@@ -683,6 +685,8 @@ export const GET_JOB_BY_PK = gql`
      scheduled_delivery
      scheduled_in
      selling_dealer
      estimate_approved
      estimate_sent_approval
      selling_dealer_contact
      servicing_dealer
      servicing_dealer_contact
@@ -927,6 +931,8 @@ export const QUERY_JOB_CARD_DETAILS = gql`
      date_exported
      date_repairstarted
      date_scheduled
      estimate_sent_approval
      estimate_approved
      date_estimated
      employee_body_rel {
        id
@@ -1075,6 +1081,8 @@ export const UPDATE_JOB = gql`
        date_repairstarted
        date_void
        date_lost_sale
        estimate_sent_approval
        estimate_approved
      }
    }
  }
@@ -2429,6 +2437,8 @@ export const QUERY_PARTS_QUEUE_CARD_DETAILS = gql`
      plate_st
      po_number
      production_vars
      estimate_sent_approval
      estimate_approved
      ro_number
      scheduled_completion
      scheduled_delivery
@@ -2570,6 +2580,20 @@ export const GET_JOB_BY_PK_QUICK_INTAKE = gql`
      actual_completion
      scheduled_delivery
      actual_delivery
      labhrs: joblines_aggregate(where: { _and: [{ mod_lbr_ty: { _neq: "LAR" } }, { removed: { _eq: false } }] }) {
        aggregate {
          sum {
            mod_lb_hrs
          }
        }
      }
      larhrs: joblines_aggregate(where: { _and: [{ mod_lbr_ty: { _eq: "LAR" } }, { removed: { _eq: false } }] }) {
        aggregate {
          sum {
            mod_lb_hrs
          }
        }
      }
    }
  }
 `;
--- a/client/src/graphql/parts-orders.queries.js
+++ b/client/src/graphql/parts-orders.queries.js
@@ -78,6 +78,9 @@ export const QUERY_PARTS_ORDER_OEC = gql`
        }
        ro_number
        clm_no
        cieca_stl
        cieca_ttl
        cieca_pfl
        asgn_no
        asgn_date
        state_tax_rate
@@ -164,6 +167,7 @@ export const QUERY_PARTS_ORDER_OEC = gql`
        loss_desc
        loss_of_use
        loss_type
        materials
        ownr_addr1
        ownr_addr2
        ownr_city
--- a/client/src/graphql/user.queries.js
+++ b/client/src/graphql/user.queries.js
@@ -91,6 +91,7 @@ export const QUERY_NOTIFICATION_SETTINGS = gql`
    associations(where: { _and: { useremail: { _eq: $email }, active: { _eq: true } } }) {
      id
      notification_settings
      notifications_autoadd
    }
  }
 `;
@@ -103,3 +104,12 @@ export const UPDATE_NOTIFICATION_SETTINGS = gql`
    }
  }
 `;
 export const UPDATE_NOTIFICATIONS_AUTOADD = gql`
  mutation UPDATE_NOTIFICATIONS_AUTOADD($id: uuid!, $autoadd: Boolean!) {
    update_associations_by_pk(pk_columns: { id: $id }, _set: { notifications_autoadd: $autoadd }) {
      id
      notifications_autoadd
    }
  }
 `;
--- a/client/src/pages/feature-request/feature-request.page.jsx
+++ b/client/src/pages/feature-request/feature-request.page.jsx
@@ -0,0 +1,42 @@
 import axios from "axios";
 import React, { useEffect } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { setBreadcrumbs, setSelectedHeader } from "../../redux/application/application.actions";
 import InstanceRenderManager from "../../utils/instanceRenderMgr";
 const mapDispatchToProps = (dispatch) => ({
  setBreadcrumbs: (breadcrumbs) => dispatch(setBreadcrumbs(breadcrumbs)),
  setSelectedHeader: (key) => dispatch(setSelectedHeader(key))
 });
 export function FeedbackPage({ setBreadcrumbs, setSelectedHeader }) {
  const { t } = useTranslation();
  useEffect(() => {
    document.title = t("titles.feature-request", {
      app: InstanceRenderManager({
        imex: "$t(titles.imexonline)",
        rome: "$t(titles.romeonline)"
      })
    });
    setBreadcrumbs([{ link: "/manage/feature-request", label: t("titles.bc.feature-request") }]);
  }, [t, setBreadcrumbs, setSelectedHeader]);
  useEffect(() => {
    async function RenderCanny() {
      const ssoToken = await axios.post("/sso/canny");
      window.Canny("render", {
        boardToken: "bba97b06-70db-0334-dee7-8108d73ef614",
        basePath: `/manage/feature-request`, // See step 2
        ssoToken: ssoToken.data, // See step 3,
        theme: "light" // options: light [default], dark, auto
      });
    }
    RenderCanny();
  }, []);
  return <div data-canny />;
 }
 export default connect(null, mapDispatchToProps)(FeedbackPage);
--- a/client/src/pages/jobs-detail/jobs-detail.page.component.jsx
+++ b/client/src/pages/jobs-detail/jobs-detail.page.component.jsx
@@ -56,7 +56,7 @@ import { DateTimeFormat } from "../../utils/DateFormatter";
 import dayjs from "../../utils/day";
 import UndefinedToNull from "../../utils/undefinedtonull";
 import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
-import { useSocket } from "../../contexts/SocketIO/useSocket.jsx";
+import { useSocket } from "../../contexts/SocketIO/useSocket.js";
 import JobWatcherToggleContainer from "../../components/job-watcher-toggle/job-watcher-toggle.container.jsx";
 const mapStateToProps = createStructuredSelector({
--- a/client/src/pages/manage/manage.page.component.jsx
+++ b/client/src/pages/manage/manage.page.component.jsx
@@ -1,4 +1,5 @@
-import { FloatButton, Layout, Spin } from "antd";
+import { Button, FloatButton, Layout, Space, Spin } from "antd";
 import { AlertOutlined, BulbOutlined } from "@ant-design/icons";
 // import preval from "preval.macro";
 import React, { lazy, Suspense, useEffect, useState } from "react";
@@ -19,8 +20,6 @@ import LoadingSpinner from "../../components/loading-spinner/loading-spinner.com
 import PartnerPingComponent from "../../components/partner-ping/partner-ping.component";
 import PrintCenterModalContainer from "../../components/print-center-modal/print-center-modal.container";
 import ShopSubStatusComponent from "../../components/shop-sub-status/shop-sub-status.component";
 import { requestForToken } from "../../firebase/firebase.utils";
 import { useSocket } from "../../contexts/SocketIO/useSocket.jsx";
 import { selectBodyshop, selectInstanceConflict } from "../../redux/user/user.selectors";
 import UpdateAlert from "../../components/update-alert/update-alert.component";
 import InstanceRenderManager from "../../utils/instanceRenderMgr.js";
@@ -29,6 +28,7 @@ import WssStatusDisplayComponent from "../../components/wss-status-display/wss-s
 import { selectAlerts } from "../../redux/application/application.selectors.js";
 import { addAlerts } from "../../redux/application/application.actions.js";
 import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
 import { useSocket } from "../../contexts/SocketIO/useSocket.js";
 const JobsPage = lazy(() => import("../jobs/jobs.page"));
@@ -56,6 +56,7 @@ const ContractCreatePage = lazy(() => import("../contract-create/contract-create
 const ContractDetailPage = lazy(() => import("../contract-detail/contract-detail.page.container"));
 const ContractsList = lazy(() => import("../contracts/contracts.page.container"));
 const BillsListPage = lazy(() => import("../bills/bills.page.container"));
 const FeatureRequestPage = lazy(() => import("../feature-request/feature-request.page.jsx"));
 const JobCostingModal = lazy(() => import("../../components/job-costing-modal/job-costing-modal.container"));
 const ReportCenterModal = lazy(() => import("../../components/report-center-modal/report-center-modal.container"));
@@ -180,15 +181,12 @@ export function Manage({ conflict, bodyshop, alerts, setAlerts }) {
      });
    }
  }, [alerts, displayedAlertIds, notification]);
  useEffect(() => {
-    const widgetId = InstanceRenderManager({
+    window.Canny("initChangelog", {
-      imex: "IABVNO4scRKY11XBQkNr",
+      appID: "680bd2c7ee501290377f6686",
-      rome: "mQdqARMzkZRUVugJ6TdS"
+      position: "top",
-    });
+      align: "left",
-    window.noticeable.render("widget", widgetId);
+      theme: "light" // options: light [default], dark, auto
    requestForToken().catch((error) => {
      console.error(`Unable to request for token.`, error);
    });
  }, []);
@@ -480,6 +478,8 @@ export function Manage({ conflict, bodyshop, alerts, setAlerts }) {
          // element={<ShopTemplates />}
          //   />
        }
        <Route path="/feature-request/*" index element={<FeatureRequestPage />} />
        <Route
          path="/shop/vendors"
          element={
@@ -669,7 +669,12 @@ export function Manage({ conflict, bodyshop, alerts, setAlerts }) {
              margin: "1rem 0rem"
            }}
          >
-            <div style={{ display: "flex" }}>
+            <Link to="/manage/feature-request">
              <Button icon={<BulbOutlined />} type="text">
                {t("general.labels.feature-request")}
              </Button>
            </Link>
            <Space>
              <WssStatusDisplayComponent />
              <div onClick={broadcastMessage}>
                {`${InstanceRenderManager({
@@ -677,8 +682,10 @@ export function Manage({ conflict, bodyshop, alerts, setAlerts }) {
                  rome: t("titles.romeonline")
                })} - ${import.meta.env.VITE_APP_GIT_SHA_DATE}`}
              </div>
-              <div id="noticeable-widget" style={{ marginLeft: "1rem" }} />
+              <Button icon={<AlertOutlined />} data-canny-changelog type="text">
-            </div>
+                {t("general.labels.changelog")}
              </Button>
            </Space>
            <Link to="/disclaimer" target="_blank" style={{ color: "#ccc" }}>
              Disclaimer & Notices
            </Link>
--- a/client/src/redux/user/user.sagas.js
+++ b/client/src/redux/user/user.sagas.js
@@ -1,7 +1,4 @@
 import FingerprintJS from "@fingerprintjs/fingerprintjs";
 import * as Sentry from "@sentry/browser";
 import { notification } from "antd";
 import axios from "axios";
 import { setUserId, setUserProperties } from "@firebase/analytics";
 import {
  checkActionCode,
@@ -12,6 +9,9 @@ import {
 } from "@firebase/auth";
 import { arrayUnion, doc, getDoc, setDoc, updateDoc } from "@firebase/firestore";
 import { getToken } from "@firebase/messaging";
 import * as Sentry from "@sentry/react";
 import { notification } from "antd";
 import axios from "axios";
 import i18next from "i18next";
 import LogRocket from "logrocket";
 import { all, call, delay, put, select, takeLatest } from "redux-saga/effects";
@@ -351,7 +351,14 @@ export function* SetAuthLevelFromShopDetails({ payload }) {
      });
      payload.features?.allAccess === true
        ? window.$crisp.push(["set", "session:segments", [["allAccess"]]])
-        : window.$crisp.push(["set", "session:segments", [["basic"]]]);
+        : (() => {
            const featureKeys = Object.keys(payload.features).filter(
              (key) =>
                payload.features[key] === true ||
                (typeof payload.features[key] === "string" && !isNaN(Date.parse(payload.features[key])))
            );
            window.$crisp.push(["set", "session:segments", [["basic", ...featureKeys]]]);
          })();
    } catch (error) {
      console.warn("Couldnt find $crisp.", error.message);
    }
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -335,7 +335,6 @@
        "intellipay_config": {
          "cash_discount_percentage": "Cash Discount %",
          "enable_cash_discount": "Enable Cash Discounting",
          "payment_type": "Payment Type Map",
          "payment_map": {
            "amex": "American Express",
            "disc": "Discover",
@@ -344,7 +343,8 @@
            "jcb": "JCB",
            "mast": "MasterCard",
            "visa": "Visa"
-          }
+          },
          "payment_type": "Payment Type Map"
        },
        "invoice_federal_tax_rate": "Invoices - Federal Tax Rate",
        "invoice_local_tax_rate": "Invoices - Local Tax Rate",
@@ -601,7 +601,8 @@
          "templates": "Templates"
        },
        "ss_configuration": {
-          "dailyhrslimit": "Daily Incoming Hours Limit"
+          "dailyhrslimit": "Daily Incoming Hours Limit",
          "nobusinessdays": "Include Weekends"
        },
        "ssbuckets": {
          "color": "Job Color",
@@ -647,7 +648,12 @@
        "use_paint_scale_data": "Use Paint Scale Data for Job Costing?",
        "uselocalmediaserver": "Use Local Media Server?",
        "website": "Website",
-        "zip_post": "Zip/Postal Code"
+        "zip_post": "Zip/Postal Code",
        "notifications": {
          "description": "Select employees to automatically follow new jobs and receive notifications for job updates.",
          "placeholder": "Search for employees",
          "invalid_followers": "Invalid selection. Please select valid employees."
        }
      },
      "labels": {
        "2tiername": "Name => RO",
@@ -727,7 +733,10 @@
        "ssbuckets": "Job Size Definitions",
        "systemsettings": "System Settings",
        "task-presets": "Task Presets",
-        "workingdays": "Working Days"
+        "workingdays": "Working Days",
        "notifications": {
          "followers": "Notifications"
        }
      },
      "operations": {
        "contains": "Contains",
@@ -1220,7 +1229,8 @@
      "errors": {
        "fcm": "You must allow notification permissions to have real time messaging.  Click to try again.",
        "notfound": "No record was found.",
-        "sizelimit": "The selected items exceed the size limit."
+        "sizelimit": "The selected items exceed the size limit.",
        "submit-for-testing": "Error submitting Job for testing."
      },
      "itemtypes": {
        "contract": "CC Contract",
@@ -1234,6 +1244,7 @@
        "areyousure": "Are you sure?",
        "barcode": "Barcode",
        "cancel": "Are you sure you want to cancel? Your changes will not be saved.",
        "changelog": "Change Log",
        "clear": "Clear",
        "confirmpassword": "Confirm Password",
        "created_at": "Created At",
@@ -1243,6 +1254,7 @@
        "errors": "Errors",
        "excel": "Excel",
        "exceptiontitle": "An error has occurred.",
        "feature-request": "Have a feature request?",
        "friday": "Friday",
        "globalsearch": "Global Search",
        "help": "Help",
@@ -1321,6 +1333,7 @@
        "notfoundtitle": "We couldn't find what you're looking for...",
        "partnernotrunning": "{{app}} has detected that the partner is not running. Please ensure it is running to enable full functionality.",
        "rbacunauth": "You are not authorized to view this content. Please reach out to your shop manager to change your access level.",
        "submit-for-testing": "Submitted Job for testing successfully.",
        "unsavedchanges": "You have unsaved changes.",
        "unsavedchangespopup": "You have unsaved changes. Are you sure you want to leave?"
      },
@@ -1633,9 +1646,12 @@
        "actual_completion": "Actual Completion",
        "actual_delivery": "Actual Delivery",
        "actual_in": "Actual In",
        "acv_amount": "ACV Amount",
        "adjustment_bottom_line": "Adjustments",
        "adjustmenthours": "Adjustment Hours",
        "alt_transport": "Alt. Trans.",
        "estimate_sent_approval": "Estimate Sent for Approval",
        "estimate_approved": "Estimate Approved",
        "area_of_damage_impact": {
          "10": "Left Front Side",
          "11": "Left Front Corner",
@@ -1758,9 +1774,10 @@
        "est_ct_ln": "Estimator Last Name",
        "est_ea": "Estimator Email",
        "est_ph1": "Estimator Phone #",
        "flat_rate_ats": "Flat Rate ATS?",
        "federal_tax_payable": "Federal Tax Payable",
        "federal_tax_rate": "Federal Tax Rate",
        "flat_rate_ats": "Flat Rate ATS?",
        "hit_and_run": "Hit and Run",
        "ins_addr1": "Insurance Co. Address",
        "ins_city": "Insurance Co. City",
        "ins_co_id": "Insurance Co. ID",
@@ -1940,6 +1957,8 @@
        "scheddates": "Schedule Dates"
      },
      "labels": {
        "sent": "",
        "approved": "",
        "accountsreceivable": "Accounts Receivable",
        "act_price_ppc": "New Part Price",
        "actual_completion_inferred": "$t(jobs.fields.actual_completion) inferred using $t(jobs.fields.scheduled_completion).",
@@ -2314,6 +2333,7 @@
        "duplicate": "Duplicate this Job",
        "duplicatenolines": "Duplicate this Job without Repair Data",
        "newcccontract": "Create Courtesy Car Contract",
        "submit-for-testing": "Submit for Testing",
        "void": "Void Job"
      },
      "jobsdetail": {
@@ -2420,6 +2440,66 @@
        "updated": "Note updated successfully."
      }
    },
    "notifications": {
      "actions": {
        "remove": "Remove"
      },
      "aria": {
        "toggle": "Toggle Watching Job"
      },
      "channels": {
        "app": "App",
        "email": "Email",
        "fcm": "Push"
      },
      "labels": {
        "auto-add": "Automatically watch Jobs I import",
        "auto-add-success": "Auto watcher status successfully changed.",
        "auto-add-failure": "Something went wrong updating your auto watcher status.",
        "add-watchers": "Add Watchers",
        "add-watchers-team": "Add Team Members",
        "employee-search": "Search for an Employee",
        "mark-all-read": "Mark All Read",
        "new-notification-title": "New Notification:",
        "no-watchers": "No Watchers",
        "notification-center": "Notification Center",
        "notification-popup-title": "Changes for Job #{{ro_number}}",
        "notification-settings-failure": "Error saving Notification Settings. {{error}}",
        "notification-settings-success": "Notification Settings saved successfully.",
        "notificationscenarios": "Job Notification Scenarios",
        "ro-number": "RO #{{ro_number}}",
        "save": "Save Scenarios",
        "scenario": "Scenario",
        "show-unread-only": "Show Unread Only",
        "teams-search": "Search for a Team",
        "unwatch": "Unwatch",
        "watch": "Watch",
        "watching-issue": "Watching",
        "employee-notification": "Notifications are disabled because you do not have an associated Employee record."
      },
      "scenarios": {
        "alternate-transport-changed": "Alternate Transport Changed",
        "bill-posted": "Bill Posted",
        "critical-parts-status-changed": "Critical Parts Status Changed",
        "intake-delivery-checklist-completed": "Intake or Delivery Checklist Completed",
        "job-added-to-production": "Job Added to Production",
        "job-assigned-to-me": "Job Assigned to Me",
        "job-status-change": "Job Status Changed",
        "new-media-added-reassigned": "New Media Added or Reassigned",
        "new-note-added": "New Note Added",
        "new-time-ticket-posted": "New Time Ticket Posted",
        "part-marked-back-ordered": "Part Marked Back Ordered",
        "payment-collected-completed": "Payment Collected / Completed",
        "schedule-dates-changed": "Schedule Dates Changed",
        "supplement-imported": "Supplement Imported",
        "tasks-updated-created": "Tasks Updated / Created"
      },
      "tooltips": {
        "job-watchers": "Job Watchers",
        "not-employee": "You need to be an employee to watch this job. Reach out to your admin to get set up!",
        "not-employee-notifications": "You must be an employee to receive notifications"
      }
    },
    "owner": {
      "labels": {
        "noownerinfo": "No owner information."
@@ -3416,6 +3496,7 @@
        "dashboard": "Dashboard",
        "dms": "DMS Export",
        "export-logs": "Export Logs",
        "feature-request": "Feature Requet",
        "inventory": "Inventory",
        "jobs": "Jobs",
        "jobs-active": "Active Jobs",
@@ -3460,6 +3541,7 @@
      "dashboard": "Dashboard | {{app}}",
      "dms": "DMS Export | {{app}}",
      "export-logs": "Export Logs | {{app}}",
      "feature-request": "Feature Request | {{app}}",
      "imexonline": "ImEX Online",
      "inventory": "Inventory | {{app}}",
      "jobs": "Active Jobs | {{app}}",
@@ -3677,10 +3759,10 @@
    "users": {
      "errors": {
        "signinerror": {
          "auth/invalid-email": "A user with this email does not exist.",
          "auth/user-disabled": "User account disabled. ",
          "auth/user-not-found": "A user with this email does not exist.",
-          "auth/wrong-password": "The email and password combination you provided is incorrect.",
+          "auth/wrong-password": "The email and password combination you provided is incorrect."
          "auth/invalid-email": "A user with this email does not exist."
        }
      }
    },
@@ -3780,60 +3862,6 @@
      "validation": {
        "unique_vendor_name": "You must enter a unique vendor name."
      }
    },
    "notifications": {
      "labels": {
        "notification-center": "Notification Center",
        "scenario": "Scenario",
        "notificationscenarios": "Job Notification Scenarios",
        "save": "Save Scenarios",
        "watching-issue": "Watching",
        "add-watchers": "Add Watchers",
        "employee-search": "Search for an Employee",
        "teams-search": "Search for a Team",
        "add-watchers-team": "Add Team Members",
        "new-notification-title": "New Notification:",
        "show-unread-only": "Show Unread Only",
        "mark-all-read": "Mark All Read",
        "notification-popup-title": "Changes for Job #{{ro_number}}",
        "ro-number": "RO #{{ro_number}}",
        "no-watchers": "No Watchers",
        "notification-settings-success": "Notification Settings saved successfully.",
        "notification-settings-failure": "Error saving Notification Settings. {{error}}",
        "watch": "Watch",
        "unwatch": "Unwatch"
      },
      "actions": {
        "remove": "Remove"
      },
      "aria": {
        "toggle": "Toggle Watching Job"
      },
      "tooltips": {
        "job-watchers": "Job Watchers"
      },
      "scenarios": {
        "job-assigned-to-me": "Job Assigned to Me",
        "bill-posted": "Bill Posted",
        "critical-parts-status-changed": "Critical Parts Status Changed",
        "part-marked-back-ordered": "Part Marked Back Ordered",
        "new-note-added": "New Note Added",
        "supplement-imported": "Supplement Imported",
        "schedule-dates-changed": "Schedule Dates Changed",
        "tasks-updated-created": "Tasks Updated / Created",
        "new-media-added-reassigned": "New Media Added or Reassigned",
        "new-time-ticket-posted": "New Time Ticket Posted",
        "intake-delivery-checklist-completed": "Intake or Delivery Checklist Completed",
        "job-added-to-production": "Job Added to Production",
        "job-status-change": "Job Status Changed",
        "payment-collected-completed": "Payment Collected / Completed",
        "alternate-transport-changed": "Alternate Transport Changed"
      },
      "channels": {
        "app": "App",
        "email": "Email",
        "fcm": "Push"
      }
    }
  }
 }
--- a/client/src/translations/es/common.json
+++ b/client/src/translations/es/common.json
@@ -335,7 +335,6 @@
        "intellipay_config": {
          "cash_discount_percentage": "",
          "enable_cash_discount": "",
          "payment_type": "",
          "payment_map": {
            "amex": "American Express",
            "disc": "Discover",
@@ -344,7 +343,8 @@
            "jcb": "JCB",
            "mast": "MasterCard",
            "visa": "Visa"
-          }
+          },
          "payment_type": ""
        },
        "invoice_federal_tax_rate": "",
        "invoice_local_tax_rate": "",
@@ -601,7 +601,8 @@
          "templates": ""
        },
        "ss_configuration": {
-          "dailyhrslimit": ""
+          "dailyhrslimit": "",
          "nobusinessdays": ""
        },
        "ssbuckets": {
          "color": "",
@@ -647,7 +648,12 @@
        "use_paint_scale_data": "",
        "uselocalmediaserver": "",
        "website": "",
-        "zip_post": ""
+        "zip_post": "",
        "notifications": {
          "description": "",
          "placeholder": "",
          "invalid_followers": ""
        }
      },
      "labels": {
        "2tiername": "",
@@ -727,7 +733,10 @@
        "ssbuckets": "",
        "systemsettings": "",
        "task-presets": "",
-        "workingdays": ""
+        "workingdays": "",
        "notifications": {
          "followers": ""
        }
      },
      "operations": {
        "contains": "",
@@ -1220,7 +1229,8 @@
      "errors": {
        "fcm": "",
        "notfound": "",
-        "sizelimit": ""
+        "sizelimit": "",
        "submit-for-testing": ""
      },
      "itemtypes": {
        "contract": "",
@@ -1234,6 +1244,7 @@
        "areyousure": "",
        "barcode": "código de barras",
        "cancel": "",
        "changelog": "",
        "clear": "",
        "confirmpassword": "",
        "created_at": "",
@@ -1243,6 +1254,7 @@
        "errors": "",
        "excel": "",
        "exceptiontitle": "",
        "feature-request": "",
        "friday": "",
        "globalsearch": "",
        "help": "",
@@ -1321,6 +1333,7 @@
        "notfoundtitle": "",
        "partnernotrunning": "",
        "rbacunauth": "",
        "submit-for-testing": "",
        "unsavedchanges": "Usted tiene cambios no guardados.",
        "unsavedchangespopup": ""
      },
@@ -1629,10 +1642,13 @@
        "voiding": ""
      },
      "fields": {
        "estimate_sent_approval": "",
        "estimate_approved": "",
        "active_tasks": "",
        "actual_completion": "Realización real",
        "actual_delivery": "Entrega real",
        "actual_in": "Real en",
        "acv_amount": "",
        "adjustment_bottom_line": "Ajustes",
        "adjustmenthours": "",
        "alt_transport": "",
@@ -1758,9 +1774,10 @@
        "est_ct_ln": "Apellido del tasador",
        "est_ea": "Correo electrónico del tasador",
        "est_ph1": "Número de teléfono del tasador",
        "flat_rate_ats": "",
        "federal_tax_payable": "Impuesto federal por pagar",
        "federal_tax_rate": "",
        "flat_rate_ats": "",
        "hit_and_run": "",
        "ins_addr1": "Dirección de Insurance Co.",
        "ins_city": "Ciudad de seguros",
        "ins_co_id": "ID de la compañía de seguros",
@@ -1940,6 +1957,8 @@
        "scheddates": ""
      },
      "labels": {
        "sent": "",
        "approved": "",
        "accountsreceivable": "",
        "act_price_ppc": "",
        "actual_completion_inferred": "",
@@ -2314,6 +2333,7 @@
        "duplicate": "",
        "duplicatenolines": "",
        "newcccontract": "",
        "submit-for-testing": "",
        "void": ""
      },
      "jobsdetail": {
@@ -2420,6 +2440,67 @@
        "updated": "Nota actualizada con éxito."
      }
    },
    "notifications": {
      "actions": {
        "remove": ""
      },
      "aria": {
        "toggle": ""
      },
      "channels": {
        "app": "",
        "email": "",
        "fcm": ""
      },
      "labels": {
        "auto-add-on": "",
        "auto-add-off": "",
        "auto-add-success": "",
        "auto-add-failure": "",
        "auto-add-description": "",
        "add-watchers": "",
        "add-watchers-team": "",
        "employee-search": "",
        "mark-all-read": "",
        "new-notification-title": "",
        "no-watchers": "",
        "notification-center": "",
        "notification-popup-title": "",
        "notification-settings-failure": "",
        "notification-settings-success": "",
        "notificationscenarios": "",
        "ro-number": "",
        "save": "",
        "scenario": "",
        "show-unread-only": "",
        "teams-search": "",
        "unwatch": "",
        "watch": "",
        "watching-issue": "",
        "employee-notification": ""
      },
      "scenarios": {
        "alternate-transport-changed": "",
        "bill-posted": "",
        "critical-parts-status-changed": "",
        "intake-delivery-checklist-completed": "",
        "job-added-to-production": "",
        "job-assigned-to-me": "",
        "job-status-change": "",
        "new-media-added-reassigned": "",
        "new-note-added": "",
        "new-time-ticket-posted": "",
        "part-marked-back-ordered": "",
        "payment-collected-completed": "",
        "schedule-dates-changed": "",
        "supplement-imported": "",
        "tasks-updated-created": ""
      },
      "tooltips": {
        "job-watchers": "",
        "not-employee": ""
      }
    },
    "owner": {
      "labels": {
        "noownerinfo": ""
@@ -3416,6 +3497,7 @@
        "dashboard": "",
        "dms": "",
        "export-logs": "",
        "feature-request": "",
        "inventory": "",
        "jobs": "",
        "jobs-active": "",
@@ -3460,6 +3542,7 @@
      "dashboard": "",
      "dms": "",
      "export-logs": "",
      "feature-request": "",
      "imexonline": "",
      "inventory": "",
      "jobs": "Todos los trabajos | {{app}}",
@@ -3677,10 +3760,10 @@
    "users": {
      "errors": {
        "signinerror": {
          "auth/invalid-email": "",
          "auth/user-disabled": "",
          "auth/user-not-found": "",
-          "auth/wrong-password": "",
+          "auth/wrong-password": ""
          "auth/invalid-email": ""
        }
      }
    },
@@ -3780,60 +3863,6 @@
      "validation": {
        "unique_vendor_name": ""
      }
    },
    "notifications": {
      "labels": {
        "notification-center": "",
        "scenario": "",
        "notificationscenarios": "",
        "save": "",
        "watching-issue": "",
        "add-watchers": "",
        "employee-search": "",
        "teams-search": "",
        "add-watchers-team": "",
        "new-notification-title": "",
        "show-unread-only": "",
        "mark-all-read": "",
        "notification-popup-title": "",
        "ro-number": "",
        "no-watchers": "",
        "notification-settings-success": "",
        "notification-settings-failure": "",
        "watch": "",
        "unwatch": ""
      },
      "actions": {
        "remove": ""
      },
      "aria": {
        "toggle": ""
      },
      "tooltips": {
        "job-watchers": ""
      },
      "scenarios": {
        "job-assigned-to-me": "",
        "bill-posted": "",
        "critical-parts-status-changed": "",
        "part-marked-back-ordered": "",
        "new-note-added": "",
        "supplement-imported": "",
        "schedule-dates-changed": "",
        "tasks-updated-created": "",
        "new-media-added-reassigned": "",
        "new-time-ticket-posted": "",
        "intake-delivery-checklist-completed": "",
        "job-added-to-production": "",
        "job-status-change": "",
        "payment-collected-completed": "",
        "alternate-transport-changed": ""
      },
      "channels": {
        "app": "",
        "email": "",
        "fcm": ""
      }
    }
  }
 }
--- a/client/src/translations/fr/common.json
+++ b/client/src/translations/fr/common.json
@@ -335,7 +335,6 @@
        "intellipay_config": {
          "cash_discount_percentage": "",
          "enable_cash_discount": "",
          "payment_type": "",
          "payment_map": {
            "amex": "American Express",
            "disc": "Discover",
@@ -344,7 +343,8 @@
            "jcb": "JCB",
            "mast": "MasterCard",
            "visa": "Visa"
-          }
+          },
          "payment_type": ""
        },
        "invoice_federal_tax_rate": "",
        "invoice_local_tax_rate": "",
@@ -601,7 +601,8 @@
          "templates": ""
        },
        "ss_configuration": {
-          "dailyhrslimit": ""
+          "dailyhrslimit": "",
          "nobusinessdays": ""
        },
        "ssbuckets": {
          "color": "",
@@ -647,7 +648,12 @@
        "use_paint_scale_data": "",
        "uselocalmediaserver": "",
        "website": "",
-        "zip_post": ""
+        "zip_post": "",
        "notifications": {
          "description": "",
          "placeholder": "",
          "invalid_followers": ""
        }
      },
      "labels": {
        "2tiername": "",
@@ -727,7 +733,10 @@
        "ssbuckets": "",
        "systemsettings": "",
        "task-presets": "",
-        "workingdays": ""
+        "workingdays": "",
        "notifications": {
          "followers": ""
        }
      },
      "operations": {
        "contains": "",
@@ -1220,7 +1229,8 @@
      "errors": {
        "fcm": "",
        "notfound": "",
-        "sizelimit": ""
+        "sizelimit": "",
        "submit-for-testing": ""
      },
      "itemtypes": {
        "contract": "",
@@ -1234,6 +1244,7 @@
        "areyousure": "",
        "barcode": "code à barre",
        "cancel": "",
        "changelog": "",
        "clear": "",
        "confirmpassword": "",
        "created_at": "",
@@ -1243,6 +1254,7 @@
        "errors": "",
        "excel": "",
        "exceptiontitle": "",
        "feature-request": "",
        "friday": "",
        "globalsearch": "",
        "help": "",
@@ -1321,6 +1333,7 @@
        "notfoundtitle": "",
        "partnernotrunning": "",
        "rbacunauth": "",
        "submit-for-testing": "",
        "unsavedchanges": "Vous avez des changements non enregistrés.",
        "unsavedchangespopup": ""
      },
@@ -1629,10 +1642,13 @@
        "voiding": ""
      },
      "fields": {
        "estimate_sent_approval": "",
        "estimate_approved": "",
        "active_tasks": "",
        "actual_completion": "Achèvement réel",
        "actual_delivery": "Livraison réelle",
        "actual_in": "En réel",
        "acv_amount": "",
        "adjustment_bottom_line": "Ajustements",
        "adjustmenthours": "",
        "alt_transport": "",
@@ -1758,9 +1774,10 @@
        "est_ct_ln": "Nom de l'évaluateur",
        "est_ea": "Courriel de l'évaluateur",
        "est_ph1": "Numéro de téléphone de l'évaluateur",
        "flat_rate_ats": "",
        "federal_tax_payable": "Impôt fédéral à payer",
        "federal_tax_rate": "",
        "flat_rate_ats": "",
        "hit_and_run": "",
        "ins_addr1": "Adresse Insurance Co.",
        "ins_city": "Insurance City",
        "ins_co_id": "ID de la compagnie d'assurance",
@@ -1940,6 +1957,8 @@
        "scheddates": ""
      },
      "labels": {
        "sent": "",
        "approved": "",
        "accountsreceivable": "",
        "act_price_ppc": "",
        "actual_completion_inferred": "",
@@ -2314,6 +2333,7 @@
        "duplicate": "",
        "duplicatenolines": "",
        "newcccontract": "",
        "submit-for-testing": "",
        "void": ""
      },
      "jobsdetail": {
@@ -2420,6 +2440,67 @@
        "updated": "Remarque mise à jour avec succès."
      }
    },
    "notifications": {
      "actions": {
        "remove": ""
      },
      "aria": {
        "toggle": ""
      },
      "channels": {
        "app": "",
        "email": "",
        "fcm": ""
      },
      "labels": {
        "auto-add-on": "",
        "auto-add-off": "",
        "auto-add-success": "",
        "auto-add-failure": "",
        "auto-add-description": "",
        "add-watchers": "",
        "add-watchers-team": "",
        "employee-search": "",
        "mark-all-read": "",
        "new-notification-title": "",
        "no-watchers": "",
        "notification-center": "",
        "notification-popup-title": "",
        "notification-settings-failure": "",
        "notification-settings-success": "",
        "notificationscenarios": "",
        "ro-number": "",
        "save": "",
        "scenario": "",
        "show-unread-only": "",
        "teams-search": "",
        "unwatch": "",
        "watch": "",
        "watching-issue": "",
        "employee-notification": ""
      },
      "scenarios": {
        "alternate-transport-changed": "",
        "bill-posted": "",
        "critical-parts-status-changed": "",
        "intake-delivery-checklist-completed": "",
        "job-added-to-production": "",
        "job-assigned-to-me": "",
        "job-status-change": "",
        "new-media-added-reassigned": "",
        "new-note-added": "",
        "new-time-ticket-posted": "",
        "part-marked-back-ordered": "",
        "payment-collected-completed": "",
        "schedule-dates-changed": "",
        "supplement-imported": "",
        "tasks-updated-created": ""
      },
      "tooltips": {
        "job-watchers": "",
        "not-employee": ""
      }
    },
    "owner": {
      "labels": {
        "noownerinfo": ""
@@ -3416,6 +3497,7 @@
        "dashboard": "",
        "dms": "",
        "export-logs": "",
        "feature-request": "",
        "inventory": "",
        "jobs": "",
        "jobs-active": "",
@@ -3460,6 +3542,7 @@
      "dashboard": "",
      "dms": "",
      "export-logs": "",
      "feature-request": "",
      "imexonline": "",
      "inventory": "",
      "jobs": "Tous les emplois | {{app}}",
@@ -3677,10 +3760,10 @@
    "users": {
      "errors": {
        "signinerror": {
          "auth/invalid-email": "",
          "auth/user-disabled": "",
          "auth/user-not-found": "",
-          "auth/wrong-password": "",
+          "auth/wrong-password": ""
          "auth/invalid-email": ""
        }
      }
    },
@@ -3780,60 +3863,6 @@
      "validation": {
        "unique_vendor_name": ""
      }
    },
    "notifications": {
      "labels": {
        "notification-center": "",
        "scenario": "",
        "notificationscenarios": "",
        "save": "",
        "watching-issue": "",
        "add-watchers": "",
        "employee-search": "",
        "teams-search": "",
        "add-watchers-team": "",
        "new-notification-title": "",
        "show-unread-only": "",
        "mark-all-read": "",
        "notification-popup-title": "",
        "ro-number": "",
        "no-watchers": "",
        "notification-settings-success": "",
        "notification-settings-failure": "",
        "watch": "",
        "unwatch": ""
      },
      "actions": {
        "remove": ""
      },
      "aria": {
        "toggle": ""
      },
      "tooltips": {
        "job-watchers": ""
      },
      "scenarios": {
        "job-assigned-to-me": "",
        "bill-posted": "",
        "critical-parts-status-changed": "",
        "part-marked-back-ordered": "",
        "new-note-added": "",
        "supplement-imported": "",
        "schedule-dates-changed": "",
        "tasks-updated-created": "",
        "new-media-added-reassigned": "",
        "new-time-ticket-posted": "",
        "intake-delivery-checklist-completed": "",
        "job-added-to-production": "",
        "job-status-change": "",
        "payment-collected-completed": "",
        "alternate-transport-changed": ""
      },
      "channels": {
        "app": "",
        "email": "",
        "fcm": ""
      }
    }
  }
 }
--- a/client/src/utils/AuditTrailMappings.js
+++ b/client/src/utils/AuditTrailMappings.js
@@ -15,8 +15,8 @@ const AuditTrailMapping = {
  jobchecklist: (type, inproduction, status) =>
    i18n.t("audit_trail.messages.jobchecklist", { type, inproduction, status }),
  jobconverted: (ro_number) => i18n.t("audit_trail.messages.jobconverted", { ro_number }),
-  jobintake: (status, email, scheduled_completion) =>
+  jobintake: (status, scheduled_completion) =>
-    i18n.t("audit_trail.messages.jobintake", { status, email, scheduled_completion }),
+    i18n.t("audit_trail.messages.jobintake", { status, scheduled_completion }),
  jobdelivery: (status, email, actual_completion) =>
    i18n.t("audit_trail.messages.jobdelivery", { status, email, actual_completion }),
  jobexported: () => i18n.t("audit_trail.messages.jobexported"),
--- a/Show More
+++ b/Show More