feature/IO-3182-Phone-Number-Consent - Checkpoint

2025-05-30 14:14:05 -04:00 · 2025-05-29 13:49:56 -04:00 · 2025-05-28 14:01:24 -04:00 · 2025-05-28 13:45:12 -04:00 · 2025-05-28 13:17:21 -04:00 · 2025-05-28 13:07:11 -04:00
175 changed files with 8217 additions and 4869 deletions
--- a/bodyshop_translations.babel
+++ b/bodyshop_translations.babel
--- a/client/index.html
+++ b/client/index.html
@@ -74,50 +74,8 @@
      })();
    </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 || []);
+    <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 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
@@ -12,21 +12,21 @@
    "@apollo/client": "^3.13.6",
    "@emotion/is-prop-valid": "^1.3.1",
    "@fingerprintjs/fingerprintjs": "^4.6.1",
-    "@firebase/analytics": "^0.10.12",
-    "@firebase/app": "^0.11.4",
-    "@firebase/auth": "^1.10.0",
-    "@firebase/firestore": "^4.7.10",
-    "@firebase/messaging": "^0.12.17",
+    "@firebase/analytics": "^0.10.16",
+    "@firebase/app": "^0.13.0",
+    "@firebase/auth": "^1.10.6",
+    "@firebase/firestore": "^4.7.16",
+    "@firebase/messaging": "^0.12.21",
    "@jsreport/browser-client": "^3.1.0",
-    "@reduxjs/toolkit": "^2.6.1",
-    "@sentry/cli": "^2.43.0",
-    "@sentry/react": "^9.11.0",
-    "@sentry/vite-plugin": "^3.3.1",
+    "@reduxjs/toolkit": "^2.8.2",
+    "@sentry/cli": "^2.46.0",
+    "@sentry/react": "^9.23.0",
+    "@sentry/vite-plugin": "^3.5.0",
    "@splitsoftware/splitio-react": "^2.1.1",
    "@tanem/react-nprogress": "^5.0.53",
-    "antd": "^5.24.6",
+    "antd": "^5.25.3",
    "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,19 @@
    "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",
+    "phone": "^3.1.59",
    "prop-types": "^15.8.1",
-    "query-string": "^9.1.1",
+    "query-string": "^9.2.0",
    "raf-schd": "^4.0.3",
    "react": "^18.3.1",
    "react-big-calendar": "^1.18.0",
@@ -57,8 +58,8 @@
    "react-dom": "^18.3.1",
    "react-drag-listview": "^2.0.0",
    "react-grid-gallery": "^1.0.1",
-    "react-grid-layout": "^1.3.4",
-    "react-i18next": "^15.4.1",
+    "react-grid-layout": "1.3.4",
+    "react-i18next": "^15.5.2",
    "react-icons": "^5.5.0",
    "react-image-lightbox": "^5.1.4",
    "react-markdown": "^10.1.0",
@@ -69,7 +70,7 @@
    "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.2",
    "redux": "^5.0.1",
    "redux-actions": "^3.0.3",
@@ -77,9 +78,9 @@
    "redux-saga": "^1.3.0",
    "redux-state-sync": "^3.1.4",
    "reselect": "^5.1.1",
-    "sass": "^1.86.3",
+    "sass": "^1.89.0",
    "socket.io-client": "^4.8.1",
-    "styled-components": "^6.1.17",
+    "styled-components": "^6.1.18",
    "subscriptions-transport-ws": "^0.11.0",
    "use-memo-one": "^1.1.3",
    "vite-plugin-ejs": "^1.7.0",
@@ -129,18 +130,18 @@
  "devDependencies": {
    "@ant-design/icons": "^6.0.0",
    "@babel/plugin-proposal-private-property-in-object": "^7.21.11",
-    "@babel/preset-react": "^7.26.3",
-    "@dotenvx/dotenvx": "^1.39.1",
+    "@babel/preset-react": "^7.27.1",
+    "@dotenvx/dotenvx": "^1.44.1",
    "@emotion/babel-plugin": "^11.13.5",
    "@emotion/react": "^11.14.0",
-    "@eslint/js": "^9.24.0",
+    "@eslint/js": "^9.27.0",
    "@playwright/test": "^1.51.1",
-    "@sentry/webpack-plugin": "^3.3.1",
+    "@sentry/webpack-plugin": "^3.5.0",
    "@testing-library/dom": "^10.4.0",
    "@testing-library/jest-dom": "^6.6.3",
    "@testing-library/react": "^16.3.0",
-    "@vitejs/plugin-react": "^4.3.4",
-    "browserslist": "^4.24.4",
+    "@vitejs/plugin-react": "^4.5.0",
+    "browserslist": "^4.24.5",
    "browserslist-to-esbuild": "^2.1.1",
    "chalk": "^5.4.1",
    "eslint": "^8.57.1",
@@ -148,19 +149,19 @@
    "eslint-plugin-react": "^7.37.5",
    "globals": "^15.15.0",
    "jsdom": "^26.0.0",
-    "memfs": "^4.17.0",
+    "memfs": "^4.17.2",
    "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.5",
-    "vite-plugin-babel": "^1.3.0",
+    "vite": "^6.3.5",
+    "vite-plugin-babel": "^1.3.1",
    "vite-plugin-eslint": "^1.8.1",
    "vite-plugin-node-polyfills": "^0.23.0",
    "vite-plugin-pwa": "^1.0.0",
    "vite-plugin-style-import": "^2.0.0",
-    "vitest": "^3.1.1",
+    "vitest": "^3.1.4",
    "workbox-window": "^7.3.0"
  }
 }
--- 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" })),
-  insertAuditTrail: ({ jobid, operation, type }) => dispatch(insertAuditTrail({ jobid, operation, type }))
+  setPartsOrderContext: (context) =>
+    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/ca-bc-pvrt-calculator/ca-bc-pvrt-calculator.component.jsx
+++ b/client/src/components/ca-bc-pvrt-calculator/ca-bc-pvrt-calculator.component.jsx
@@ -3,6 +3,7 @@ import { Button, Form, InputNumber, Popover, Space } from "antd";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { logImEXEvent } from "../../firebase/firebase.utils";
+
 export default function CABCpvrtCalculator({ disabled, form }) {
  const [visibility, setVisibility] = useState(false);

@@ -39,7 +40,7 @@ export default function CABCpvrtCalculator({ disabled, form }) {
  );

  return (
-    <Popover destroyTooltipOnHide content={popContent} open={visibility} disabled={disabled}>
+    <Popover destroyOnHidden content={popContent} open={visibility} disabled={disabled}>
      <Button disabled={disabled} onClick={() => setVisibility(true)}>
        <CalculatorFilled />
      </Button>
--- 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
@@ -34,16 +34,14 @@ export function ChatAffixContainer({ bodyshop, chatVisible }) {

    SubscribeToTopicForFCMNotification();

-    //Register WS handlers
+    // Register WebSocket handlers
    if (socket && socket.connected) {
      registerMessagingHandlers({ socket, client });
-    }

-    return () => {
-      if (socket && socket.connected) {
+      return () => {
        unregisterMessagingHandlers({ socket });
-      }
-    };
+      };
+    }
  }, [bodyshop, socket, t, client]);

  if (!bodyshop || !bodyshop.messagingservicesid) return <></>;
--- a/client/src/components/chat-affix/registerMessagingSocketHandlers.js
+++ b/client/src/components/chat-affix/registerMessagingSocketHandlers.js
@@ -202,8 +202,6 @@ export const registerMessagingHandlers = ({ socket, client }) => {
                      text: message.text
                    };

-                  // Add cases for other known message types as needed
-
                  default:
                    // Log a warning for unhandled message types
                    logLocal("handleMessageChanged - Unhandled message type", { type: message.type });
@@ -211,7 +209,7 @@ export const registerMessagingHandlers = ({ socket, client }) => {
                }
              }

-              return messageRef; // Keep other messages unchanged
+              return messageRef;
            });
          }
        }
@@ -245,11 +243,8 @@ export const registerMessagingHandlers = ({ socket, client }) => {
        });

        const updatedList = existingList?.conversations
-          ? [
-              newConversation,
-              ...existingList.conversations.filter((conv) => conv.id !== newConversation.id) // Prevent duplicates
-            ]
-          : [newConversation];
+          ? [newConversation, ...existingList.conversations.filter((conv) => conv.id !== newConversation.id)]
+          : [newConversation]; // Prevent duplicates

        client.cache.writeQuery({
          query: CONVERSATION_LIST_QUERY,
@@ -403,6 +398,7 @@ export const registerMessagingHandlers = ({ socket, client }) => {
          }

          break;
+
        default:
          logLocal("handleConversationChanged - Unhandled type", { type });
          client.cache.modify({
@@ -419,10 +415,95 @@ export const registerMessagingHandlers = ({ socket, client }) => {
    }
  };

+  // Existing handler for phone number opt-out
+  const handlePhoneNumberOptedOut = async (data) => {
+    const { bodyshopid, phone_number } = data;
+    logLocal("handlePhoneNumberOptedOut - Start", data);
+
+    try {
+      client.cache.modify({
+        id: "ROOT_QUERY",
+        fields: {
+          phone_number_opt_out(existing = [], { readField }) {
+            const phoneNumberExists = existing.some(
+              (ref) => readField("phone_number", ref) === phone_number && readField("bodyshopid", ref) === bodyshopid
+            );
+
+            if (phoneNumberExists) {
+              logLocal("handlePhoneNumberOptedOut - Phone number already in cache", { phone_number, bodyshopid });
+              return existing;
+            }
+
+            const newOptOut = {
+              __typename: "phone_number_opt_out",
+              id: `temporary-${phone_number}-${Date.now()}`,
+              bodyshopid,
+              phone_number,
+              created_at: new Date().toISOString(),
+              updated_at: new Date().toISOString()
+            };
+
+            return [...existing, newOptOut];
+          }
+        },
+        broadcast: true
+      });
+
+      client.cache.evict({
+        id: "ROOT_QUERY",
+        fieldName: "phone_number_opt_out",
+        args: { bodyshopid, search: phone_number }
+      });
+      client.cache.gc();
+
+      logLocal("handlePhoneNumberOptedOut - Cache updated successfully", data);
+    } catch (error) {
+      console.error("Error updating cache for phone number opt-out:", error);
+      logLocal("handlePhoneNumberOptedOut - Error", { error: error.message });
+    }
+  };
+  
+  // New handler for phone number opt-in
+  const handlePhoneNumberOptedIn = async (data) => {
+    const { bodyshopid, phone_number } = data;
+    logLocal("handlePhoneNumberOptedIn - Start", data);
+
+    try {
+      // Update the Apollo cache for GET_PHONE_NUMBER_OPT_OUTS by removing the phone number
+      client.cache.modify({
+        id: "ROOT_QUERY",
+        fields: {
+          phone_number_opt_out(existing = [], { readField }) {
+            // Filter out the phone number from the opt-out list
+            return existing.filter(
+              (ref) => !(readField("phone_number", ref) === phone_number && readField("bodyshopid", ref) === bodyshopid)
+            );
+          }
+        },
+        broadcast: true // Trigger UI updates
+      });
+
+      // Evict the cache entry to force a refetch on next query
+      client.cache.evict({
+        id: "ROOT_QUERY",
+        fieldName: "phone_number_opt_out",
+        args: { bodyshopid, search: phone_number }
+      });
+      client.cache.gc();
+
+      logLocal("handlePhoneNumberOptedIn - Cache updated successfully", data);
+    } catch (error) {
+      console.error("Error updating cache for phone number opt-in:", error);
+      logLocal("handlePhoneNumberOptedIn - Error", { error: error.message });
+    }
+  };
+
  socket.on("new-message-summary", handleNewMessageSummary);
  socket.on("new-message-detailed", handleNewMessageDetailed);
  socket.on("message-changed", handleMessageChanged);
  socket.on("conversation-changed", handleConversationChanged);
+  socket.on("phone-number-opted-out", handlePhoneNumberOptedOut);
+  socket.on("phone-number-opted-in", handlePhoneNumberOptedIn);
 };

 export const unregisterMessagingHandlers = ({ socket }) => {
@@ -431,4 +512,6 @@ export const unregisterMessagingHandlers = ({ socket }) => {
  socket.off("new-message-detailed");
  socket.off("message-changed");
  socket.off("conversation-changed");
+  socket.off("phone-number-opted-out");
+  socket.off("phone-number-opted-in");
 };
--- a/client/src/components/chat-conversation-list/chat-conversation-list.component.jsx
+++ b/client/src/components/chat-conversation-list/chat-conversation-list.component.jsx
@@ -1,5 +1,5 @@
-import { Badge, Card, List, Space, Tag } from "antd";
-import React, { useEffect, useState } from "react";
+import { Badge, Card, List, Space, Tag, Tooltip } from "antd";
+import { useEffect, useMemo, useState } from "react";
 import { connect } from "react-redux";
 import { Virtuoso } from "react-virtuoso";
 import { createStructuredSelector } from "reselect";
@@ -9,36 +9,62 @@ import { TimeAgoFormatter } from "../../utils/DateFormatter";
 import PhoneFormatter from "../../utils/PhoneFormatter";
 import { OwnerNameDisplayFunction } from "../owner-name-display/owner-name-display.component";
 import _ from "lodash";
+import { ExclamationCircleOutlined } from "@ant-design/icons";
 import "./chat-conversation-list.styles.scss";
+import { useQuery } from "@apollo/client";
+import { GET_PHONE_NUMBER_OPT_OUTS } from "../../graphql/phone-number-opt-out.queries.js";
+import { phone } from "phone";
+import { useTranslation } from "react-i18next";
+import { selectBodyshop } from "../../redux/user/user.selectors";

 const mapStateToProps = createStructuredSelector({
-  selectedConversation: selectSelectedConversation
+  selectedConversation: selectSelectedConversation,
+  bodyshop: selectBodyshop
 });

 const mapDispatchToProps = (dispatch) => ({
  setSelectedConversation: (conversationId) => dispatch(setSelectedConversation(conversationId))
 });

-function ChatConversationListComponent({ conversationList, selectedConversation, setSelectedConversation }) {
-  // That comma is there for a reason, do not remove it
+function ChatConversationListComponent({ conversationList, selectedConversation, setSelectedConversation, bodyshop }) {
+  const { t } = useTranslation();
  const [, forceUpdate] = useState(false);

-  // Re-render every minute
+  const phoneNumbers = conversationList.map((item) => phone(item.phone_num, "CA").phoneNumber.replace(/^\+1/, ""));
+
+  const { data: optOutData } = useQuery(GET_PHONE_NUMBER_OPT_OUTS, {
+    variables: {
+      bodyshopid: bodyshop.id,
+      phone_numbers: phoneNumbers
+    },
+    skip: !conversationList.length,
+    fetchPolicy: "cache-and-network"
+  });
+
+  const optOutMap = useMemo(() => {
+    const map = new Map();
+    optOutData?.phone_number_opt_out?.forEach((optOut) => {
+      map.set(optOut.phone_number, true);
+    });
+    return map;
+  }, [optOutData?.phone_number_opt_out]);
+
  useEffect(() => {
    const interval = setInterval(() => {
-      forceUpdate((prev) => !prev); // Toggle state to trigger re-render
-    }, 60000); // 1 minute in milliseconds
-
-    return () => clearInterval(interval); // Cleanup on unmount
+      forceUpdate((prev) => !prev);
+    }, 60000);
+    return () => clearInterval(interval);
  }, []);

-  // Memoize the sorted conversation list
-  const sortedConversationList = React.useMemo(() => {
+  const sortedConversationList = useMemo(() => {
    return _.orderBy(conversationList, ["updated_at"], ["desc"]);
  }, [conversationList]);

-  const renderConversation = (index) => {
+  const renderConversation = (index, t) => {
    const item = sortedConversationList[index];
+    const normalizedPhone = phone(item.phone_num, "CA").phoneNumber.replace(/^\+1/, "");
+    const hasOptOutEntry = optOutMap.has(normalizedPhone);
+
    const cardContentRight = <TimeAgoFormatter>{item.updated_at}</TimeAgoFormatter>;
    const cardContentLeft =
      item.job_conversations.length > 0
@@ -60,7 +86,18 @@ function ChatConversationListComponent({ conversationList, selectedConversation,
      </>
    );

-    const cardExtra = <Badge count={item.messages_aggregate.aggregate.count} />;
+    const cardExtra = (
+      <>
+        <Badge count={item.messages_aggregate.aggregate.count} />
+        {hasOptOutEntry && (
+          <Tooltip title={t("consent.text_body")}>
+            <Tag color="red" icon={<ExclamationCircleOutlined />}>
+              {t("messaging.labels.no_consent")}
+            </Tag>
+          </Tooltip>
+        )}
+      </>
+    );

    const getCardStyle = () =>
      item.id === selectedConversation
@@ -73,9 +110,25 @@ function ChatConversationListComponent({ conversationList, selectedConversation,
        onClick={() => setSelectedConversation(item.id)}
        className={`chat-list-item ${item.id === selectedConversation ? "chat-list-selected-conversation" : ""}`}
      >
-        <Card style={getCardStyle()} bordered={false} size="small" extra={cardExtra} title={cardTitle}>
-          <div style={{ display: "inline-block", width: "70%", textAlign: "left" }}>{cardContentLeft}</div>
-          <div style={{ display: "inline-block", width: "30%", textAlign: "right" }}>{cardContentRight}</div>
+        <Card style={getCardStyle()} variant={true} size="small" extra={cardExtra} title={cardTitle}>
+          <div
+            style={{
+              display: "inline-block",
+              width: "70%",
+              textAlign: "left"
+            }}
+          >
+            {cardContentLeft}
+          </div>
+          <div
+            style={{
+              display: "inline-block",
+              width: "30%",
+              textAlign: "right"
+            }}
+          >
+            {cardContentRight}
+          </div>
        </Card>
      </List.Item>
    );
@@ -85,7 +138,7 @@ function ChatConversationListComponent({ conversationList, selectedConversation,
    <div className="chat-list-container">
      <Virtuoso
        data={sortedConversationList}
-        itemContent={(index) => renderConversation(index)}
+        itemContent={(index) => renderConversation(index, t)}
        style={{ height: "100%", width: "100%" }}
      />
    </div>
--- a/client/src/components/chat-conversation-list/chat-conversation-list.styles.scss
+++ b/client/src/components/chat-conversation-list/chat-conversation-list.styles.scss
@@ -24,7 +24,7 @@

 /* Add spacing and better alignment for items */
 .chat-list-item {
-  padding: 0.5rem 0; /* Add spacing between list items */
+  padding: 0.2rem 0; /* Add spacing between list items */

  .ant-card {
    border-radius: 8px; /* Slight rounding for card edges */
--- a/client/src/components/chat-conversation/chat-conversation.container.jsx
+++ b/client/src/components/chat-conversation/chat-conversation.container.jsx
@@ -58,6 +58,7 @@ function ChatConversationContainer({ bodyshop, selectedConversation }) {
              userid
              created_at
              read
+              is_system
            }
          `,
          data: message
--- a/client/src/components/chat-media-selector/chat-media-selector.component.jsx
+++ b/client/src/components/chat-media-selector/chat-media-selector.component.jsx
@@ -13,13 +13,14 @@ import JobDocumentsGalleryExternal from "../jobs-documents-gallery/jobs-document
 import JobsDocumentImgproxyGalleryExternal from "../jobs-documents-imgproxy-gallery/jobs-documents-imgproxy-gallery.external.component";
 import JobDocumentsLocalGalleryExternal from "../jobs-documents-local-gallery/jobs-documents-local-gallery.external.component";
 import LoadingSpinner from "../loading-spinner/loading-spinner.component";
+import "./chat-media-selector.styles.scss";

 const mapStateToProps = createStructuredSelector({
  bodyshop: selectBodyshop
 });
-const mapDispatchToProps = (dispatch) => ({
-  //setUserLanguage: language => dispatch(setUserLanguage(language))
-});
+
+const mapDispatchToProps = (dispatch) => ({});
+
 export default connect(mapStateToProps, mapDispatchToProps)(ChatMediaSelector);

 export function ChatMediaSelector({ bodyshop, selectedMedia, setSelectedMedia, conversation }) {
@@ -37,9 +38,8 @@ export function ChatMediaSelector({ bodyshop, selectedMedia, setSelectedMedia, c
    fetchPolicy: "network-only",
    nextFetchPolicy: "network-only",
    variables: {
-      jobId: conversation.job_conversations[0] && conversation.job_conversations[0].jobid
+      jobId: conversation.job_conversations[0]?.jobid
    },
-
    skip: !open || !conversation.job_conversations || conversation.job_conversations.length === 0
  });

@@ -56,25 +56,25 @@ export function ChatMediaSelector({ bodyshop, selectedMedia, setSelectedMedia, c
  //If Imageproxy is on, rely only on the LMS selector
  //If not on, use the old methods.
  const content = (
-    <div>
+    <div className="media-selector-content">
      {loading && <LoadingSpinner />}
      {error && <AlertComponent message={error.message} type="error" />}
      {selectedMedia.filter((s) => s.isSelected).length >= 10 ? (
-        <div style={{ color: "red" }}>{t("messaging.labels.maxtenimages")}</div>
+        <div className="error-message">{t("messaging.labels.maxtenimages")}</div>
      ) : null}

      {Imgproxy.treatment === "on" ? (
        <>
          {!bodyshop.uselocalmediaserver && (
            <JobsDocumentImgproxyGalleryExternal
-              jobId={conversation.job_conversations[0].jobid}
+              jobId={conversation.job_conversations[0]?.jobid}
              externalMediaState={[selectedMedia, setSelectedMedia]}
            />
          )}
          {bodyshop.uselocalmediaserver && open && (
            <JobDocumentsLocalGalleryExternal
              externalMediaState={[selectedMedia, setSelectedMedia]}
-              jobId={conversation.job_conversations[0] && conversation.job_conversations[0].jobid}
+              jobId={conversation.job_conversations[0]?.jobid}
            />
          )}
        </>
@@ -89,7 +89,7 @@ export function ChatMediaSelector({ bodyshop, selectedMedia, setSelectedMedia, c
          {bodyshop.uselocalmediaserver && open && (
            <JobDocumentsLocalGalleryExternal
              externalMediaState={[selectedMedia, setSelectedMedia]}
-              jobId={conversation.job_conversations[0] && conversation.job_conversations[0].jobid}
+              jobId={conversation.job_conversations[0]?.jobid}
            />
          )}
        </>
@@ -100,12 +100,17 @@ export function ChatMediaSelector({ bodyshop, selectedMedia, setSelectedMedia, c
  return (
    <Popover
      content={
-        conversation.job_conversations.length === 0 ? <div>{t("messaging.errors.noattachedjobs")}</div> : content
+        conversation.job_conversations.length === 0 ? (
+          <div className="no-jobs-message">{t("messaging.errors.noattachedjobs")}</div>
+        ) : (
+          content
+        )
      }
      title={t("messaging.labels.selectmedia")}
      trigger="click"
      open={open}
      onOpenChange={handleVisibleChange}
+      overlayClassName="media-selector-popover"
    >
      <Badge count={selectedMedia.filter((s) => s.isSelected).length}>
        <PictureFilled style={{ margin: "0 .5rem" }} />
--- a/client/src/components/chat-media-selector/chat-media-selector.styles.scss
+++ b/client/src/components/chat-media-selector/chat-media-selector.styles.scss
@@ -0,0 +1,52 @@
+.media-selector-popover {
+  .ant-popover-inner-content {
+    max-width: 640px;
+    max-height: 480px;
+    overflow-y: auto;
+    padding: 8px;
+    background-color: #fff;
+    border-radius: 8px;
+  }
+}
+
+.media-selector-content {
+  display: flex;
+  flex-direction: column;
+  gap: 4px;
+}
+
+.error-message {
+  color: red;
+  font-size: 12px;
+  text-align: center;
+  margin-bottom: 8px;
+}
+
+.no-jobs-message {
+  font-size: 14px;
+  color: #888;
+  text-align: center;
+  padding: 8px;
+}
+
+/* Style images within gallery components */
+.media-selector-content img {
+
+  object-fit: cover;
+  border-radius: 4px;
+  margin: 4px;
+  cursor: pointer;
+  transition: transform 0.2s;
+
+  &:hover {
+    transform: scale(1.05);
+  }
+}
+
+/* Grid layout for gallery components */
+.media-selector-content .ant-image, /* Assuming gallery components use Ant Design's Image */
+.media-selector-content .gallery-container { /* Fallback for custom gallery classes */
+  display: grid;
+  grid-template-columns: repeat(auto-fill, minmax(100px, 1fr));
+  gap: 4px;
+}
--- a/client/src/components/chat-messages-list/chat-message-list.styles.scss
+++ b/client/src/components/chat-messages-list/chat-message-list.styles.scss
@@ -4,13 +4,16 @@
  height: 100%;
  width: 100%;
 }
+
 .archive-button {
  height: 20px;
  border-radius: 4px;
 }
+
 .chat-title {
  margin-bottom: 5px;
 }
+
 .messages {
  display: flex;
  flex-direction: column;
@@ -37,11 +40,13 @@
    gap: 8px;
  }
 }
-.chat-send-message-button{
+
+.chat-send-message-button {
  margin: 0.3rem;
  padding-left: 0.5rem;
-  
+
 }
+
 .message-icon {
  position: absolute;
  bottom: 0.1rem;
@@ -125,6 +130,37 @@
  }
 }

+.system {
+  align-items: center;
+  margin: 0.5rem 10%;
+
+  .message {
+    background-color: #f5f5f5;
+    border-radius: 10px;
+    padding: 0.5rem 1rem;
+    text-align: center;
+    font-style: italic;
+    color: #555;
+    width: fit-content;
+    max-width: 80%;
+  }
+
+  .system-label {
+    font-size: 0.75rem;
+    color: #888;
+    margin-bottom: 0.2rem;
+    display: block;
+  }
+
+  .system-date {
+    font-size: 0.75rem;
+    color: #888;
+    margin-top: 0.2rem;
+    text-align: center;
+  }
+}
+
+
 .virtuoso-container {
  flex: 1;
  overflow: auto;
--- a/client/src/components/chat-messages-list/renderMessage.jsx
+++ b/client/src/components/chat-messages-list/renderMessage.jsx
@@ -2,17 +2,29 @@ import Icon from "@ant-design/icons";
 import { Tooltip } from "antd";
 import i18n from "i18next";
 import dayjs from "../../utils/day";
-import { MdDone, MdDoneAll } from "react-icons/md";
+import { MdClose, MdDone, MdDoneAll } from "react-icons/md";
 import { DateTimeFormatter } from "../../utils/DateFormatter";

 export const renderMessage = (messages, index) => {
  const message = messages[index];
+  const isSystem = message.is_system;
+
+  // Determine message class
+  const messageClass = isSystem ? "system messages" : message.isoutbound ? "mine messages" : "yours messages";
+
+  // Tooltip content based on message type
+  const tooltipTitle = isSystem ? (
+    i18n.t("consent.text_body")
+  ) : (
+    <DateTimeFormatter>{message.created_at}</DateTimeFormatter>
+  );

  return (
-    <div key={index} className={`${message.isoutbound ? "mine messages" : "yours messages"}`}>
+    <div key={index} className={messageClass}>
      <div className="message msgmargin">
-        <Tooltip title={DateTimeFormatter({ children: message.created_at })}>
+        <Tooltip title={tooltipTitle}>
          <div>
+            {isSystem && <span className="system-label">System</span>}
            {/* Render images if available */}
            {message.image && message.image_path?.length > 0 && (
              <div className="message-images">
@@ -26,20 +38,31 @@ export const renderMessage = (messages, index) => {
              </div>
            )}
            {/* Render text if available */}
-            {message.text && <div>{message.text}</div>}
+            {message.text && <div className="message-text">{message.text}</div>}
+            {/* Render date for system messages */}
+            {isSystem && (
+              <div className="system-date">
+                <DateTimeFormatter>{message.created_at}</DateTimeFormatter>
+              </div>
+            )}
          </div>
        </Tooltip>

-        {/* Message status icons */}
-        {message.status && (message.status === "sent" || message.status === "delivered") && (
-          <div className="message-status">
-            <Icon component={message.status === "sent" ? MdDone : MdDoneAll} className="message-icon" />
-          </div>
-        )}
+        {/* Message status icons for non-system messages */}
+        {!isSystem &&
+          message.status &&
+          (message.status === "sent" || message.status === "delivered" || message.status === "failed") && (
+            <div className="message-status">
+              <Icon
+                component={message.status === "sent" ? MdDone : message.status === "delivered" ? MdDoneAll : MdClose}
+                className="message-icon"
+                style={message.status === "failed" ? { color: "#ff0000" } : undefined}
+              />
+            </div>
+          )}
      </div>
-
-      {/* Outbound message metadata */}
-      {message.isoutbound && (
+      {/* Outbound message metadata for non-system messages */}
+      {!isSystem && message.isoutbound && (
        <div style={{ fontSize: 10 }}>
          {i18n.t("messaging.labels.sentby", {
            by: message.userid,
--- a/client/src/components/chat-send-message/chat-send-message.component.jsx
+++ b/client/src/components/chat-send-message/chat-send-message.component.jsx
@@ -1,6 +1,6 @@
-import { LoadingOutlined, SendOutlined } from "@ant-design/icons";
-import { Input, Spin } from "antd";
-import React, { useEffect, useRef, useState } from "react";
+import { ExclamationCircleOutlined, LoadingOutlined, SendOutlined } from "@ant-design/icons";
+import { Alert, Input, Space, Spin, Tooltip } from "antd";
+import { useEffect, useRef, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
@@ -10,6 +10,9 @@ import { selectIsSending, selectMessage } from "../../redux/messaging/messaging.
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import ChatMediaSelector from "../chat-media-selector/chat-media-selector.component";
 import ChatPresetsComponent from "../chat-presets/chat-presets.component";
+import { useQuery } from "@apollo/client";
+import { phone } from "phone";
+import { GET_PHONE_NUMBER_OPT_OUT } from "../../graphql/phone-number-opt-out.queries";

 const mapStateToProps = createStructuredSelector({
  bodyshop: selectBodyshop,
@@ -25,16 +28,24 @@ const mapDispatchToProps = (dispatch) => ({
 function ChatSendMessageComponent({ conversation, bodyshop, sendMessage, isSending, message, setMessage }) {
  const inputArea = useRef(null);
  const [selectedMedia, setSelectedMedia] = useState([]);
+  const { t } = useTranslation();
+
+  const normalizedPhone = phone(conversation.phone_num, "CA").phoneNumber.replace(/^\+1/, "");
+  const { data: optOutData } = useQuery(GET_PHONE_NUMBER_OPT_OUT, {
+    variables: { bodyshopid: bodyshop.id, phone_number: normalizedPhone },
+    fetchPolicy: "cache-and-network"
+  });
+
+  const isOptedOut = !!optOutData?.phone_number_opt_out?.[0];

  useEffect(() => {
    inputArea.current.focus();
  }, [isSending, setMessage]);

-  const { t } = useTranslation();
-
  const handleEnter = () => {
    const selectedImages = selectedMedia.filter((i) => i.isSelected);
    if ((message === "" || !message) && selectedImages.length === 0) return;
+    if (isOptedOut) return; // Prevent sending if phone number is opted out
    logImEXEvent("messaging_send_message");

    if (selectedImages.length < 11) {
@@ -44,7 +55,8 @@ function ChatSendMessageComponent({ conversation, bodyshop, sendMessage, isSendi
        messagingServiceSid: bodyshop.messagingservicesid,
        conversationid: conversation.id,
        selectedMedia: selectedImages,
-        imexshopid: bodyshop.imexshopid
+        imexshopid: bodyshop.imexshopid,
+        bodyshopid: bodyshop.id
      };
      sendMessage(newMessage);
      setSelectedMedia(
@@ -56,47 +68,67 @@ function ChatSendMessageComponent({ conversation, bodyshop, sendMessage, isSendi
  };

  return (
-    <div className="imex-flex-row" style={{ width: "100%" }}>
-      <ChatPresetsComponent className="imex-flex-row__margin" />
-      <ChatMediaSelector
-        conversation={conversation}
-        selectedMedia={selectedMedia}
-        setSelectedMedia={setSelectedMedia}
-      />
-      <span style={{ flex: 1 }}>
-        <Input.TextArea
-          className="imex-flex-row__margin imex-flex-row__grow"
-          allowClear
-          autoFocus
-          ref={inputArea}
-          autoSize={{ minRows: 1, maxRows: 4 }}
-          value={message}
-          disabled={isSending}
-          placeholder={t("messaging.labels.typeamessage")}
-          onChange={(e) => setMessage(e.target.value)}
-          onPressEnter={(event) => {
-            event.preventDefault();
-            if (!!!event.shiftKey) handleEnter();
-          }}
-        />
-      </span>
-      <SendOutlined
-        className="chat-send-message-button"
-        //  disabled={message === "" || !message}
-        onClick={handleEnter}
-      />
-      <Spin
-        style={{ display: `${isSending ? "" : "none"}` }}
-        indicator={
-          <LoadingOutlined
-            style={{
-              fontSize: 24
-            }}
-            spin
+    <Space direction="vertical" style={{ width: "100%" }} size="middle">
+      {isOptedOut && (
+        <Tooltip title={t("consent.text_body")}>
+          <Alert
+            showIcon={true}
+            icon={<ExclamationCircleOutlined />}
+            message={t("messaging.errors.no_consent")}
+            type="error"
          />
-        }
-      />
-    </div>
+        </Tooltip>
+      )}
+      <div className="imex-flex-row" style={{ width: "100%" }}>
+        {!isOptedOut && (
+          <>
+            <ChatPresetsComponent disabled={isSending} className="imex-flex-row__margin" />
+            <ChatMediaSelector
+              disabled={isSending}
+              conversation={conversation}
+              selectedMedia={selectedMedia}
+              setSelectedMedia={setSelectedMedia}
+            />
+          </>
+        )}
+        <span style={{ flex: 1 }}>
+          <Input.TextArea
+            className="imex-flex-row__margin imex-flex-row__grow"
+            allowClear
+            autoFocus
+            ref={inputArea}
+            autoSize={{ minRows: 1, maxRows: 4 }}
+            value={message}
+            disabled={isSending || isOptedOut}
+            placeholder={t("messaging.labels.typeamessage")}
+            onChange={(e) => setMessage(e.target.value)}
+            onPressEnter={(event) => {
+              event.preventDefault();
+              if (!event.shiftKey && !isOptedOut) handleEnter();
+            }}
+          />
+        </span>
+        {!isOptedOut && (
+          <SendOutlined
+            className="chat-send-message-button"
+            disabled={isSending || message === "" || !message}
+            onClick={handleEnter}
+          />
+        )}
+
+        <Spin
+          style={{ display: `${isSending ? "" : "none"}` }}
+          indicator={
+            <LoadingOutlined
+              style={{
+                fontSize: 24
+              }}
+              spin
+            />
+          }
+        />
+      </div>
+    </Space>
  );
 }

--- 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>
-                {`${o.employee_number}  ${o.first_name} ${o.last_name}`}
-
-                <Tag color="green">
+              <Space size="small">
+                {`${o.employee_number ?? ""}  ${o.first_name} ${o.last_name}`}
+                <Tag color="green" style={{ padding: "0.1 0.1rem", marginRight: "1px", marginLeft: "1px" }}>
                  {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] ||
-    dayjs(bodyshop?.features[featureName]).isAfter(dayjs())
+    (typeof bodyshop?.features?.[featureName] === "boolean"
+      ? 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
@@ -15,6 +15,7 @@ import {
  HomeFilled,
  ImportOutlined,
  LineChartOutlined,
+  OneToOneOutlined,
  PaperClipOutlined,
  PhoneOutlined,
  PlusCircleOutlined,
@@ -24,6 +25,7 @@ import {
  TeamOutlined,
  ToolFilled,
  UnorderedListOutlined,
+  UsergroupAddOutlined,
  UserOutlined
 } from "@ant-design/icons";
 import { useQuery } from "@apollo/client";
@@ -40,6 +42,7 @@ 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.js";
 import { GET_UNREAD_COUNT } from "../../graphql/notifications.queries.js";
 import { selectRecentItems, selectSelectedHeader } from "../../redux/application/application.selectors";
 import { setModalContext } from "../../redux/modals/modals.actions";
@@ -47,10 +50,10 @@ import { signOutStart } from "../../redux/user/user.actions";
 import { selectBodyshop, selectCurrentUser } from "../../redux/user/user.selectors";
 import day from "../../utils/day.js";
 import InstanceRenderManager from "../../utils/instanceRenderMgr";
+import { useIsEmployee } from "../../utils/useIsEmployee.js";
 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";

 // Redux mappings
 const mapStateToProps = createStructuredSelector({
@@ -98,6 +101,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,
@@ -640,17 +644,32 @@ function Header({
          label: t("menus.header.help"),
          onClick: () => window.open("https://help.imex.online/", "_blank")
        },
-        ...(InstanceRenderManager({ imex: true, rome: false })
-          ? [
-              {
-                key: "rescue",
-                id: "header-rescue",
-                icon: <CarFilled />,
-                label: t("menus.header.rescueme"),
-                onClick: () => window.open("https://imexrescue.com/", "_blank")
-              }
-            ]
-          : []),
+        {
+          key: "remoteassist",
+          id: "header-remote-assist",
+          icon: <OneToOneOutlined />,
+          label: t("menus.header.remoteassist"),
+          children: [
+            ...(InstanceRenderManager({ imex: true, rome: false })
+              ? [
+                  {
+                    key: "rescue",
+                    id: "header-rescue",
+                    icon: <PlusCircleOutlined />,
+                    label: t("menus.header.rescueme"),
+                    onClick: () => window.open("https://imexrescue.com/", "_blank")
+                  }
+                ]
+              : []),
+            {
+              key: "rescue-zoho",
+              id: "header-rescue-zoho",
+              icon: <UsergroupAddOutlined />,
+              label: t("menus.header.rescuemezoho"),
+              onClick: () => window.open("https://join.zoho.com/", "_blank")
+            }
+          ]
+        },
        {
          key: "shiftclock",
          id: "header-shiftclock",
@@ -682,7 +701,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
@@ -66,7 +66,7 @@ export function ScheduleEventComponent({
  const [popOverVisible, setPopOverVisible] = useState(false);

  const [getJobDetails] = useLazyQuery(GET_JOB_BY_PK_QUICK_INTAKE, {
-    variables: { id: event.job.id },
+    variables: { id: event.job?.id },
    onCompleted: (data) => {
      if (data?.jobs_by_pk) {
        const totalHours =
@@ -83,6 +83,7 @@ export function ScheduleEventComponent({
        });
      }
    },
+
    fetchPolicy: "network-only"
  });

@@ -409,8 +410,10 @@ export function ScheduleEventComponent({
            open={popOverVisible}
            onOpenChange={setPopOverVisible}
            onClick={(e) => {
-              getJobDetails();
-              e.stopPropagation();
+              if (event.job?.id) {
+                e.stopPropagation();
+                getJobDetails();
+              }
            }}
            getPopupContainer={(trigger) => trigger.parentNode}
            trigger="click"
--- a/client/src/components/job-checklist/components/job-checklist-form/job-checklist-form.component.jsx
+++ b/client/src/components/job-checklist/components/job-checklist-form/job-checklist-form.component.jsx
@@ -1,7 +1,7 @@
 import { useMutation } from "@apollo/client";
 import { Button, Card, Form, Input, Switch } from "antd";
 import queryString from "query-string";
-import React, { useState } from "react";
+import { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { useLocation, useNavigate, useParams } from "react-router-dom";
@@ -9,7 +9,6 @@ import { createStructuredSelector } from "reselect";
 import { logImEXEvent } from "../../../../firebase/firebase.utils";
 import { MARK_APPOINTMENT_ARRIVED, MARK_LATEST_APPOINTMENT_ARRIVED } from "../../../../graphql/appointments.queries";
 import { UPDATE_JOB } from "../../../../graphql/jobs.queries";
-import { UPDATE_OWNER } from "../../../../graphql/owners.queries";
 import { insertAuditTrail } from "../../../../redux/application/application.actions";
 import { selectBodyshop, selectCurrentUser } from "../../../../redux/user/user.selectors";
 import AuditTrailMapping from "../../../../utils/AuditTrailMappings";
@@ -32,7 +31,6 @@ export function JobChecklistForm({ insertAuditTrail, formItems, bodyshop, curren
  const [loading, setLoading] = useState(false);
  const [markAptArrived] = useMutation(MARK_APPOINTMENT_ARRIVED);
  const [markLatestAptArrived] = useMutation(MARK_LATEST_APPOINTMENT_ARRIVED);
-  const [updateOwner] = useMutation(UPDATE_OWNER);
  const notification = useNotification();

  const { jobId } = useParams();
@@ -129,24 +127,6 @@ export function JobChecklistForm({ insertAuditTrail, formItems, bodyshop, curren
      }
    }

-    if (type === "intake" && job.owner && job.owner.id) {
-      //Updae Owner Allow to Text
-      const updateOwnerResult = await updateOwner({
-        variables: {
-          ownerId: job.owner.id,
-          owner: { allow_text_message: values.allow_text_message }
-        }
-      });
-
-      if (!!updateOwnerResult.errors) {
-        notification["error"]({
-          message: t("checklist.errors.complete", {
-            error: JSON.stringify(result.errors)
-          })
-        });
-      }
-    }
-
    setLoading(false);

    if (!!!result.errors) {
@@ -189,7 +169,6 @@ export function JobChecklistForm({ insertAuditTrail, formItems, bodyshop, curren
        initialValues={{
          ...(type === "intake" && {
            addToProduction: true,
-            allow_text_message: job.owner && job.owner.allow_text_message,
            scheduled_completion:
              (job && job.scheduled_completion && dayjs(job.scheduled_completion)) ||
              (job &&
@@ -228,14 +207,6 @@ export function JobChecklistForm({ insertAuditTrail, formItems, bodyshop, curren
            >
              <Switch disabled={readOnly} />
            </Form.Item>
-            <Form.Item
-              name="allow_text_message"
-              valuePropName="checked"
-              label={t("checklist.labels.allow_text_message")}
-              disabled={readOnly}
-            >
-              <Switch disabled={readOnly} />
-            </Form.Item>
            <Form.Item
              name="scheduled_completion"
              label={t("jobs.fields.scheduled_completion")}
--- 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
@@ -32,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({
@@ -87,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-employee-assignments/job-employee-assignments.component.jsx
+++ b/client/src/components/job-employee-assignments/job-employee-assignments.component.jsx
@@ -80,7 +80,7 @@ export function JobEmployeeAssignments({
  );

  return (
-    <Popover destroyTooltipOnHide content={popContent} open={visibility}>
+    <Popover destroyOnHidden content={popContent} open={visibility}>
      <Spin spinning={loading}>
        <DataLabel label={t("jobs.fields.employee_body")}>
          {body ? (
--- 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
-              type={isWatching ? "primary" : "default"}
-              danger={!isWatching}
-              icon={isWatching ? <EyeOutlined /> : <EyeFilled />}
-              size="medium"
-              onClick={handleToggleSelf}
-              loading={adding || removing}
-            >
-              {isWatching ? t("notifications.labels.unwatch") : t("notifications.labels.watch")}
-            </Button>
+            <Tooltip title={!isEmployee ? t("notifications.tooltips.not-employee") : ""} placement="top">
+              <span>
+                <Button
+                  type={isWatching ? "primary" : "default"}
+                  danger={!isWatching}
+                  icon={isWatching ? <EyeOutlined /> : <EyeFilled />}
+                  size="medium"
+                  onClick={handleToggleSelf}
+                  loading={adding || removing}
+                  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) =>
-            jobWatchers.every((w) => w.user_email !== e.user_email && e.active && e.user_email)
+          bodyshop?.employees?.filter(
+            (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 jobid = job.id;
-
+  const isEmployee = useIsEmployee(bodyshop, currentUser);
  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-create-owner-info/jobs-create-owner-info.new.component.jsx
+++ b/client/src/components/jobs-create-owner-info/jobs-create-owner-info.new.component.jsx
@@ -1,4 +1,4 @@
-import { Form, Input, Switch } from "antd";
+import { Form, Input } from "antd";
 import React, { useContext } from "react";
 import { useTranslation } from "react-i18next";
 import JobCreateContext from "../../pages/jobs-create/jobs-create.context";
@@ -129,13 +129,6 @@ export default function JobsCreateOwnerInfoNewComponent() {
        <Form.Item label={t("owners.fields.preferred_contact")} name={["owner", "data", "preferred_contact"]}>
          <Input disabled={!state.owner.new} />
        </Form.Item>
-        <Form.Item
-          label={t("owners.fields.allow_text_message")}
-          valuePropName="checked"
-          name={["owner", "data", "allow_text_message"]}
-        >
-          <Switch disabled={!state.owner.new} />
-        </Form.Item>
      </LayoutFormRow>
    </div>
  );
--- a/client/src/components/jobs-create-vehicle-info/jobs-create-vehicle-info.predefined.component.jsx
+++ b/client/src/components/jobs-create-vehicle-info/jobs-create-vehicle-info.predefined.component.jsx
@@ -72,7 +72,7 @@ export default function JobsCreateVehicleInfoPredefined({ disabled, form }) {
      open={open}
      placement="left"
      onOpenChange={handleOpenChange}
-      destroyTooltipOnHide
+      destroyOnHidden
    >
      <SearchOutlined style={{ cursor: "pointer" }} />
    </Popover>
--- 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
-                label={t("jobs.fields.actual_completion")}
-                name="actual_completion"
-                rules={[
-                  {
-                    required: jobInPostProduction
-                  }
-                ]}
-              >
-                <DateTimePicker disabled={jobRO} />
-              </Form.Item>
-            );
-          }}
+          {() => (
+            <Form.Item
+              label={t("jobs.fields.actual_completion")}
+              name="actual_completion"
+              rules={[{ required: jobInPostProduction }]}
+            >
+              <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,6 +9,7 @@ import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { Link, useNavigate } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
+import { useNotification } from "../../contexts/Notifications/notificationContext.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";
@@ -32,7 +33,6 @@ import ShareToTeamsButton from "../share-to-teams/share-to-teams.component.jsx";
 import AddToProduction from "./jobs-detail-header-actions.addtoproduction.util";
 import DuplicateJob from "./jobs-detail-header-actions.duplicate.util";
 import JobsDetailHeaderActionsToggleProduction from "./jobs-detail-header-actions.toggle-production";
-import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";

 const mapStateToProps = createStructuredSelector({
  bodyshop: selectBodyshop,
@@ -1078,17 +1078,26 @@ export function JobsDetailHeaderActions({
    menuItems.push({
      key: "deletejob",
      id: "job-actions-deletejob",
-      label: (
-        <Popconfirm
-          title={t("jobs.labels.deleteconfirm")}
-          okText={t("general.labels.yes")}
-          cancelText={t("general.labels.no")}
-          onClick={(e) => e.stopPropagation()}
-          onConfirm={handleDeleteJob}
-        >
-          {t("menus.jobsactions.deletejob")}
-        </Popconfirm>
-      )
+      label:
+        job.job_watchers.length === 0 ? (
+          <Popconfirm
+            title={t("jobs.labels.deleteconfirm")}
+            okText={t("general.labels.yes")}
+            cancelText={t("general.labels.no")}
+            onClick={(e) => e.stopPropagation()}
+            onConfirm={handleDeleteJob}
+          >
+            {t("menus.jobsactions.deletejob")}
+          </Popconfirm>
+        ) : (
+          <Popconfirm
+            title={t("jobs.labels.deletewatchers")}
+            onClick={(e) => e.stopPropagation()}
+            showCancel={false}
+          >
+            {t("menus.jobsactions.deletejob")}
+          </Popconfirm>
+        )
    });
  }

@@ -1109,8 +1118,8 @@ export function JobsDetailHeaderActions({
        <RbacWrapper action="jobs:void" noauth>
          <Popconfirm
            title={t("jobs.labels.voidjob")}
-            okText="Yes"
-            cancelText="No"
+            okText={t("general.labels.yes")}
+            cancelText={t("general.labels.no")}
            onClick={(e) => e.stopPropagation()}
            onConfirm={handleVoidJob}
          >
--- 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
@@ -167,7 +167,18 @@ export function JobsDetailHeaderActionsToggleProduction({
                <FormDateTimePickerComponent disabled={jobRO} />
              </Form.Item>

-              <Form.Item name={["actual_delivery"]} label={t("jobs.fields.actual_delivery")}>
+              <Form.Item
+                name={["actual_delivery"]}
+                label={t("jobs.fields.actual_delivery")}
+                rules={[
+                  {
+                    required: bodyshop.deliverchecklist.actual_delivery
+                      ? bodyshop.deliverchecklist.actual_delivery
+                      : false
+                    //message: t("general.validation.required"),
+                  }
+                ]}
+              >
                <FormDateTimePickerComponent disabled={jobRO} />
              </Form.Item>
            </>
--- 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,21 @@
 import { BranchesOutlined, ExclamationCircleFilled, PauseCircleOutlined, WarningFilled } from "@ant-design/icons";
-import { Card, Col, Divider, Row, Space, Tag, Tooltip } from "antd";
-import React, { useState } from "react";
+import { useMutation } from "@apollo/client";
+import { Card, Checkbox, Col, Divider, Row, Space, Tag, Tooltip } from "antd";
+import { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { Link } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
+import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
+import { UPDATE_JOB } from "../../graphql/jobs.queries";
+import { insertAuditTrail } from "../../redux/application/application.actions.js";
 import { selectJobReadOnly } from "../../redux/application/application.selectors";
 import { setModalContext } from "../../redux/modals/modals.actions";
 import { selectBodyshop } from "../../redux/user/user.selectors";
+import AuditTrailMapping from "../../utils/AuditTrailMappings.js";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";
-import { DateTimeFormatter } from "../../utils/DateFormatter";
+import { DateTimeFormatter, DateTimeFormatterFunction } 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 +27,6 @@ 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";

 const mapStateToProps = createStructuredSelector({
  jobRO: selectJobReadOnly,
@@ -29,41 +34,73 @@ 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({
+        jobid,
+        operation,
+        type
+      })
+    )
 });

 const colSpan = {
-  xs: {
-    span: 24
-  },
-  sm: {
-    span: 24
-  },
-  md: {
-    span: 12
-  },
-  lg: {
-    span: 6
-  },
-  xl: {
-    span: 6
-  }
+  xs: { span: 24 },
+  sm: { span: 24 },
+  md: { span: 12 },
+  lg: { span: 6 },
+  xl: { span: 6 }
 };

-export function JobsDetailHeader({ job, bodyshop, disabled }) {
+export function JobsDetailHeader({ job, bodyshop, disabled, insertAuditTrail }) {
  const { t } = useTranslation();
+  const { notification } = useNotification();
  const [notesClamped, setNotesClamped] = useState(true);
-  const vehicleTitle = `${job.v_model_yr || ""} ${job.v_color || ""}
-  ${job.v_make_desc || ""} 
-  ${job.v_model_desc || ""}`.trim();
-
+  const [updateJob] = useMutation(UPDATE_JOB);
+  const vehicleTitle =
+    `${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 {
+      const ret = await updateJob({
+        variables: {
+          jobId: job.id,
+          job: { [field]: value }
+        },
+        refetchQueries: ["GET_JOB_BY_PK"],
+        awaitRefetchQueries: true
+      });
+      insertAuditTrail({
+        jobid: job.id,
+        operation: AuditTrailMapping.jobfieldchange(
+          field,
+          ret.data.update_jobs.returning[0][field]
+            ? DateTimeFormatterFunction(ret.data.update_jobs.returning[0][field])
+            : checked
+        ),
+        type: "jobfieldchange"
+      });
+    } catch (error) {
+      notification.error({
+        message: t("jobs.errors.saving", { error: error.message })
+      });
+    }
+  };
+
  return (
    <Row gutter={[16, 16]} style={{ alignItems: "stretch" }}>
      <Col {...colSpan}>
@@ -72,11 +109,7 @@ export function JobsDetailHeader({ job, bodyshop, disabled }) {
            <DataLabel label={t("jobs.fields.status")}>
              <Space wrap>
                {job.status}
-                {job.inproduction && (
-                  <Tag color="#f50" key="production">
-                    {t("jobs.labels.inproduction")}
-                  </Tag>
-                )}
+                {job.inproduction && <Tag color="#f50">{t("jobs.labels.inproduction")}</Tag>}
                {job.suspended && <PauseCircleOutlined style={{ color: "orangered" }} />}
                {job.iouparent && (
                  <Link to={`/manage/jobs/${job.iouparent}`}>
@@ -110,7 +143,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 +159,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 +209,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-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
-          ref={virtuosoRef}
-          style={{ height: "400px", width: "100%" }}
-          data={notifications}
-          totalCount={notifications.length}
-          endReached={loadMore}
-          itemContent={renderNotification}
-        />
+        {!isEmployee ? (
+          <div style={{ padding: 10 }}>
+            <Alert message={t("notifications.labels.employee-notification")} type="warning" />
+          </div>
+        ) : (
+          <Virtuoso
+            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
@@ -4,9 +4,10 @@ import { connect } from "react-redux";
 import NotificationCenterComponent from "./notification-center.component";
 import { GET_NOTIFICATIONS } from "../../graphql/notifications.queries";
 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.
-      const result = await updateNotificationSettings({ variables: { id: userId, ns: values } });
-      if (!result?.errors) {
-        notification.success({ message: t("notifications.labels.notification-settings-success") });
-        setInitialValues(values);
-        setIsDirty(false);
-      } else {
+      try {
+        const result = await updateNotificationSettings({ variables: { id: userId, ns: values } });
+        if (!result?.errors) {
+          notification.success({ message: t("notifications.labels.notification-settings-success") });
+          setInitialValues(values);
+          setIsDirty(false);
+        } 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={saving}>
+            <Button type="primary" htmlType="submit" disabled={!isDirty} loading={savingSettings}>
              {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/owner-detail-form/owner-detail-form.component.jsx
+++ b/client/src/components/owner-detail-form/owner-detail-form.component.jsx
@@ -1,14 +1,15 @@
-import { Form, Input, Switch } from "antd";
-import React from "react";
+import { Form, Input, Tooltip } from "antd";
+import { CloseCircleFilled } from "@ant-design/icons";
 import { useTranslation } from "react-i18next";
 import FormFieldsChanged from "../form-fields-changed-alert/form-fields-changed-alert.component";
 import FormItemEmail from "../form-items-formatted/email-form-item.component";
-import FormItemPhone, { PhoneItemFormatterValidation } from "../form-items-formatted/phone-form-item.component";
 import LayoutFormRow from "../layout-form-row/layout-form-row.component";
+import { PhoneItemFormatterValidation } from "../form-items-formatted/phone-form-item.component";

-export default function OwnerDetailFormComponent({ form, loading }) {
+export default function OwnerDetailFormComponent({ form, loading, isPhone1OptedOut, isPhone2OptedOut }) {
  const { t } = useTranslation();
  const { getFieldValue } = form;
+
  return (
    <div>
      <FormFieldsChanged form={form} />
@@ -26,7 +27,7 @@ export default function OwnerDetailFormComponent({ form, loading }) {
          <Input />
        </Form.Item>
        <Form.Item label={t("owners.fields.accountingid")} name="accountingid">
-          <Input disabled/>
+          <Input disabled />
        </Form.Item>
      </LayoutFormRow>
      <LayoutFormRow header={t("owners.forms.address")}>
@@ -50,9 +51,6 @@ export default function OwnerDetailFormComponent({ form, loading }) {
        </Form.Item>
      </LayoutFormRow>
      <LayoutFormRow header={t("owners.forms.contact")}>
-        <Form.Item label={t("owners.fields.allow_text_message")} name="allow_text_message" valuePropName="checked">
-          <Switch />
-        </Form.Item>
        <Form.Item
          label={t("owners.fields.ownr_ea")}
          name="ownr_ea"
@@ -65,19 +63,55 @@ export default function OwnerDetailFormComponent({ form, loading }) {
        >
          <FormItemEmail email={getFieldValue("ownr_ea")} />
        </Form.Item>
-        <Form.Item
-          label={t("owners.fields.ownr_ph1")}
-          name="ownr_ph1"
-          rules={[({ getFieldValue }) => PhoneItemFormatterValidation(getFieldValue, "ownr_ph1")]}
-        >
-          <FormItemPhone />
+        <Form.Item label={t("owners.fields.ownr_ph1")} style={{ marginBottom: 0 }}>
+          <div style={{ display: "flex", alignItems: "center", gap: "8px" }}>
+            <Form.Item
+              name="ownr_ph1"
+              noStyle
+              rules={[({ getFieldValue }) => PhoneItemFormatterValidation(getFieldValue, "ownr_ph1")]}
+            >
+              <Input style={{ flex: 1, minWidth: "150px" }} />
+            </Form.Item>
+            {isPhone1OptedOut && (
+              <Tooltip title={t("consent.text_body")}>
+                <CloseCircleFilled
+                  style={{
+                    color: "#ff4d4f",
+                    fontSize: 16,
+                    display: "flex",
+                    alignItems: "center",
+                    justifyContent: "center",
+                    height: "100%"
+                  }}
+                />
+              </Tooltip>
+            )}
+          </div>
        </Form.Item>
-        <Form.Item
-          label={t("owners.fields.ownr_ph2")}
-          name="ownr_ph2"
-          rules={[({ getFieldValue }) => PhoneItemFormatterValidation(getFieldValue, "ownr_ph2")]}
-        >
-          <FormItemPhone />
+        <Form.Item label={t("owners.fields.ownr_ph2")} style={{ marginBottom: 0 }}>
+          <div style={{ display: "flex", alignItems: "center", gap: "8px" }}>
+            <Form.Item
+              name="ownr_ph2"
+              noStyle
+              rules={[({ getFieldValue }) => PhoneItemFormatterValidation(getFieldValue, "ownr_ph2")]}
+            >
+              <Input style={{ flex: 1, minWidth: "150px" }} />
+            </Form.Item>
+            {isPhone2OptedOut && (
+              <Tooltip title={t("consent.text_body")}>
+                <CloseCircleFilled
+                  style={{
+                    color: "#ff4d4f",
+                    fontSize: 16,
+                    display: "flex",
+                    alignItems: "center",
+                    justifyContent: "center",
+                    height: "100%"
+                  }}
+                />
+              </Tooltip>
+            )}
+          </div>
        </Form.Item>
        <Form.Item label={t("owners.fields.preferred_contact")} name="preferred_contact">
          <Input />
--- a/client/src/components/owner-detail-form/owner-detail-form.container.jsx
+++ b/client/src/components/owner-detail-form/owner-detail-form.container.jsx
@@ -1,69 +1,115 @@
 import { Button, Form, Popconfirm } from "antd";
 import { PageHeader } from "@ant-design/pro-layout";
-
-import React, { useState } from "react";
+import { useEffect, useState } from "react";
 import { useNavigate } from "react-router-dom";
-import { useMutation } from "@apollo/client";
+import { useApolloClient, useMutation } from "@apollo/client";
 import { useTranslation } from "react-i18next";
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
 import { DELETE_OWNER, UPDATE_OWNER } from "../../graphql/owners.queries";
+import { selectBodyshop } from "../../redux/user/user.selectors"; // Adjust path
+import { phoneNumberOptOutService } from "../../utils/phoneOptOutService.js"; // Adjust path
 import OwnerDetailFormComponent from "./owner-detail-form.component";
 import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
+import { phone } from "phone"; // Import phone utility for formatting

-function OwnerDetailFormContainer({ owner, refetch }) {
+// Connect to Redux to access bodyshop
+const mapStateToProps = createStructuredSelector({
+  bodyshop: selectBodyshop
+});
+
+function OwnerDetailFormContainer({ owner, refetch, bodyshop }) {
  const { t } = useTranslation();
  const [form] = Form.useForm();
-  const history = useNavigate();
+  const navigate = useNavigate();
  const [loading, setLoading] = useState(false);
+  const [optedOutPhones, setOptedOutPhones] = useState(new Set());
  const [updateOwner] = useMutation(UPDATE_OWNER);
  const [deleteOwner] = useMutation(DELETE_OWNER);
  const notification = useNotification();
+  const apolloClient = useApolloClient();
+
+  // Fetch opt-out status on mount
+  useEffect(() => {
+    const fetchOptOutStatus = async () => {
+      if (bodyshop?.id && bodyshop?.messagingservicesid && (owner?.ownr_ph1 || owner?.ownr_ph2)) {
+        const phoneNumbers = [owner.ownr_ph1, owner.ownr_ph2].filter(Boolean);
+        const optOutSet = await phoneNumberOptOutService(apolloClient, bodyshop.id, phoneNumbers);
+        setOptedOutPhones(optOutSet);
+      } else {
+        setOptedOutPhones(new Set());
+      }
+    };
+
+    fetchOptOutStatus();
+  }, [apolloClient, bodyshop?.id, bodyshop?.messagingservicesid, owner?.ownr_ph1, owner?.ownr_ph2]);
+
+  // Reset form fields when owner changes
+  useEffect(() => {
+    form.setFieldsValue({
+      ownr_ph1: owner?.ownr_ph1,
+      ownr_ph2: owner?.ownr_ph2,
+      ...owner
+    });
+  }, [owner, form]);

  const handleDelete = async () => {
    setLoading(true);
-    const result = await deleteOwner({
-      variables: { id: owner.id }
-    });
-    console.log(result);
-    if (result.errors) {
-      notification["error"]({
+    try {
+      const result = await deleteOwner({
+        variables: { id: owner.id }
+      });
+      if (result.errors) {
+        notification.error({
+          message: t("owners.errors.deleting", {
+            error: JSON.stringify(result.errors)
+          })
+        });
+      } else {
+        notification.success({
+          message: t("owners.successes.delete")
+        });
+        navigate(`/manage/owners`);
+      }
+    } catch (error) {
+      notification.error({
        message: t("owners.errors.deleting", {
-          error: JSON.stringify(result.errors)
+          error: error.message
        })
      });
+    } finally {
      setLoading(false);
-    } else {
-      notification["success"]({
-        message: t("owners.successes.delete")
-      });
-      setLoading(false);
-      history(`/manage/owners`);
    }
  };

  const handleFinish = async (values) => {
    setLoading(true);
-    const result = await updateOwner({
-      variables: { ownerId: owner.id, owner: values }
-    });
-
-    if (!!result.errors) {
-      notification["error"]({
+    try {
+      const result = await updateOwner({
+        variables: { ownerId: owner.id, owner: values }
+      });
+      if (result.errors) {
+        notification.error({
+          message: t("owners.errors.saving", {
+            error: JSON.stringify(result.errors)
+          })
+        });
+      } else {
+        notification.success({
+          message: t("owners.successes.save")
+        });
+        if (refetch) await refetch();
+        form.resetFields();
+      }
+    } catch (error) {
+      notification.error({
        message: t("owners.errors.saving", {
-          error: JSON.stringify(result.errors)
+          error: error.message
        })
      });
+    } finally {
      setLoading(false);
-      return;
    }
-
-    notification["success"]({
-      message: t("owners.successes.save")
-    });
-
-    if (refetch) await refetch();
-    form.resetFields();
-    form.resetFields();
-    setLoading(false);
  };

  return (
@@ -72,6 +118,7 @@ function OwnerDetailFormContainer({ owner, refetch }) {
        title={t("menus.header.owners")}
        extra={[
          <Popconfirm
+            key="delete"
            trigger="click"
            onConfirm={handleDelete}
            disabled={owner.jobs.length !== 0}
@@ -81,16 +128,29 @@ function OwnerDetailFormContainer({ owner, refetch }) {
              {t("general.actions.delete")}
            </Button>
          </Popconfirm>,
-          <Button type="primary" loading={loading} onClick={() => form.submit()}>
+          <Button key="save" type="primary" loading={loading} onClick={() => form.submit()}>
            {t("general.actions.save")}
          </Button>
        ]}
      />
      <Form form={form} onFinish={handleFinish} autoComplete="off" layout="vertical" initialValues={owner}>
-        <OwnerDetailFormComponent loading={loading} form={form} />
+        <OwnerDetailFormComponent
+          loading={loading}
+          form={form}
+          isPhone1OptedOut={
+            bodyshop?.messagingservicesid &&
+            owner?.ownr_ph1 &&
+            optedOutPhones.has(phone(owner.ownr_ph1, "CA").phoneNumber?.replace(/^\+1/, ""))
+          }
+          isPhone2OptedOut={
+            bodyshop?.messagingservicesid &&
+            owner?.ownr_ph2 &&
+            optedOutPhones.has(phone(owner.ownr_ph2, "CA").phoneNumber?.replace(/^\+1/, ""))
+          }
+        />
      </Form>
    </>
  );
 }

-export default OwnerDetailFormContainer;
+export default connect(mapStateToProps)(OwnerDetailFormContainer);
--- a/client/src/components/parts-order-backorder-eta/parts-order-backorder-eta.component.jsx
+++ b/client/src/components/parts-order-backorder-eta/parts-order-backorder-eta.component.jsx
@@ -75,7 +75,7 @@ export function PartsOrderBackorderEta({
  );

  return (
-    <Popover destroyTooltipOnHide content={popContent} open={visibility} disabled={disabled}>
+    <Popover destroyOnHidden content={popContent} open={visibility} disabled={disabled}>
      <DateFormatter>{backordered_eta}</DateFormatter>
      {isAlreadyBackordered && <CalendarFilled style={{ cursor: "pointer" }} onClick={handlePopover} />}
      {loading && <Spin />}
--- a/client/src/components/parts-order-line-backorder-button/parts-order-line-backorder-button.component.jsx
+++ b/client/src/components/parts-order-line-backorder-button/parts-order-line-backorder-button.component.jsx
@@ -84,7 +84,7 @@ export function PartsOrderLineBackorderButton({ partsOrderStatus, partsLineId, j
  );

  return (
-    <Popover destroyTooltipOnHide content={popContent} open={visibility} disabled={disabled}>
+    <Popover destroyOnHidden content={popContent} open={visibility} disabled={disabled}>
      <Button loading={loading} onClick={handlePopover}>
        {isAlreadyBackordered ? t("parts_orders.actions.receive") : t("parts_orders.actions.backordered")}
      </Button>
--- 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/phone-number-consent/phone-number-consent.component.jsx
+++ b/client/src/components/phone-number-consent/phone-number-consent.component.jsx
@@ -0,0 +1,146 @@
+import { useQuery } from "@apollo/client";
+import { Input, Table, Typography } from "antd";
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { selectBodyshop, selectCurrentUser } from "../../redux/user/user.selectors";
+import { GET_PHONE_NUMBER_OPT_OUTS } from "../../graphql/phone-number-opt-out.queries";
+import { TimeAgoFormatter } from "../../utils/DateFormatter";
+import ChatOpenButton from "../chat-open-button/chat-open-button.component";
+import { useTranslation } from "react-i18next";
+import { useState } from "react";
+
+const { Paragraph } = Typography;
+
+// Commented out Associated Owners section for now
+//import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
+//import { Link } from "react-router-dom";
+//import { useMemo, useState } from "react";
+
+const mapStateToProps = createStructuredSelector({
+  bodyshop: selectBodyshop,
+  currentUser: selectCurrentUser
+});
+
+const mapDispatchToProps = () => ({});
+
+function PhoneNumberConsentList({ bodyshop, currentUser }) {
+  const { t } = useTranslation();
+  const [search, setSearch] = useState("");
+
+  // Fetch opt-out phone numbers
+  const { loading: optOutLoading, data: optOutData } = useQuery(GET_PHONE_NUMBER_OPT_OUTS, {
+    variables: { bodyshopid: bodyshop.id, search: search ? `%${search}%` : undefined },
+    fetchPolicy: "network-only"
+  });
+
+  // Commented out Associated Owners section for now
+  /*// Prepare phone numbers for owner query
+  const phoneNumbers = useMemo(() => {
+    return optOutData?.phone_number_opt_out?.map((item) => item.phone_number) || [];
+  }, [optOutData?.phone_number_opt_out]);
+  const allPhoneNumbers = useMemo(() => {
+    const normalized = phoneNumbers;
+    const withPlusOne = phoneNumbers.map((num) => `+1${num}`);
+    return [...normalized, ...withPlusOne].filter(Boolean);
+  }, [phoneNumbers]);
+
+  // Fetch owners for all phone numbers
+  const { loading: ownersLoading, data: ownersData } = useQuery(SEARCH_OWNERS_BY_PHONE_NUMBERS, {
+    variables: { bodyshopid: bodyshop.id, phone_numbers: allPhoneNumbers },
+    skip: allPhoneNumbers.length === 0 || !bodyshop.id,
+    fetchPolicy: "network-only"
+  });
+
+  // Map phone numbers to their associated owners and identify phone field
+  const getAssociatedOwners = (phoneNumber) => {
+    if (!ownersData?.owners) return [];
+    const normalizedPhone = phoneNumber.replace(/^\+1/, "");
+    return ownersData.owners
+      .filter(
+        (owner) =>
+          owner.ownr_ph1 === phoneNumber ||
+          owner.ownr_ph2 === phoneNumber ||
+          owner.ownr_ph1 === normalizedPhone ||
+          owner.ownr_ph2 === normalizedPhone ||
+          owner.ownr_ph1 === `+1${phoneNumber}` ||
+          owner.ownr_ph2 === `+1${phoneNumber}`
+      )
+      .map((owner) => ({
+        ...owner,
+        phoneField:
+          [owner.ownr_ph1, owner.ownr_ph2].includes(phoneNumber) ||
+          [owner.ownr_ph1, owner.ownr_ph2].includes(normalizedPhone) ||
+          [owner.ownr_ph1, owner.ownr_ph2].includes(`+1${phoneNumber}`)
+            ? owner.ownr_ph1 === phoneNumber ||
+              owner.ownr_ph1 === normalizedPhone ||
+              owner.ownr_ph1 === `+1${phoneNumber}`
+              ? t("consent.phone_1")
+              : t("consent.phone_2")
+            : null
+      }));
+  };*/
+
+  const columns = [
+    {
+      title: t("consent.phone_number"),
+      dataIndex: "phone_number",
+      render: (text) => <ChatOpenButton phone={text} />,
+      sorter: (a, b) => a.phone_number.localeCompare(b.phone_number)
+    },
+    // Commented out Associated Owners section for now
+    /*{
+      title: t("consent.associated_owners"),
+      dataIndex: "phone_number",
+      render: (phoneNumber) => {
+        const owners = getAssociatedOwners(phoneNumber);
+        if (!owners || owners.length === 0) {
+          return t("consent.no_owners");
+        }
+        return owners.map((owner) => (
+          <div key={owner.id}>
+            <Space direction="horizontal">
+              <Link to={"/manage/owners/" + owner.id}>
+                <OwnerNameDisplay ownerObject={owner} />
+              </Link>
+              ({owner.phoneField})
+            </Space>
+          </div>
+        ));
+      },
+      sorter: (a, b) => {
+        const aOwners = getAssociatedOwners(a.phone_number);
+        const bOwners = getAssociatedOwners(b.phone_number);
+        const aName = aOwners[0] ? `${aOwners[0].ownr_fn} ${aOwners[0].ownr_ln}` : "";
+        const bName = bOwners[0] ? `${bOwners[0].ownr_fn} ${bOwners[0].ownr_ln}` : "";
+        return aName.localeCompare(bName);
+      }
+    },*/
+    {
+      title: t("consent.created_at"),
+      dataIndex: "created_at",
+      render: (text) => <TimeAgoFormatter>{text}</TimeAgoFormatter>,
+      sorter: (a, b) => new Date(a.created_at) - new Date(b.created_at)
+    }
+  ];
+
+  return (
+    <div>
+      <Paragraph>{t("consent.text_body")}</Paragraph>
+      <Input.Search
+        placeholder={t("general.labels.search")}
+        onSearch={(value) => setSearch(value)}
+        style={{ marginBottom: 16 }}
+      />
+
+      <Table
+        columns={columns}
+        dataSource={optOutData?.phone_number_opt_out}
+        loading={optOutLoading /* || ownersLoading*/}
+        rowKey="id"
+        style={{ marginTop: 16 }}
+      />
+    </div>
+  );
+}
+
+export default connect(mapStateToProps, mapDispatchToProps)(PhoneNumberConsentList);
--- 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/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")}>
-    <Row gutter={[16, 16]}>
+  <Card title={t("production.settings.information")} style={{ maxWidth: "100%", overflowX: "auto" }}>
+    <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,16 @@
 import { Card, Col, Form, Radio, Row } from "antd";
-import React from "react";
 import PropTypes from "prop-types";
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { selectBodyshop } from "../../../redux/user/user.selectors";
+import { HasFeatureAccess } from "../../feature-wrapper/feature-wrapper.component";

-const LayoutSettings = ({ t }) => (
-  <Card title={t("production.settings.layout")}>
+const mapStateToProps = createStructuredSelector({
+  bodyshop: selectBodyshop
+});
+
+const LayoutSettings = ({ t, bodyshop }) => (
+  <Card title={t("production.settings.layout")} style={{ maxWidth: "100%", overflowX: "auto" }}>
    <Row gutter={[16, 16]}>
      {[
        {
@@ -31,14 +38,18 @@ const LayoutSettings = ({ t }) => (
            { value: false, label: t("production.labels.wide") }
          ]
        },
-        {
-          name: "cardcolor",
-          label: t("production.labels.cardcolor"),
-          options: [
-            { value: true, label: t("production.labels.on") },
-            { value: false, label: t("production.labels.off") }
-          ]
-        },
+        ...(HasFeatureAccess({ bodyshop, featureName: "smartscheduling" })
+          ? [
+              {
+                name: "cardcolor",
+                label: t("production.labels.cardcolor"),
+                options: [
+                  { value: true, label: t("production.labels.on") },
+                  { value: false, label: t("production.labels.off") }
+                ]
+              }
+            ]
+          : []),
        {
          name: "kiosk",
          label: t("production.labels.kiosk_mode"),
@@ -48,9 +59,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}
@@ -68,4 +79,4 @@ LayoutSettings.propTypes = {
  t: PropTypes.func.isRequired
 };

-export default LayoutSettings;
+export default connect(mapStateToProps)(LayoutSettings);
--- 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 { isFunction } from "lodash";
-import { useNotification } from "../../../contexts/Notifications/notificationContext.jsx";
-import { SettingOutlined } from "@ant-design/icons";
+import InformationSettings from "./InformationSettings.jsx";
+import LayoutSettings from "./LayoutSettings.jsx";
+import StatisticsSettings from "./StatisticsSettings.jsx";

 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/Board.jsx
+++ b/client/src/components/production-board-kanban/trello-board/controllers/Board.jsx
@@ -20,7 +20,7 @@ const Board = ({ id, className, orientation, cardSettings, ...additionalProps })
      default:
        return cardSizesVertical.small;
    }
-  }, [cardSettings]);
+  }, [cardSettings?.cardSize]);

  return (
    <>
--- 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,24 +100,67 @@ 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;

+      // Validate drag type and source
+      if (type !== "lane" || !source) {
+        // Invalid drag type or missing source, attempt to revert if possible
+        if (source) {
+          dispatch(
+            actions.moveCardAcrossLanes({
+              fromLaneId: source.droppableId,
+              toLaneId: source.droppableId,
+              cardId: draggableId,
+              index: source.index
+            })
+          );
+        }
+        setIsProcessing(false);
+        try {
+          await onDragEnd({ draggableId, type, source, reason, mode, destination, combine });
+        } catch (err) {
+          console.error("Error in onLaneDrag for invalid drag type or source", err);
+        }
+        return;
+      }
+
+      setDragTime(source.droppableId);
      setIsProcessing(true);

-      dispatch(
-        actions.moveCardAcrossLanes({
-          fromLaneId: source.droppableId,
-          toLaneId: destination.droppableId,
-          cardId: draggableId,
-          index: destination.index
-        })
-      );
+      // Handle valid drop to a different lane or position
+      if (destination && !isEqual(source, destination)) {
+        dispatch(
+          actions.moveCardAcrossLanes({
+            fromLaneId: source.droppableId,
+            toLaneId: destination.droppableId,
+            cardId: draggableId,
+            index: destination.index
+          })
+        );
+      } else {
+        // Same-lane drop or no destination, revert to original position
+        dispatch(
+          actions.moveCardAcrossLanes({
+            fromLaneId: source.droppableId,
+            toLaneId: source.droppableId,
+            cardId: draggableId,
+            index: source.index
+          })
+        );
+      }

      try {
        await onDragEnd({ draggableId, type, source, reason, mode, destination, combine });
      } catch (err) {
        console.error("Error in onLaneDrag", err);
+        // Ensure revert on error
+        dispatch(
+          actions.moveCardAcrossLanes({
+            fromLaneId: source.droppableId,
+            toLaneId: source.droppableId,
+            cardId: draggableId,
+            index: source.index
+          })
+        );
      } finally {
        setIsProcessing(false);
      }
--- 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,21 +120,22 @@ 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
        },
        itemContent: (index, item) => <ItemWrapper>{renderDraggable(index, item)}</ItemWrapper>,
-        overscan: { main: 10, reverse: 10 }
+        overscan: { main: 10, reverse: 10 },
+        // Ensure a minimum height for empty lanes to allow dropping
+        style: renderedCards.length === 0 ? { minHeight: "5px" } : {}
      };

      const horizontalProps = {
@@ -142,7 +143,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
@@ -151,8 +151,6 @@ const Lane = ({

      const componentProps = orientation === "vertical" ? verticalProps : horizontalProps;

-      // If the lane is collapsed, we want to render a div instead of the virtualized list, and we want to set the height to the max height of the lane so that
-      // the lane doesn't shrink when collapsed (in horizontal mode)
      const finalComponentProps = collapsed
        ? orientation === "horizontal"
          ? {
@@ -163,9 +161,8 @@ const Lane = ({
          : {}
        : componentProps;

-      // If the lane is horizontal and collapsed, we want to render a placeholder so that the lane doesn't shrink to 0 height and grows when
-      // a card is dragged over it
-      const shouldRenderPlaceholder = orientation !== "horizontal" && (collapsed || renderedCards.length === 0);
+      // Always render placeholder for empty lanes in vertical mode to ensure droppable area
+      const shouldRenderPlaceholder = orientation === "vertical" ? collapsed || renderedCards.length === 0 : collapsed;

      return (
        <HeightMemoryWrapper
@@ -180,13 +177,14 @@ const Lane = ({
          override={orientation !== "horizontal" && (collapsed || !renderedCards.length)}
        >
          <div
-            {...provided.droppableProps}
-            ref={provided.innerRef}
+            ref={laneRef}
+            style={{ height: "100%", width: "100%" }}
            className={`react-trello-lane ${collapsed ? "lane-collapsed" : ""}`}
-            style={{ ...provided.droppableProps.style }}
          >
-            <FinalComponent {...finalComponentProps} />
-            {shouldRenderPlaceholder && provided.placeholder}
+            <div {...provided.droppableProps} ref={provided.innerRef} style={{ ...provided.droppableProps.style }}>
+              <FinalComponent {...finalComponentProps} />
+              {shouldRenderPlaceholder && provided.placeholder}
+            </div>
          </div>
        </HeightMemoryWrapper>
      );
--- a/client/src/components/production-list-columns/production-list-columns.empassignment.component.jsx
+++ b/client/src/components/production-list-columns/production-list-columns.empassignment.component.jsx
@@ -140,7 +140,7 @@ export function ProductionListEmpAssignment({ insertAuditTrail, bodyshop, record
  if (record[type]) theEmployee = bodyshop.employees.find((e) => e.id === record[type]);

  return (
-    <Popover destroyTooltipOnHide content={popContent} open={visibility}>
+    <Popover destroyOnHidden content={popContent} open={visibility}>
      <Spin spinning={loading}>
        {record[type] ? (
          <div>
--- a/client/src/components/report-center-modal/report-center-modal.component.jsx
+++ b/client/src/components/report-center-modal/report-center-modal.component.jsx
@@ -6,6 +6,7 @@ import React, { 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, QUERY_ACTIVE_EMPLOYEES_WITH_EMAIL } from "../../graphql/employees.queries";
 import { QUERY_ALL_VENDORS } from "../../graphql/vendors.queries";
 import { selectReportCenter } from "../../redux/modals/modals.selectors";
@@ -18,11 +19,10 @@ import EmployeeSearchSelectEmail from "../employee-search-select/employee-search
 import EmployeeSearchSelect from "../employee-search-select/employee-search-select.component";
 import BlurWrapperComponent from "../feature-wrapper/blur-wrapper.component";
 import { HasFeatureAccess } from "../feature-wrapper/feature-wrapper.component";
+import LockWrapperComponent from "../lock-wrapper/lock-wrapper.component";
 import VendorSearchSelect from "../vendor-search-select/vendor-search-select.component";
 import ReportCenterModalFiltersSortersComponent from "./report-center-modal-filters-sorters-component";
 import "./report-center-modal.styles.scss";
-import LockWrapperComponent from "../lock-wrapper/lock-wrapper.component";
-import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";

 const mapStateToProps = createStructuredSelector({
  reportCenterModal: selectReportCenter,
@@ -389,5 +389,7 @@ const restrictedReports = [
  { key: "job_costing_ro_date_detail", days: 183 },
  { key: "job_costing_ro_estimator", days: 183 },
  { key: "job_lifecycle_date_detail", days: 183 },
-  { key: "job_lifecycle_date_summary", days: 183 }
+  { key: "job_lifecycle_date_summary", days: 183 },
+  { key: "customer_list", days: 183 },
+  { key: "customer_list_excel", days: 183 }
 ];
--- 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.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.consent.component.jsx
+++ b/client/src/components/shop-info/shop-info.consent.component.jsx
@@ -0,0 +1,25 @@
+import { Typography } from "antd";
+import { useTranslation } from "react-i18next";
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { selectBodyshop } from "../../redux/user/user.selectors";
+import PhoneNumberConsentList from "../phone-number-consent/phone-number-consent.component";
+
+const mapStateToProps = createStructuredSelector({
+  bodyshop: selectBodyshop
+});
+
+const mapDispatchToProps = (dispatch) => ({});
+
+function ShopInfoConsentComponent({ bodyshop }) {
+  const { t } = useTranslation();
+
+  return (
+    <div>
+      <Typography.Title level={4}>{t("settings.title")}</Typography.Title>
+      {<PhoneNumberConsentList bodyshop={bodyshop} />}
+    </div>
+  );
+}
+
+export default connect(mapStateToProps, mapDispatchToProps)(ShopInfoConsentComponent);
--- 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-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-calculator/time-ticket-calculator.component.jsx
+++ b/client/src/components/time-ticket-calculator/time-ticket-calculator.component.jsx
@@ -107,7 +107,7 @@ export default function TimeTicketCalculatorComponent({
      open={visible}
      onOpenChange={handleOpenChange}
      placement="right"
-      destroyTooltipOnHide
+      destroyOnHidden
    >
      <Button onClick={(e) => e.preventDefault()}>
        <Space>
--- 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.container.jsx
+++ b/client/src/components/time-ticket-modal/time-ticket-modal.container.jsx
@@ -181,7 +181,7 @@ export function TimeTicketModalContainer({ timeTicketModal, toggleModalVisible,
          )}
        </Space>
      }
-      destroyOnClose
+      destroyOnHidden
      id="time-ticket-modal"
    >
      <Form
--- 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/graphql/bodyshop.queries.js
+++ b/client/src/graphql/bodyshop.queries.js
@@ -141,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
@@ -271,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
@@ -310,7 +312,6 @@ export const QUERY_INTAKE_CHECKLIST = gql`
      intakechecklist
      status
      owner {
-        allow_text_message
        id
      }
      labhrs: joblines_aggregate(where: { _and: [{ mod_lbr_ty: { _neq: "LAR" } }, { removed: { _eq: false } }] }) {
--- a/client/src/graphql/conversations.queries.js
+++ b/client/src/graphql/conversations.queries.js
@@ -43,6 +43,7 @@ export const CONVERSATION_SUBSCRIPTION_BY_PK = gql`
      id
      status
      text
+      is_system
      isoutbound
      image
      image_path
@@ -77,6 +78,7 @@ export const GET_CONVERSATION_DETAILS = gql`
        id
        status
        text
+        is_system
        isoutbound
        image
        image_path
--- 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
@@ -870,7 +874,6 @@ export const QUERY_JOB_CARD_DETAILS = gql`
      }
      owner {
        id
-        allow_text_message
        preferred_contact
        tax_number
      }
@@ -927,6 +930,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 +1080,8 @@ export const UPDATE_JOB = gql`
        date_repairstarted
        date_void
        date_lost_sale
+        estimate_sent_approval
+        estimate_approved
      }
    }
  }
@@ -2063,7 +2070,6 @@ export const QUERY_JOB_CHECKLISTS = gql`
      production_vars
      owner {
        id
-        allow_text_message
      }
      bodyshop {
        id
@@ -2420,7 +2426,6 @@ export const QUERY_PARTS_QUEUE_CARD_DETAILS = gql`
      ownr_ph2
      owner {
        id
-        allow_text_message
        preferred_contact
        tax_number
      }
@@ -2429,6 +2434,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
--- a/client/src/graphql/owners.queries.js
+++ b/client/src/graphql/owners.queries.js
@@ -49,7 +49,6 @@ export const QUERY_OWNER_BY_ID = gql`
    owners_by_pk(id: $id) {
      id
      accountingid
-      allow_text_message
      ownr_addr1
      ownr_addr2
      ownr_co_nm
@@ -104,7 +103,6 @@ export const QUERY_ALL_OWNERS = gql`
  query QUERY_ALL_OWNERS {
    owners {
      id
-      allow_text_message
      created_at
      ownr_addr1
      ownr_addr2
@@ -129,7 +127,6 @@ export const QUERY_ALL_OWNERS_PAGINATED = gql`
  query QUERY_ALL_OWNERS_PAGINATED($search: String, $offset: Int, $limit: Int, $order: [owners_order_by!]!) {
    search_owners(args: { search: $search }, offset: $offset, limit: $limit, order_by: $order) {
      id
-      allow_text_message
      created_at
      ownr_addr1
      ownr_addr2
--- a/client/src/graphql/phone-number-opt-out.queries.js
+++ b/client/src/graphql/phone-number-opt-out.queries.js
@@ -0,0 +1,64 @@
+import { gql } from "@apollo/client";
+
+export const GET_PHONE_NUMBER_OPT_OUT = gql`
+  query GET_PHONE_NUMBER_OPT_OUT($bodyshopid: uuid!, $phone_number: String!) {
+    phone_number_opt_out(where: { bodyshopid: { _eq: $bodyshopid }, phone_number: { _eq: $phone_number } }) {
+      id
+      bodyshopid
+      phone_number
+      created_at
+      updated_at
+    }
+  }
+`;
+
+export const GET_PHONE_NUMBER_OPT_OUTS = gql`
+  query GET_PHONE_NUMBER_OPT_OUTS($bodyshopid: uuid!, $search: String) {
+    phone_number_opt_out(
+      where: { bodyshopid: { _eq: $bodyshopid }, phone_number: { _ilike: $search } }
+      order_by: [{ phone_number: asc }, { updated_at: desc }]
+    ) {
+      id
+      bodyshopid
+      phone_number
+      created_at
+      updated_at
+    }
+  }
+`;
+
+export const GET_PHONE_NUMBER_OPT_OUTS_BY_NUMBERS = gql`
+  query GET_PHONE_NUMBER_OPT_OUTS_BY_NUMBERS($bodyshopid: uuid!, $phone_numbers: [String!]) {
+    phone_number_opt_out(
+      where: { bodyshopid: { _eq: $bodyshopid }, phone_number: { _in: $phone_numbers } }
+    ) {
+      id
+      bodyshopid
+      phone_number
+      created_at
+      updated_at
+    }
+  }
+`;
+
+export const SEARCH_OWNERS_BY_PHONE_NUMBERS = gql`
+  query SEARCH_OWNERS_BY_PHONE_NUMBERS($bodyshopid: uuid!, $phone_numbers: [String!]) {
+    owners(
+      where: {
+        shopid: { _eq: $bodyshopid },
+        _or: [
+          { ownr_ph1: { _in: $phone_numbers } },
+          { ownr_ph2: { _in: $phone_numbers } }
+        ]
+      }
+    ) {
+      id
+      ownr_fn
+      ownr_ln
+      ownr_co_nm
+      ownr_ph1
+      ownr_ph2
+      __typename
+    }
+  }
+`;
--- 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-create/jobs-create.container.jsx
+++ b/client/src/pages/jobs-create/jobs-create.container.jsx
@@ -114,7 +114,6 @@ function JobsCreateContainer({ bodyshop, setBreadcrumbs, setSelectedHeader }) {
    if (!!!job.ownerid) {
      ownerData = job.owner.data;
      ownerData.shopid = bodyshop.id;
-      delete ownerData.allow_text_message;
      delete ownerData.preferred_contact;
      delete job.ownerid;
    } else {
--- 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,7 +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 { selectBodyshop, selectInstanceConflict } from "../../redux/user/user.selectors";
 import UpdateAlert from "../../components/update-alert/update-alert.component";
 import InstanceRenderManager from "../../utils/instanceRenderMgr.js";
@@ -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({
-      imex: "IABVNO4scRKY11XBQkNr",
-      rome: "mQdqARMzkZRUVugJ6TdS"
-    });
-    window.noticeable.render("widget", widgetId);
-    requestForToken().catch((error) => {
-      console.error(`Unable to request for token.`, error);
+    window.Canny("initChangelog", {
+      appID: "680bd2c7ee501290377f6686",
+      position: "top",
+      align: "left",
+      theme: "light" // options: light [default], dark, auto
    });
  }, []);

@@ -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" }} />
-            </div>
+              <Button icon={<AlertOutlined />} data-canny-changelog type="text">
+                {t("general.labels.changelog")}
+              </Button>
+            </Space>
            <Link to="/disclaimer" target="_blank" style={{ color: "#ccc" }}>
              Disclaimer & Notices
            </Link>
--- a/client/src/pages/shop/shop.page.component.jsx
+++ b/client/src/pages/shop/shop.page.component.jsx
@@ -10,10 +10,10 @@ import ShopCsiConfig from "../../components/shop-csi-config/shop-csi-config.comp
 import ShopEmployeesContainer from "../../components/shop-employees/shop-employees.container";
 import ShopInfoContainer from "../../components/shop-info/shop-info.container";
 import ShopInfoUsersComponent from "../../components/shop-users/shop-users.component";
+import ShopInfoConsentComponent from "../../components/shop-info/shop-info.consent.component";
 import { setBreadcrumbs, setSelectedHeader } from "../../redux/application/application.actions";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import InstanceRenderManager from "../../utils/instanceRenderMgr";
-
 import { HasFeatureAccess } from "../../components/feature-wrapper/feature-wrapper.component";
 import ShopTeamsContainer from "../../components/shop-teams/shop-teams.container";

@@ -91,6 +91,16 @@ export function ShopPage({ bodyshop, setSelectedHeader, setBreadcrumbs }) {
      children: <ShopCsiConfig />
    });
  }
+
+  if (bodyshop.messagingservicesid) {
+    // Add Consent Settings tab
+    items.push({
+      key: "consent",
+      label: t("bodyshop.labels.consent_settings"),
+      children: <ShopInfoConsentComponent bodyshop={bodyshop} />
+    });
+  }
+  
  return (
    <RbacWrapper action="shop:config">
      <Tabs activeKey={search.tab} onChange={(key) => history({ search: `?tab=${key}` })} items={items} />
--- a/client/src/redux/user/user.reducer.js
+++ b/client/src/redux/user/user.reducer.js
@@ -105,7 +105,6 @@ const userReducer = (state = INITIAL_STATE, action) => {
          ...action.payload //Spread current user details in.
        }
      };
-
    case UserActionTypes.SET_SHOP_DETAILS:
      return {
        ...state,
@@ -126,6 +125,7 @@ const userReducer = (state = INITIAL_STATE, action) => {
        ...state,
        imexshopid: action.payload
      };
+
    default:
      return state;
  }
--- a/client/src/redux/user/user.sagas.js
+++ b/client/src/redux/user/user.sagas.js
@@ -9,7 +9,7 @@ import {
 } from "@firebase/auth";
 import { arrayUnion, doc, getDoc, setDoc, updateDoc } from "@firebase/firestore";
 import { getToken } from "@firebase/messaging";
-import * as Sentry from "@sentry/browser";
+import * as Sentry from "@sentry/react";
 import { notification } from "antd";
 import axios from "axios";
 import i18next from "i18next";
@@ -335,20 +335,12 @@ export function* SetAuthLevelFromShopDetails({ payload }) {
    }

    try {
-      InstanceRenderManager({
-        executeFunction: true,
-        args: [],
-        imex: () => {
-          window.$crisp.push(["set", "user:company", [payload.shopname]]);
-          window.$crisp.push(["set", "session:segments", [[`region:${payload.region_config}`]]]);
-          if (authRecord[0] && authRecord[0].user.validemail) {
-            window.$crisp.push(["set", "user:email", [authRecord[0].user.email]]);
-          }
-        },
-        rome: () => {
-          window.$zoho.salesiq.visitor.info({ "Shop Name": payload.shopname });
-        }
-      });
+      window.$crisp.push(["set", "user:company", [payload.shopname]]);
+      window.$crisp.push(["set", "session:segments", [[`region:${payload.region_config}`]]]);
+      if (authRecord[0] && authRecord[0].user.validemail) {
+        window.$crisp.push(["set", "user:email", [authRecord[0].user.email]]);
+      }
+
      payload.features?.allAccess === true
        ? window.$crisp.push(["set", "session:segments", [["allAccess"]]])
        : (() => {
@@ -359,6 +351,14 @@ export function* SetAuthLevelFromShopDetails({ payload }) {
            );
            window.$crisp.push(["set", "session:segments", [["basic", ...featureKeys]]]);
          })();
+
+      InstanceRenderManager({
+        executeFunction: true,
+        args: [],
+        rome: () => {
+          window.$zoho.salesiq.visitor.info({ "Shop Name": payload.shopname });
+        }
+      });
    } 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",
@@ -648,9 +648,15 @@
        "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": {
+        "consent_settings": "Phone Number Opt-Out List",
        "2tiername": "Name => RO",
        "2tiersetup": "2 Tier Setup",
        "2tiersource": "Source => RO",
@@ -728,7 +734,10 @@
        "ssbuckets": "Job Size Definitions",
        "systemsettings": "System Settings",
        "task-presets": "Task Presets",
-        "workingdays": "Working Days"
+        "workingdays": "Working Days",
+        "notifications": {
+          "followers": "Notifications"
+        }
      },
      "operations": {
        "contains": "Contains",
@@ -766,7 +775,6 @@
      },
      "labels": {
        "addtoproduction": "Add Job to Production?",
-        "allow_text_message": "Permission to Text?",
        "checklist": "Checklist",
        "printpack": "Job Intake Print Pack",
        "removefromproduction": "Remove Job from Production?"
@@ -1236,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",
@@ -1245,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",
@@ -1323,9 +1333,9 @@
        "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?",
-        "submit-for-testing": "Submitted Job for testing successfully."
+        "unsavedchangespopup": "You have unsaved changes. Are you sure you want to leave?"
      },
      "validation": {
        "dateRangeExceeded": "The date range has been exceeded.",
@@ -1636,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",
@@ -1761,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",
@@ -1943,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).",
@@ -2015,9 +2031,10 @@
          "stands": "Stands",
          "waived": "Waived"
        },
-        "deleteconfirm": "Are you sure you want to delete this Job? This cannot be undone. ",
+        "deleteconfirm": "Are you sure you want to delete this Job? This cannot be undone.",
        "deletedelivery": "Delete Delivery Checklist",
        "deleteintake": "Delete Intake Checklist",
+        "deletewatchers": "Remove Watchers before deleting this Job.",
        "deliverchecklist": "Deliver Checklist",
        "difference": "Difference",
        "diskscan": "Scan Disk for Estimates",
@@ -2285,8 +2302,10 @@
        "productionlist": "Production Board - List",
        "readyjobs": "Ready Jobs",
        "recent": "Recent Items",
+        "remoteassist": "Remote Assist",
        "reportcenter": "Report Center",
-        "rescueme": "Rescue me!",
+        "rescueme": "Rescue Me!",
+        "rescuemezoho": "Remote Me In!",
        "schedule": "Schedule",
        "scoreboard": "Scoreboard",
        "search": {
@@ -2317,8 +2336,8 @@
        "duplicate": "Duplicate this Job",
        "duplicatenolines": "Duplicate this Job without Repair Data",
        "newcccontract": "Create Courtesy Car Contract",
-        "void": "Void Job",
-        "submit-for-testing": "Submit for Testing"
+        "submit-for-testing": "Submit for Testing",
+        "void": "Void Job"
      },
      "jobsdetail": {
        "claimdetail": "Claim Details",
@@ -2361,7 +2380,8 @@
      "errors": {
        "invalidphone": "The phone number is invalid.  Unable to open conversation. ",
        "noattachedjobs": "No Jobs have been associated to this conversation. ",
-        "updatinglabel": "Error updating label. {{error}}"
+        "updatinglabel": "Error updating label. {{error}}",
+        "no_consent": "This phone number has opted-out of Messaging."
      },
      "labels": {
        "addlabel": "Add a label to this conversation.",
@@ -2377,7 +2397,8 @@
        "selectmedia": "Select Media",
        "sentby": "Sent by {{by}} at {{time}}",
        "typeamessage": "Send a message...",
-        "unarchive": "Unarchive"
+        "unarchive": "Unarchive",
+        "no_consent": "Opted-out"
      },
      "render": {
        "conversation_list": "Conversation List"
@@ -2424,6 +2445,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."
@@ -2442,7 +2523,6 @@
      "fields": {
        "accountingid": "Accounting ID",
        "address": "Address",
-        "allow_text_message": "Permission to Text?",
        "name": "Name",
        "note": "Owner Note",
        "ownr_addr1": "Address",
@@ -3023,6 +3103,7 @@
        "credits_not_received_date_vendorid": "Credits not Received by Vendor",
        "csi": "CSI Responses",
        "customer_list": "Customer List",
+        "customer_list_excel": "Customer List - Excel",
        "cycle_time_analysis": "Cycle Time Analysis",
        "estimates_written_converted": "Estimates Written/Converted",
        "estimator_detail": "Jobs by Estimator (Detail)",
@@ -3420,6 +3501,7 @@
        "dashboard": "Dashboard",
        "dms": "DMS Export",
        "export-logs": "Export Logs",
+        "feature-request": "Feature Requet",
        "inventory": "Inventory",
        "jobs": "Jobs",
        "jobs-active": "Active Jobs",
@@ -3464,6 +3546,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}}",
@@ -3681,10 +3764,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/invalid-email": "A user with this email does not exist."
+          "auth/wrong-password": "The email and password combination you provided is incorrect."
        }
      }
    },
@@ -3785,59 +3868,17 @@
        "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"
-      }
+    "consent": {
+      "phone_number": "Phone Number",
+      "associated_owners": "Associated Owners",
+      "created_at": "Opt-Out Date",
+      "no_owners": "No Associated Owners",
+      "phone_1": "Phone 1",
+      "phone_2": "Phone 2",
+      "text_body": "Users can opt out of receiving SMS messages by replying with keywords such as STOP, UNSUBSCRIBE, CANCEL, END, QUIT, STOPALL, REVOKE and OPTOUT. To opt back in, users can reply with START, YES, or UNSTOP. Even after opting out, users can still send messages to us, which will be received and processed as needed. Ensure customers are informed to reply with these keywords to manage their messaging preferences. After opting out, users receive a confirmation message and will not receive further messages until they opt back in."
+    },
+    "settings": {
+      "title": "Phone Number Opt-Out List"
    }
  }
 }
--- 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": "",
@@ -648,9 +648,15 @@
        "use_paint_scale_data": "",
        "uselocalmediaserver": "",
        "website": "",
-        "zip_post": ""
+        "zip_post": "",
+        "notifications": {
+          "description": "",
+          "placeholder": "",
+          "invalid_followers": ""
+        }
      },
      "labels": {
+        "consent_settings": "",
        "2tiername": "",
        "2tiersetup": "",
        "2tiersource": "",
@@ -728,7 +734,10 @@
        "ssbuckets": "",
        "systemsettings": "",
        "task-presets": "",
-        "workingdays": ""
+        "workingdays": "",
+        "notifications": {
+          "followers": ""
+        }
      },
      "operations": {
        "contains": "",
@@ -766,7 +775,6 @@
      },
      "labels": {
        "addtoproduction": "",
-        "allow_text_message": "",
        "checklist": "",
        "printpack": "",
        "removefromproduction": ""
@@ -1236,6 +1244,7 @@
        "areyousure": "",
        "barcode": "código de barras",
        "cancel": "",
+        "changelog": "",
        "clear": "",
        "confirmpassword": "",
        "created_at": "",
@@ -1245,6 +1254,7 @@
        "errors": "",
        "excel": "",
        "exceptiontitle": "",
+        "feature-request": "",
        "friday": "",
        "globalsearch": "",
        "help": "",
@@ -1323,9 +1333,9 @@
        "notfoundtitle": "",
        "partnernotrunning": "",
        "rbacunauth": "",
+        "submit-for-testing": "",
        "unsavedchanges": "Usted tiene cambios no guardados.",
-        "unsavedchangespopup": "",
-        "submit-for-testing": ""
+        "unsavedchangespopup": ""
      },
      "validation": {
        "dateRangeExceeded": "",
@@ -1632,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": "",
@@ -1761,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",
@@ -1943,6 +1957,8 @@
        "scheddates": ""
      },
      "labels": {
+        "sent": "",
+        "approved": "",
        "accountsreceivable": "",
        "act_price_ppc": "",
        "actual_completion_inferred": "",
@@ -2018,6 +2034,7 @@
        "deleteconfirm": "",
        "deletedelivery": "",
        "deleteintake": "",
+        "deletewatchers": "",
        "deliverchecklist": "",
        "difference": "",
        "diskscan": "",
@@ -2285,8 +2302,10 @@
        "productionlist": "",
        "readyjobs": "",
        "recent": "",
+        "remoteassist": "",
        "reportcenter": "",
        "rescueme": "",
+        "rescuemezoho": "",
        "schedule": "Programar",
        "scoreboard": "",
        "search": {
@@ -2317,8 +2336,8 @@
        "duplicate": "",
        "duplicatenolines": "",
        "newcccontract": "",
-        "void": "",
-        "submit-for-testing": ""
+        "submit-for-testing": "",
+        "void": ""
      },
      "jobsdetail": {
        "claimdetail": "Detalles de la reclamación",
@@ -2361,7 +2380,8 @@
      "errors": {
        "invalidphone": "",
        "noattachedjobs": "",
-        "updatinglabel": ""
+        "updatinglabel": "",
+        "no_consent": ""
      },
      "labels": {
        "addlabel": "",
@@ -2377,7 +2397,8 @@
        "selectmedia": "",
        "sentby": "",
        "typeamessage": "Enviar un mensaje...",
-        "unarchive": ""
+        "unarchive": "",
+        "no_consent": ""
      },
      "render": {
        "conversation_list": ""
@@ -2424,6 +2445,68 @@
        "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": "",
+        "not-employee-notifications": ""
+      }
+    },
    "owner": {
      "labels": {
        "noownerinfo": ""
@@ -2442,7 +2525,6 @@
      "fields": {
        "accountingid": "",
        "address": "Dirección",
-        "allow_text_message": "Permiso de texto?",
        "name": "Nombre",
        "note": "",
        "ownr_addr1": "Dirección",
@@ -3023,6 +3105,7 @@
        "credits_not_received_date_vendorid": "",
        "csi": "",
        "customer_list": "",
+        "customer_list_excel": "",
        "cycle_time_analysis": "",
        "estimates_written_converted": "",
        "estimator_detail": "",
@@ -3420,6 +3503,7 @@
        "dashboard": "",
        "dms": "",
        "export-logs": "",
+        "feature-request": "",
        "inventory": "",
        "jobs": "",
        "jobs-active": "",
@@ -3464,6 +3548,7 @@
      "dashboard": "",
      "dms": "",
      "export-logs": "",
+      "feature-request": "",
      "imexonline": "",
      "inventory": "",
      "jobs": "Todos los trabajos | {{app}}",
@@ -3681,10 +3766,10 @@
    "users": {
      "errors": {
        "signinerror": {
+          "auth/invalid-email": "",
          "auth/user-disabled": "",
          "auth/user-not-found": "",
-          "auth/wrong-password": "",
-          "auth/invalid-email": ""
+          "auth/wrong-password": ""
        }
      }
    },
@@ -3785,59 +3870,17 @@
        "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": ""
-      }
+    "consent": {
+      "phone_number": "",
+      "associated_owners": "",
+      "created_at": "",
+      "no_owners": "",
+      "phone_1": "",
+      "phone_2": "",
+      "text_body": ""
+    },
+    "settings": {
+      "title": ""
    }
  }
 }
--- 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": "",
@@ -648,9 +648,15 @@
        "use_paint_scale_data": "",
        "uselocalmediaserver": "",
        "website": "",
-        "zip_post": ""
+        "zip_post": "",
+        "notifications": {
+          "description": "",
+          "placeholder": "",
+          "invalid_followers": ""
+        }
      },
      "labels": {
+        "consent_settings": "",
        "2tiername": "",
        "2tiersetup": "",
        "2tiersource": "",
@@ -728,7 +734,10 @@
        "ssbuckets": "",
        "systemsettings": "",
        "task-presets": "",
-        "workingdays": ""
+        "workingdays": "",
+        "notifications": {
+          "followers": ""
+        }
      },
      "operations": {
        "contains": "",
@@ -766,7 +775,6 @@
      },
      "labels": {
        "addtoproduction": "",
-        "allow_text_message": "",
        "checklist": "",
        "printpack": "",
        "removefromproduction": ""
@@ -1236,6 +1244,7 @@
        "areyousure": "",
        "barcode": "code à barre",
        "cancel": "",
+        "changelog": "",
        "clear": "",
        "confirmpassword": "",
        "created_at": "",
@@ -1245,6 +1254,7 @@
        "errors": "",
        "excel": "",
        "exceptiontitle": "",
+        "feature-request": "",
        "friday": "",
        "globalsearch": "",
        "help": "",
@@ -1323,10 +1333,9 @@
        "notfoundtitle": "",
        "partnernotrunning": "",
        "rbacunauth": "",
+        "submit-for-testing": "",
        "unsavedchanges": "Vous avez des changements non enregistrés.",
-        "unsavedchangespopup": "",
-        "submit-for-testing": ""
-
+        "unsavedchangespopup": ""
      },
      "validation": {
        "dateRangeExceeded": "",
@@ -1633,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": "",
@@ -1762,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",
@@ -1944,6 +1957,8 @@
        "scheddates": ""
      },
      "labels": {
+        "sent": "",
+        "approved": "",
        "accountsreceivable": "",
        "act_price_ppc": "",
        "actual_completion_inferred": "",
@@ -2019,6 +2034,7 @@
        "deleteconfirm": "",
        "deletedelivery": "",
        "deleteintake": "",
+        "deletewatchers": "",
        "deliverchecklist": "",
        "difference": "",
        "diskscan": "",
@@ -2286,8 +2302,10 @@
        "productionlist": "",
        "readyjobs": "",
        "recent": "",
+        "remoteassist": "",
        "reportcenter": "",
        "rescueme": "",
+        "rescuemezoho": "",
        "schedule": "Programme",
        "scoreboard": "",
        "search": {
@@ -2318,8 +2336,8 @@
        "duplicate": "",
        "duplicatenolines": "",
        "newcccontract": "",
-        "void": "",
-        "submit-for-testing": ""
+        "submit-for-testing": "",
+        "void": ""
      },
      "jobsdetail": {
        "claimdetail": "Détails de la réclamation",
@@ -2362,7 +2380,8 @@
      "errors": {
        "invalidphone": "",
        "noattachedjobs": "",
-        "updatinglabel": ""
+        "updatinglabel": "",
+        "no_consent": ""
      },
      "labels": {
        "addlabel": "",
@@ -2378,7 +2397,8 @@
        "selectmedia": "",
        "sentby": "",
        "typeamessage": "Envoyer un message...",
-        "unarchive": ""
+        "unarchive": "",
+        "no_consent": ""
      },
      "render": {
        "conversation_list": ""
@@ -2425,6 +2445,68 @@
        "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": "",
+        "not-employee-notifications": ""
+      }
+    },
    "owner": {
      "labels": {
        "noownerinfo": ""
@@ -2443,7 +2525,6 @@
      "fields": {
        "accountingid": "",
        "address": "Adresse",
-        "allow_text_message": "Autorisation de texte?",
        "name": "Prénom",
        "note": "",
        "ownr_addr1": "Adresse",
@@ -3024,6 +3105,7 @@
        "credits_not_received_date_vendorid": "",
        "csi": "",
        "customer_list": "",
+        "customer_list_excel": "",
        "cycle_time_analysis": "",
        "estimates_written_converted": "",
        "estimator_detail": "",
@@ -3421,6 +3503,7 @@
        "dashboard": "",
        "dms": "",
        "export-logs": "",
+        "feature-request": "",
        "inventory": "",
        "jobs": "",
        "jobs-active": "",
@@ -3465,6 +3548,7 @@
      "dashboard": "",
      "dms": "",
      "export-logs": "",
+      "feature-request": "",
      "imexonline": "",
      "inventory": "",
      "jobs": "Tous les emplois | {{app}}",
@@ -3682,10 +3766,10 @@
    "users": {
      "errors": {
        "signinerror": {
+          "auth/invalid-email": "",
          "auth/user-disabled": "",
          "auth/user-not-found": "",
-          "auth/wrong-password": "",
-          "auth/invalid-email": ""
+          "auth/wrong-password": ""
        }
      }
    },
@@ -3786,59 +3870,17 @@
        "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": ""
-      }
+    "consent": {
+      "phone_number": "Phone Number",
+      "associated_owners": "Associated Owners",
+      "created_at": "Opt-Out Date",
+      "no_owners": "No Associated Owners",
+      "phone_1": "Phone 1",
+      "phone_2": "Phone 2",
+      "text_body": ""
+    },
+    "settings": {
+      "title": ""
    }
  }
 }
--- a/client/src/utils/DateFormatter.jsx
+++ b/client/src/utils/DateFormatter.jsx
@@ -1,6 +1,5 @@
 import { Tooltip } from "antd";
 import dayjs from "../utils/day";
-import React from "react";

 export function DateFormatter(props) {
  return props.children ? dayjs(props.children).format(props.includeDay ? "ddd MM/DD/YYYY" : "MM/DD/YYYY") : null;
--- a/client/src/utils/RegisterSw.js
+++ b/client/src/utils/RegisterSw.js
@@ -14,10 +14,7 @@ const onServiceWorkerUpdate = (registration) => {
      <Button
        onClick={async () => {
          window.open(
-            InstanceRenderManager({
-              imex: "https://imex-online.noticeable.news/",
-              rome: "https://rome-online.noticeable.news/"
-            }),
+            `https://shopmanagement.canny.io/changelog`,
            "_blank"
          );
        }}
--- a/client/src/utils/TemplateConstants.js
+++ b/client/src/utils/TemplateConstants.js
@@ -2004,6 +2004,18 @@ export const TemplateList = (type, context) => {
            },
            group: "customers"
          },
+          customer_list_excel: {
+            title: i18n.t("reportcenter.templates.customer_list_excel"),
+            subject: i18n.t("reportcenter.templates.customer_list_excel"),
+            key: "customer_list_excel",
+            reporttype: "excel",
+            disabled: false,
+            rangeFilter: {
+              object: i18n.t("reportcenter.labels.objects.jobs"),
+              field: i18n.t("jobs.fields.date_invoiced")
+            },
+            group: "customers"
+          },
          exported_gsr_by_ro: {
            title: i18n.t("reportcenter.templates.exported_gsr_by_ro"),
            subject: i18n.t("reportcenter.templates.exported_gsr_by_ro"),
@@ -2241,7 +2253,7 @@ export const TemplateList = (type, context) => {
              field: i18n.t("bills.fields.date")
            },
            group: "purchases"
-          },
+          }
        }
      : {}),
    ...(!type || type === "courtesycarcontract"
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Dave Richer	e2c5a4cba4	feature/IO-3182-Phone-Number-Consent - Checkpoint	2025-05-30 14:14:05 -04:00
Dave Richer	a0566e76ab	feature/IO-3182-Phone-Number-Consent - Checkpoint	2025-05-29 13:49:56 -04:00
Dave Richer	909a21023a	feature/IO-3182-Phone-Number-Consent - Checkpoint	2025-05-28 14:01:24 -04:00
Dave Richer	94bdc6c43f	feature/IO-3182-Phone-Number-Consent - Checkpoint	2025-05-28 13:45:12 -04:00
Dave Richer	9466d36e69	feature/IO-3182-Phone-Number-Consent - Checkpoint	2025-05-28 13:17:21 -04:00
Dave Richer	412efb06e5	feature/IO-3182-Phone-Number-Consent - Checkpoint	2025-05-28 13:07:11 -04:00
Dave Richer	da7e637183	feature/IO-3182-Phone-Number-Consent - Checkpoint	2025-05-28 12:26:48 -04:00
Dave Richer	2e95fa25af	feature/IO-3182-Phone-Number-Consent - Checkpoint	2025-05-28 12:17:43 -04:00
Dave Richer	f6c63bbd74	Merged in feature/IO-3182-Phone-Number-Consent (pull request #2351 ) feature/IO-3182-Phone-Number-Consent - Checkpoint	2025-05-27 15:43:03 +00:00
Dave Richer	0a654082c2	feature/IO-3182-Phone-Number-Consent - Checkpoint	2025-05-27 11:41:31 -04:00
Dave Richer	2c20b731d2	Merged in feature/IO-3182-Phone-Number-Consent (pull request #2350 ) Feature/IO-3182 Phone Number Consent	2025-05-27 15:38:56 +00:00
Dave Richer	8a22897cdd	feature/IO-3182-Phone-Number-Consent - Checkpoint	2025-05-27 11:35:16 -04:00
Dave Richer	677da61b52	Merge remote-tracking branch 'origin/release/2025-06-02' into feature/IO-3182-Phone-Number-Consent	2025-05-27 11:34:44 -04:00
Dave Richer	6513434bd7	feature/IO-3182-Phone-Number-Consent - Checkpoint	2025-05-27 11:34:16 -04:00
Dave Richer	fe2600029f	feature/IO-3182-Phone-Number-Consent - Checkpoint	2025-05-27 11:03:09 -04:00
Allan Carr	c5b4efedfb	Merged in feature/IO-3249-Delete-Job-Watchers (pull request #2348 ) IO-3249 Delete Job Watchers Approved-by: Dave Richer	2025-05-26 20:28:56 +00:00
Allan Carr	310321d0ab	IO-3249 Delete Job Watchers Signed-off-by: Allan Carr <allan@imexsystems.ca>	2025-05-26 12:49:58 -07:00
Allan Carr	7e884c42ea	Merged in feature/IO-3214-Extend-New-Fields-to-Audit-Log (pull request #2346 ) IO-3214 Extend New Fields to Audit Log Approved-by: Dave Richer	2025-05-26 19:10:16 +00:00
Allan Carr	e279bf41a4	IO-3214 Extend New Fields to Audit Log Signed-off-by: Allan Carr <allan@imexsystems.ca>	2025-05-26 12:11:26 -07:00
Dave Richer	4a060ab51c	Merged in feature/IO-3182-Phone-Number-Consent (pull request #2345 ) Feature/IO-3182 Phone Number Consent	2025-05-26 19:08:47 +00:00
Dave Richer	62c1c77a18	feature/IO-3182-Phone-Number-Consent - Finish core functionality	2025-05-26 15:07:57 -04:00
Dave Richer	db19ecb28c	feature/IO-3182-Phone-Number-Consent - Front/Back Start/stop logic complete	2025-05-26 14:49:02 -04:00
Dave Richer	51748ce28d	feature/IO-3182-Phone-Number-Consent - Front/Back Start/stop logic complete	2025-05-26 14:44:27 -04:00
Allan Carr	4bbfd8a9da	Merged in feature/IO-3247-Quick-Deliver-Require-Delivery (pull request #2343 ) IO-3247 Quick Deliver Require Delivery Approved-by: Dave Richer	2025-05-26 17:37:36 +00:00
Allan Carr	d4d2db2cac	IO-3247 Quick Deliver Require Delivery Signed-off-by: Allan Carr <allan@imexsystems.ca>	2025-05-26 10:29:03 -07:00
Dave Richer	23483144e1	Merged in feature/IO-3182-Phone-Number-Consent (pull request #2341 ) feature/IO-3182-Phone-Number-Consent - Up Deps	2025-05-26 17:09:48 +00:00
Dave Richer	67d5dcb062	feature/IO-3182-Phone-Number-Consent - Up Deps	2025-05-26 13:09:07 -04:00
Allan Carr	901a49e571	Merged in feature/IO-3246-Remote-Assist (pull request #2337 ) IO-3246 Remote Assist Approved-by: Dave Richer	2025-05-24 17:29:38 +00:00
Dave Richer	49ae107fde	release/2025-06-02 - add phone	2025-05-24 13:23:38 -04:00
Dave Richer	0135281bcd	release/2025-06-02 - test push	2025-05-24 13:15:53 -04:00
Allan Carr	99cf95daf0	IO-3246 Remote Assist Signed-off-by: Allan Carr <allan@imexsystems.ca>	2025-05-23 16:45:24 -07:00
Allan Carr	8c1758ae49	Merged in feature/IO-3075-Crisp-Basic-Info (pull request #2335 ) IO-3075 Crisp Basic Info Approved-by: Dave Richer	2025-05-23 18:03:15 +00:00
Allan Carr	2d764921ff	IO-3075 Crisp Basic Info Signed-off-by: Allan Carr <allan@imexsystems.ca>	2025-05-23 10:43:15 -07:00
Dave Richer	4859239f55	Merged in feature/IO-3242-Visual-Production-Board-Vertical-Drag-Bug (pull request #2332 ) feature/IO-3242-Visual-Production-Board-Vertical-Drag-Bug - Fix bug	2025-05-23 15:01:44 +00:00
Dave Richer	5c64d7185e	feature/IO-3242-Visual-Production-Board-Vertical-Drag-Bug - Fix bug	2025-05-23 11:00:21 -04:00
Patrick Fic	152479bc08	Merged in feature/IO-3239-integration-logging (pull request #2331 ) Feature/IO-3239 integration logging	2025-05-22 18:56:05 +00:00
Patrick Fic	2c508cf1a1	IO-3239 QBO Logging and integration log schema changes.	2025-05-22 11:54:17 -07:00
Patrick Fic	16a91c772a	Merged in release/2025-06-02 (pull request #2330 ) Release/2025 06 02	2025-05-22 16:46:27 +00:00
Dave Richer	5c47088b11	release/2025-06-02 - Lint Updates	2025-05-22 11:37:47 -04:00
Allan Carr	8e5dc4fa71	Merged in feature/IO-3243-Job-Costing-TOW (pull request #2327 ) IO-3243 Job Costing TOW Approved-by: Dave Richer	2025-05-22 15:13:34 +00:00
Allan Carr	39c3729f6d	Merged in feature/IO-3230-Customer-List-Excel (pull request #2326 ) IO-3230 Customer List Excel Approved-by: Dave Richer	2025-05-22 15:13:03 +00:00
Allan Carr	e3d854e02b	IO-3243 Job Costing TOW Signed-off-by: Allan Carr <allan@imexsystems.ca>	2025-05-21 17:53:33 -07:00
Allan Carr	618acf2acf	IO-3230 Customer List Excel Signed-off-by: Allan Carr <allan.carr@thinkimex.com>	2025-05-21 16:28:09 -07:00
Dave Richer	2cf2b70293	Merged in feature/IO-3182-Phone-Number-Consent (pull request #2325 ) Feature/IO-3182 Phone Number Consent	2025-05-21 19:17:52 +00:00
Dave Richer	0541afceb8	feature/IO-3182-Phone-Number-Consent - Checkpoint	2025-05-21 15:17:11 -04:00
Dave Richer	28ed3f9936	Merged in feature/IO-3182-Phone-Number-Consent (pull request #2324 ) DO NOT MERGE JUST USING TO UNDO	2025-05-21 19:03:58 +00:00
Dave Richer	6afa50332b	feature/IO-3182-Phone-Number-Consent - Checkpoint	2025-05-21 15:03:02 -04:00
Dave Richer	8c8c68867d	feature/IO-3182-Phone-Number-Consent - Checkpoint	2025-05-21 14:39:17 -04:00
Dave Richer	8ee52598e8	feature/IO-3182-Phone-Number-Consent - Checkpoint	2025-05-21 14:32:35 -04:00
Allan Carr	c822028174	Merged in feature/IO-3235-FeatureAccess-VisualBoard-Color (pull request #2322 ) IO-3235 FeatureAccess on VisualBoard for SmartSchedule Option of Color Cards Approved-by: Dave Richer	2025-05-21 18:06:04 +00:00
Allan Carr	36b82c6195	Merged in feature/IO-3236-HasFeatureAccess-Date (pull request #2323 ) IO-3236 HasFeatureAccess Date Approved-by: Dave Richer	2025-05-21 18:05:23 +00:00
Allan Carr	079dffce4d	IO-3236 HasFeatureAccess Date Signed-off-by: Allan Carr <allan.carr@thinkimex.com>	2025-05-20 17:16:27 -07:00
Allan Carr	831802f5af	IO-3235 FeatureAccess on VisualBoard for SmartSchedule Option of Color Cards Signed-off-by: Allan Carr <allan.carr@thinkimex.com>	2025-05-20 15:25:29 -07:00
Dave Richer	7bd5190bf2	feature/IO-3182-Phone-Number-Consent - Checkpoint	2025-05-20 18:19:39 -04:00
Dave Richer	83860152a9	feature/IO-3182-Phone-Number-Consent - Checkpoint	2025-05-20 16:04:36 -04:00
Dave Richer	1e10493615	Merged in feature/IO-3182-Phone-Number-Consent (pull request #2321 ) Feature/IO-3182 Phone Number Consent	2025-05-20 17:45:24 +00:00
Dave Richer	9d81c68a4d	feature/IO-3182-Phone-Number-Consent - Checkpoint	2025-05-20 13:14:05 -04:00
Dave Richer	985d066978	feature/IO-3182-Phone-Number-Consent - Finish Database changes	2025-05-20 12:49:32 -04:00
Dave Richer	6ad9e27d1d	feature/IO-3182-Phone-Number-Consent - Merge master / bump deps	2025-05-20 12:38:31 -04:00
Dave Richer	19ebdda5b3	Merge remote-tracking branch 'origin/master-AIO' into feature/IO-3182-Phone-Number-Consent	2025-05-20 12:30:15 -04:00
Allan Carr	4602dd1183	Merged in master-AIO (pull request #2320 ) IO-3217 OTSL Labor Type	2025-05-19 21:03:00 +00:00
Allan Carr	6005eaee6a	Merged in feature/IO-3217-OTSL-Labor-Type (pull request #2319 ) IO-3217 OTSL Labor Type	2025-05-19 21:02:01 +00:00
Patrick Fic	6d59e3994f	Merged in feature/IO-3105-qbo-version-update (pull request #2318 ) feature/IO-3105-qbo-version-update Approved-by: Patrick Fic	2025-05-19 19:30:34 +00:00
Patrick Fic	f770b2f1b1	IO-3105 Add QBO Minor Version.	2025-05-19 12:28:50 -07:00
Patrick Fic	b014744940	IO-3239 Add integration log statements on QBO.	2025-05-19 11:10:02 -07:00
Dave Richer	714c90c25e	Merge remote-tracking branch 'origin/master-AIO' into feature/IO-3182-Phone-Number-Consent	2025-05-15 18:55:23 -04:00
Dave Richer	9a3a971da6	Clear Stage	2025-05-15 18:55:20 -04:00
Dave Richer	96cba0aaab	Clear Stage	2025-05-15 18:54:55 -04:00
Patrick Fic	c069600cfd	Merged in hotfix/2025-05-15 (pull request #2317 ) Hotfix/2025 05 15 IO-3217 IO-3066 IO-3210 IO-2328	2025-05-15 22:47:26 +00:00
Patrick Fic	186cbf2c97	Merge branch 'feature/IO-3066-ems-upload' into hotfix/2025-05-15	2025-05-15 15:47:04 -07:00
Patrick Fic	392988ae11	Io-3066 resolve typo.	2025-05-15 15:46:45 -07:00
Allan Carr	2e33b79eb9	Merged in feature/IO-3210-Podium-Datapump (pull request #2315 ) IO-3210 Podium Datapump Approved-by: Patrick Fic	2025-05-15 22:39:39 +00:00
Allan Carr	d4f718c44c	Merged in feature/IO-3210-Podium-Datapump (pull request #2314 ) IO-3210 Podium Datapump Approved-by: Patrick Fic	2025-05-15 22:39:28 +00:00
Patrick Fic	fa99ef7b37	Merge branch 'feature/IO-3066-ems-upload' into hotfix/2025-05-15	2025-05-15 15:36:44 -07:00
Patrick Fic	c4aff1b516	Merge branch 'feature/IO-2328-intellipay-querystring-package' into hotfix/2025-05-15	2025-05-15 15:36:31 -07:00
Patrick Fic	61276bb2d1	IO-2328 change querystring versions.	2025-05-15 15:35:56 -07:00
Allan Carr	8b89e2eb9d	IO-3210 Podium Datapump Signed-off-by: Allan Carr <allan.carr@thinkimex.com>	2025-05-15 15:27:59 -07:00
Patrick Fic	9ab41308e7	IO-3066 add EMS upload functionality.	2025-05-15 12:53:41 -07:00
Allan Carr	f76052ec9b	Merge branch 'master-AIO' into feature/IO-3210-Podium-Datapump Signed-off-by: Allan Carr <allan.carr@thinkimex.com>	2025-05-15 12:41:09 -07:00
Patrick Fic	b8841e3ded	Merged in release/2025-05-09 (pull request #2312 ) IO-3190 Add nulll coalesce and check for non-intake events. Approved-by: Patrick Fic	2025-05-15 00:57:44 +00:00
Patrick Fic	a49b3f6496	IO-3190 Add nulll coalesce and check for non-intake events.	2025-05-14 17:56:15 -07:00
Dave Richer	3e17ec3cf8	Merged in release/2025-05-09 (pull request #2310 ) [DO NOT MERGE ] Release/2025-05-09 into master-AIO	2025-05-14 20:10:07 +00:00
Dave Richer	76c0c7c41e	release/2025-05-09 - Bump Deps	2025-05-13 10:43:15 -04:00
Dave Richer	025b986f60	Merged in feature/IO-3228-Notifications-1.6-and-Deprecations (pull request #2308 ) feature/IO-3228-Notifications-1.6-and-Deprecations	2025-05-09 14:39:59 +00:00
Dave Richer	6e6addd62f	feature/IO-3228-Notifications-1.6-and-Deprecations - See Ticket for full details (Notifications restrictions, AntD deprecations)	2025-05-09 10:38:19 -04:00
Dave Richer	266c3acf34	Merged in feature/IO-3214-Job-Status-Card-Extension (pull request #2306 ) feature/IO-3214-Job-Status-Card-Extension - PR Notes/Package Updates	2025-05-08 15:27:53 +00:00
Dave Richer	c4631f50e5	feature/IO-3214-Job-Status-Card-Extension - PR Notes/Package Updates	2025-05-08 11:25:44 -04:00
Dave Richer	ca18291425	Merged in feature/IO-3214-Job-Status-Card-Extension (pull request #2304 ) feature/IO-3214-Job-Status-Card-Extension - Complete	2025-05-06 21:10:52 +00:00
Dave Richer	110fad2abc	feature/IO-3214-Job-Status-Card-Extension - Complete	2025-05-06 17:08:46 -04:00
Dave Richer	b7456cecd4	release/2025-05-09 - Restore GraphQL Dep	2025-05-06 14:55:18 -04:00
Dave Richer	84db1fe81b	Merged in feature/IO-3225-Notifications-1.5 (pull request #2300 ) Feature/IO-3225 Notifications 1.5 into Release/2025-05-09	2025-05-06 18:20:20 +00:00
Dave Richer	b539111be8	feature/IO-3225-Notifications-1.5: Final Refactoring / Optimization	2025-05-06 14:19:22 -04:00
Dave Richer	8a8bc5a6ed	feature/IO-3225-Notifications-1.5: Final Refactoring / Optimization	2025-05-06 13:53:40 -04:00
Dave Richer	020db91105	feature/IO-3225-Notifications-1.5: checkpoint	2025-05-06 13:38:42 -04:00
Dave Richer	1dd28af752	feature/IO-3225-Notifications-1.5: Package Updates / Maintenance	2025-05-06 12:58:21 -04:00
Dave Richer	5ba192eee0	feature/IO-3225-Notifications-1.5: Finish	2025-05-05 17:06:23 -04:00
Dave Richer	8109a12898	feature/IO-3225-Notifications-1.5: DB Changes	2025-05-05 15:02:44 -04:00
Dave Richer	2deb7fd520	feature/IO-3225-Notifications-1.5: DB Changes	2025-05-05 13:57:25 -04:00
Dave Richer	f6cd136679	feature/IO-3225-Notifications-1.5: Packages	2025-05-05 13:16:57 -04:00
Dave Richer	e50cb86296	release/2025-04-25 - Update DD, trying again	2025-05-02 13:45:14 -04:00
Dave Richer	a5a01c44fa	release/2025-04-25 - Remove DD	2025-04-30 14:07:01 -04:00
Dave Richer	947e0705e4	release/2025-04-25 - Update/Restore DD for test purposes.4	2025-04-30 11:37:21 -04:00
Dave Richer	aa8a6a837d	release/2025-04-25: remove body-parser reference from pay-all.js	2025-04-30 11:30:25 -04:00
Dave Richer	5db440fc9c	release/2025-04-25: remove body-parser reference from misc routes	2025-04-30 11:28:15 -04:00
Dave Richer	c299b9376a	release/2025-04-25: revert body parser, remove DD	2025-04-30 10:26:38 -04:00
Dave Richer	e5d530ea3e	release/2025-04-25: Update Backend Packages	2025-04-28 17:15:13 -04:00
Dave Richer	6da9850946	release/2025-04-25: Update Sentry	2025-04-28 13:03:02 -04:00
Dave Richer	f62609f60c	release/2025-04-25: revert body parser to discrete package	2025-04-28 12:58:27 -04:00
Dave Richer	b2d8c66e5b	release/2025-04-25: clean	2025-04-28 12:17:40 -04:00
Dave Richer	3c4ed3ba0c	release/2025-04-25: Patch Updates to packages	2025-04-26 12:16:46 -04:00
Dave Richer	2e7f827c3f	release/2025-04-25: Patch Updates to packages	2025-04-26 11:18:39 -04:00
Patrick Fic	dc82b39dc8	Remove crisp status reporter.	2025-04-25 20:27:07 -07:00
Dave Richer	a9814c1eb1	Merged in release/2025-04-25 (pull request #2287 ) Release/2025-04-25 into Master-AIO - IO-2282, IO-3066, IO-3164, IO-3187, IO-3190, IO-3200, IO-3210, IO-3212, IO-3213, IO-3215, IO-3220, IO-3223	2025-04-26 00:43:22 +00:00
Patrick Fic	bdb741caf8	Merged in feature/IO-3223-canny (pull request #2288 ) IO-3223 Add Canny for feature request and change log. Approved-by: Dave Richer	2025-04-25 21:12:43 +00:00
Dave Richer	f50b198c21	feature/IO-3223-canny - Small syntactic update	2025-04-25 17:12:18 -04:00
Dave Richer	3495326de3	feature/IO-3223-canny - Merge release / fix conflicts	2025-04-25 17:06:44 -04:00
Patrick Fic	b5973085e7	IO-3223 Add Canny for feature request and change log.	2025-04-25 14:02:40 -07:00
Dave Richer	8687214420	release/2025-04-25 - update handleInvoiceBasedPayment.test.js	2025-04-25 11:58:47 -04:00
Dave Richer	d61b89a1e5	release/2025-04-25 - Add logging around handleInvoiceBasePayment paymentResponse, toned logs down. fixed issue in paymentResponseResults	2025-04-25 11:54:36 -04:00
Allan Carr	468b42abd2	Merged in feature/IO-3220-VPB-Popup (pull request #2284 ) IO-3220 VPB Board Settings Popup Approved-by: Dave Richer	2025-04-25 14:59:13 +00:00
Allan Carr	fc03e5f983	IO-3220 VPB Board Settings Popup Signed-off-by: Allan Carr <allan.carr@thinkimex.com>	2025-04-24 13:32:27 -07:00
Allan Carr	c4742e38ea	Merged in feature/IO-3213-Hit-and-Run-Toggle (pull request #2280 ) IO-3213 Hit and Run Toggle Approved-by: Dave Richer	2025-04-24 15:41:41 +00:00
Allan Carr	99e1adbe13	Merge branch 'release/2025-04-25' into feature/IO-3213-Hit-and-Run-Toggle Signed-off-by: Allan Carr <allan.carr@thinkimex.com> # Conflicts: # client/src/components/jobs-detail-general/jobs-detail-general.component.jsx	2025-04-24 08:42:32 -07:00
Allan Carr	eb5c797a43	Merged in feature/IO-3215-Employee-Assignment-Timeticket-Modal (pull request #2279 ) IO-3215 Employee Assignment Timeticket Modal Approved-by: Dave Richer	2025-04-24 15:34:42 +00:00
Allan Carr	0595c5545e	Merged in feature/IO-3212-ACV-Amount (pull request #2281 ) IO-3212 ACV Amount Approved-by: Dave Richer	2025-04-24 15:33:41 +00:00
Allan Carr	12c87ed689	IO-3217 OTSL Labor Type Signed-off-by: Allan Carr <allan.carr@thinkimex.com>	2025-04-23 18:48:35 -07:00
Allan Carr	55944257aa	IO-3212 ACV Amount Signed-off-by: Allan Carr <allan.carr@thinkimex.com>	2025-04-23 13:16:49 -07:00
Allan Carr	03241778fa	IO-3212 ACV Amount Signed-off-by: Allan Carr <allan.carr@thinkimex.com>	2025-04-23 13:10:42 -07:00
Allan Carr	555b81fb14	IO-3213 Hit and Run Toggle Signed-off-by: Allan Carr <allan.carr@thinkimex.com>	2025-04-23 12:04:29 -07:00