hotfix/IO-3170-Enhanced-GetRedisEndpointsFromAws - Fix AWS Redis Cache updates

client/.env.development.imex

@@ -9,6 +9,6 @@ VITE_APP_CLOUDINARY_THUMB_TRANSFORMATIONS=c_fill,h_250,w_250
 VITE_APP_FIREBASE_PUBLIC_VAPID_KEY='BG3tzU7L2BXlGZ_3VLK4PNaRceoEXEnmHfxcVbRMF5o5g05ejslhVPki9kBM9cBBT-08Ad9kN3HSpS6JmrWD6h4'
 VITE_APP_STRIPE_PUBLIC_KEY=pk_test_51GqB4TJl3nQjrZ0wCQWAxAhlNF8jKe0tipIa6ExBaxwJGitwvFsIZUEua4dUzaMIAuXp4qwYHXx7lgjyQSwP0Pe900vzm38C7g
 VITE_APP_AXIOS_BASE_API_URL=/api/
-VITE_APP_REPORTS_SERVER_URL=https://reports.test.imex.online
+VITE_APP_REPORTS_SERVER_URL=https://reports3.test.imex.online
 VITE_APP_SPLIT_API=ts615lqgnmk84thn72uk18uu5pgce6e0l4rc
 VITE_APP_INSTANCE=IMEX

client/.env.development.rome

@@ -10,7 +10,7 @@ VITE_APP_CLOUDINARY_THUMB_TRANSFORMATIONS=c_fill,h_250,w_250
 VITE_APP_FIREBASE_PUBLIC_VAPID_KEY='BP1B7ZTYpn-KMt6nOxlld6aS8Skt3Q7ZLEqP0hAvGHxG4UojPYiXZ6kPlzZkUC5jH-EcWXomTLtmadAIxurfcHo'
 VITE_APP_STRIPE_PUBLIC_KEY=pk_test_51GqB4TJl3nQjrZ0wCQWAxAhlNF8jKe0tipIa6ExBaxwJGitwvFsIZUEua4dUzaMIAuXp4qwYHXx7lgjyQSwP0Pe900vzm38C7g
 VITE_APP_AXIOS_BASE_API_URL=/api/
-VITE_APP_REPORTS_SERVER_URL=https://reports.test.romeonline.io
+VITE_APP_REPORTS_SERVER_URL=https://reports3.test.imex.online
 VITE_APP_SPLIT_API=ts615lqgnmk84thn72uk18uu5pgce6e0l4rc
 VITE_APP_COUNTRY=USA
 VITE_APP_INSTANCE=ROME

client/.env.test.imex

@@ -9,7 +9,7 @@ VITE_APP_CLOUDINARY_THUMB_TRANSFORMATIONS=c_fill,h_250,w_250
 VITE_APP_FIREBASE_PUBLIC_VAPID_KEY='BN2GcDPjipR5MTEosO5dT4CfQ3cmrdBIsI4juoOQrRijn_5aRiHlwj1mlq0W145mOusx6xynEKl_tvYJhpCc9lo'
 VITE_APP_STRIPE_PUBLIC_KEY=pk_test_51GqB4TJl3nQjrZ0wCQWAxAhlNF8jKe0tipIa6ExBaxwJGitwvFsIZUEua4dUzaMIAuXp4qwYHXx7lgjyQSwP0Pe900vzm38C7g
 VITE_APP_AXIOS_BASE_API_URL=https://api.test.imex.online/
-VITE_APP_REPORTS_SERVER_URL=https://reports.test.imex.online
+VITE_APP_REPORTS_SERVER_URL=https://reports3.test.imex.online
 VITE_APP_IS_TEST=true
 VITE_APP_SPLIT_API=ts615lqgnmk84thn72uk18uu5pgce6e0l4rc
 VITE_APP_INSTANCE=IMEX

client/package.json

@@ -8,27 +8,27 @@
   "private": true,
   "proxy": "http://localhost:4000",
   "dependencies": {
-    "@ant-design/pro-layout": "^7.22.3",
-    "@apollo/client": "^3.13.1",
+    "@ant-design/pro-layout": "^7.22.0",
+    "@apollo/client": "^3.12.6",
     "@emotion/is-prop-valid": "^1.3.1",
-    "@fingerprintjs/fingerprintjs": "^4.6.1",
+    "@fingerprintjs/fingerprintjs": "^4.5.1",
     "@jsreport/browser-client": "^3.1.0",
-    "@reduxjs/toolkit": "^2.6.0",
+    "@reduxjs/toolkit": "^2.5.0",
     "@sentry/cli": "^2.42.2",
     "@sentry/react": "^9.3.0",
-    "@sentry/vite-plugin": "^3.2.2",
+    "@sentry/vite-plugin": "^3.2.1",
     "@splitsoftware/splitio-react": "^1.13.0",
     "@tanem/react-nprogress": "^5.0.53",
     "@vitejs/plugin-react": "^4.3.4",
-    "antd": "^5.24.2",
+    "antd": "^5.23.1",
     "apollo-link-logger": "^2.0.1",
     "apollo-link-sentry": "^4.1.0",
     "autosize": "^6.0.1",
-    "axios": "^1.8.1",
+    "axios": "^1.7.9",
     "classnames": "^2.5.1",
     "css-box-model": "^1.2.1",
     "dayjs": "^1.11.13",
-    "dayjs-business-days2": "^1.3.0",
+    "dayjs-business-days2": "^1.2.3",
     "dinero.js": "^1.9.1",
     "dotenv": "^16.4.7",
     "env-cmd": "^10.1.0",
@@ -36,9 +36,9 @@
     "firebase": "^10.13.2",
     "graphql": "^16.10.0",
     "i18next": "^23.15.1",
-    "i18next-browser-languagedetector": "^8.0.4",
+    "i18next-browser-languagedetector": "^8.0.2",
     "immutability-helper": "^3.1.1",
-    "libphonenumber-js": "^1.12.4",
+    "libphonenumber-js": "^1.11.18",
     "logrocket": "^8.1.2",
     "markerjs2": "^2.32.3",
     "memoize-one": "^6.0.0",
@@ -48,7 +48,7 @@
     "query-string": "^9.1.1",
     "raf-schd": "^4.0.3",
     "react": "^18.3.1",
-    "react-big-calendar": "^1.18.0",
+    "react-big-calendar": "^1.17.1",
     "react-color": "^2.19.3",
     "react-cookie": "^7.2.2",
     "react-dom": "^18.3.1",
@@ -56,7 +56,7 @@
     "react-grid-gallery": "^1.0.1",
     "react-grid-layout": "1.3.4",
     "react-i18next": "^14.1.3",
-    "react-icons": "^5.5.0",
+    "react-icons": "^5.4.0",
     "react-image-lightbox": "^5.1.4",
     "react-markdown": "^9.0.3",
     "react-number-format": "^5.4.3",
@@ -64,9 +64,9 @@
     "react-product-fruits": "^2.2.61",
     "react-redux": "^9.2.0",
     "react-resizable": "^3.0.5",
-    "react-router-dom": "^6.30.0",
+    "react-router-dom": "^6.26.2",
     "react-sticky": "^6.0.3",
-    "react-virtuoso": "^4.12.5",
+    "react-virtuoso": "^4.10.4",
     "recharts": "^2.15.0",
     "redux": "^5.0.1",
     "redux-actions": "^3.0.3",
@@ -74,12 +74,12 @@
     "redux-saga": "^1.3.0",
     "redux-state-sync": "^3.1.4",
     "reselect": "^5.1.1",
-    "sass": "^1.85.1",
+    "sass": "^1.83.4",
     "socket.io-client": "^4.8.1",
-    "styled-components": "^6.1.15",
+    "styled-components": "^6.1.14",
     "subscriptions-transport-ws": "^0.11.0",
     "use-memo-one": "^1.1.3",
-    "userpilot": "^1.3.8",
+    "userpilot": "^1.3.6",
     "vite-plugin-ejs": "^1.7.0",
     "web-vitals": "^3.5.2"
   },
@@ -120,14 +120,14 @@
     "@rollup/rollup-linux-x64-gnu": "4.6.1"
   },
   "devDependencies": {
-    "@ant-design/icons": "^5.6.1",
+    "@ant-design/icons": "^5.5.2",
     "@babel/plugin-proposal-private-property-in-object": "^7.21.11",
     "@babel/preset-react": "^7.26.3",
-    "@dotenvx/dotenvx": "^1.38.3",
+    "@dotenvx/dotenvx": "^1.33.0",
     "@emotion/babel-plugin": "^11.13.5",
     "@emotion/react": "^11.14.0",
-    "@eslint/js": "^9.21.0",
-    "@sentry/webpack-plugin": "^3.2.2",
+    "@eslint/js": "^9.18.0",
+    "@sentry/webpack-plugin": "^3.2.1",
     "@testing-library/cypress": "^10.0.2",
     "browserslist": "^4.24.4",
     "browserslist-to-esbuild": "^2.1.1",
@@ -138,13 +138,13 @@
     "eslint-config-react-app": "^7.0.1",
     "eslint-plugin-cypress": "^2.15.1",
     "eslint-plugin-react": "^7.37.4",
-    "globals": "^15.15.0",
+    "globals": "^15.14.0",
     "memfs": "^4.17.0",
     "os-browserify": "^0.3.0",
-    "react-error-overlay": "^6.1.0",
+    "react-error-overlay": "6.0.11",
     "redux-logger": "^3.0.6",
     "source-map-explorer": "^2.5.3",
-    "vite": "^6.2.0",
+    "vite": "^6.0.7",
     "vite-plugin-babel": "^1.3.0",
     "vite-plugin-eslint": "^1.8.1",
     "vite-plugin-node-polyfills": "^0.23.0",

client/src/App/App.jsx

@@ -1,10 +1,10 @@
 import { useSplitClient } from "@splitsoftware/splitio-react";
 import { Button, Result } from "antd";
 import LogRocket from "logrocket";
-import { lazy, Suspense, useEffect, useState } from "react";
+import React, { lazy, Suspense, useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
-import { Route, Routes, useNavigate } from "react-router-dom";
+import { Route, Routes } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
 import DocumentEditorContainer from "../components/document-editor/document-editor.container";
 import ErrorBoundary from "../components/error-boundary/error-boundary.component"; // Component Imports
@@ -21,7 +21,7 @@ import "./App.styles.scss";
 import Eula from "../components/eula/eula.component";
 import InstanceRenderMgr from "../utils/instanceRenderMgr";
 import ProductFruitsWrapper from "./ProductFruitsWrapper.jsx";
-import { SocketProvider } from "../contexts/SocketIO/useSocket.jsx";
+import { SocketProvider } from "../contexts/SocketIO/socketContext.jsx";
 import { NotificationProvider } from "../contexts/Notifications/notificationContext.jsx";
 
 const ResetPassword = lazy(() => import("../pages/reset-password/reset-password.component"));
@@ -46,7 +46,6 @@ export function App({ bodyshop, checkUserSession, currentUser, online, setOnline
   const client = useSplitClient().client;
   const [listenersAdded, setListenersAdded] = useState(false);
   const { t } = useTranslation();
-  const navigate = useNavigate();
 
   useEffect(() => {
     if (!navigator.onLine) {
@@ -201,7 +200,7 @@ export function App({ bodyshop, checkUserSession, currentUser, online, setOnline
             path="/manage/*"
             element={
               <ErrorBoundary>
-                <SocketProvider bodyshop={bodyshop} navigate={navigate} currentUser={currentUser}>
+                <SocketProvider bodyshop={bodyshop}>
                   <PrivateRoute isAuthorized={currentUser.authorized} />
                 </SocketProvider>
               </ErrorBoundary>
@@ -213,7 +212,7 @@ export function App({ bodyshop, checkUserSession, currentUser, online, setOnline
             path="/tech/*"
             element={
               <ErrorBoundary>
-                <SocketProvider bodyshop={bodyshop} navigate={navigate} currentUser={currentUser}>
+                <SocketProvider bodyshop={bodyshop}>
                   <PrivateRoute isAuthorized={currentUser.authorized} />
                 </SocketProvider>
               </ErrorBoundary>

client/src/App/App.styles.scss

@@ -180,13 +180,3 @@
 .muted-button:hover {
   color: darkgrey;
 }
-
-.notification-alert-unordered-list {
-  cursor: pointer;
-  padding: 0;
-  margin: 0;
-
-  .notification-alert-unordered-list-item {
-    margin-right: 0;
-  }
-}

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

@@ -1,9 +1,9 @@
 import { useApolloClient } from "@apollo/client";
 import { getToken } from "@firebase/messaging";
 import axios from "axios";
-import { useEffect } from "react";
+import React, { useContext, useEffect } from "react";
 import { useTranslation } from "react-i18next";
-import { useSocket } from "../../contexts/SocketIO/useSocket.jsx";
+import SocketContext from "../../contexts/SocketIO/socketContext";
 import { messaging, requestForToken } from "../../firebase/firebase.utils";
 import ChatPopupComponent from "../chat-popup/chat-popup.component";
 import "./chat-affix.styles.scss";
@@ -12,7 +12,7 @@ import { registerMessagingHandlers, unregisterMessagingHandlers } from "./regist
 export function ChatAffixContainer({ bodyshop, chatVisible }) {
   const { t } = useTranslation();
   const client = useApolloClient();
-  const { socket } = useSocket();
+  const { socket } = useContext(SocketContext);
 
   useEffect(() => {
     if (!bodyshop || !bodyshop.messagingservicesid) return;

client/src/components/chat-archive-button/chat-archive-button.component.jsx

@@ -1,9 +1,9 @@
 import { useMutation } from "@apollo/client";
 import { Button } from "antd";
-import { useState } from "react";
+import React, { useContext, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { TOGGLE_CONVERSATION_ARCHIVE } from "../../graphql/conversations.queries";
-import { useSocket } from "../../contexts/SocketIO/useSocket.jsx";
+import SocketContext from "../../contexts/SocketIO/socketContext.jsx";
 import { createStructuredSelector } from "reselect";
 import { selectBodyshop } from "../../redux/user/user.selectors.js";
 import { connect } from "react-redux";
@@ -18,7 +18,7 @@ export function ChatArchiveButton({ conversation, bodyshop }) {
   const [loading, setLoading] = useState(false);
   const { t } = useTranslation();
   const [updateConversation] = useMutation(TOGGLE_CONVERSATION_ARCHIVE);
-  const { socket } = useSocket();
+  const { socket } = useContext(SocketContext);
 
   const handleToggleArchive = async () => {
     setLoading(true);

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

@@ -1,10 +1,11 @@
 import { useMutation } from "@apollo/client";
 import { Tag } from "antd";
+import React, { useContext } from "react";
 import { Link } from "react-router-dom";
 import { logImEXEvent } from "../../firebase/firebase.utils";
 import { REMOVE_CONVERSATION_TAG } from "../../graphql/job-conversations.queries";
 import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
-import { useSocket } from "../../contexts/SocketIO/useSocket.jsx";
+import SocketContext from "../../contexts/SocketIO/socketContext.jsx";
 import { createStructuredSelector } from "reselect";
 import { selectBodyshop } from "../../redux/user/user.selectors.js";
 import { connect } from "react-redux";
@@ -17,7 +18,7 @@ const mapDispatchToProps = () => ({});
 
 export function ChatConversationTitleTags({ jobConversations, bodyshop }) {
   const [removeJobConversation] = useMutation(REMOVE_CONVERSATION_TAG);
-  const { socket } = useSocket();
+  const { socket } = useContext(SocketContext);
 
   const handleRemoveTag = async (jobId) => {
     const convId = jobConversations[0].conversationid;

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

@@ -1,10 +1,10 @@
 import { gql, useApolloClient, useQuery, useSubscription } from "@apollo/client";
 import axios from "axios";
-import { useCallback, useEffect, useState } from "react";
+import React, { useCallback, useContext, useEffect, useState } from "react";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
-import { useSocket } from "../../contexts/SocketIO/useSocket.jsx";
-import { CONVERSATION_SUBSCRIPTION_BY_PK, GET_CONVERSATION_DETAILS } from "../../graphql/conversations.queries";
+import SocketContext from "../../contexts/SocketIO/socketContext";
+import { GET_CONVERSATION_DETAILS, CONVERSATION_SUBSCRIPTION_BY_PK } from "../../graphql/conversations.queries";
 import { selectSelectedConversation } from "../../redux/messaging/messaging.selectors";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import ChatConversationComponent from "./chat-conversation.component";
@@ -16,7 +16,7 @@ const mapStateToProps = createStructuredSelector({
 
 function ChatConversationContainer({ bodyshop, selectedConversation }) {
   const client = useApolloClient();
-  const { socket } = useSocket();
+  const { socket } = useContext(SocketContext);
   const [markingAsReadInProgress, setMarkingAsReadInProgress] = useState(false);
 
   // Fetch conversation details

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

@@ -1,10 +1,10 @@
 import { PlusOutlined } from "@ant-design/icons";
 import { useMutation } from "@apollo/client";
 import { Input, Spin, Tag, Tooltip } from "antd";
-import { useState } from "react";
+import React, { useContext, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { UPDATE_CONVERSATION_LABEL } from "../../graphql/conversations.queries";
-import { useSocket } from "../../contexts/SocketIO/useSocket.jsx";
+import SocketContext from "../../contexts/SocketIO/socketContext.jsx";
 import { createStructuredSelector } from "reselect";
 import { selectBodyshop } from "../../redux/user/user.selectors.js";
 import { connect } from "react-redux";
@@ -20,7 +20,7 @@ export function ChatLabel({ conversation, bodyshop }) {
   const [loading, setLoading] = useState(false);
   const [editing, setEditing] = useState(false);
   const [value, setValue] = useState(conversation.label);
-  const { socket } = useSocket();
+  const { socket } = useContext(SocketContext);
   const notification = useNotification();
 
   const { t } = useTranslation();

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

@@ -1,11 +1,12 @@
 import { PlusCircleFilled } from "@ant-design/icons";
 import { Button, Form, Popover } from "antd";
+import React, { useContext } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { openChatByPhone } from "../../redux/messaging/messaging.actions";
 import PhoneFormItem, { PhoneItemFormatterValidation } from "../form-items-formatted/phone-form-item.component";
-import { useSocket } from "../../contexts/SocketIO/useSocket.jsx";
+import SocketContext from "../../contexts/SocketIO/socketContext.jsx";
 
 const mapStateToProps = createStructuredSelector({
   //currentUser: selectCurrentUser
@@ -17,7 +18,7 @@ const mapDispatchToProps = (dispatch) => ({
 export function ChatNewConversation({ openChatByPhone }) {
   const { t } = useTranslation();
   const [form] = Form.useForm();
-  const { socket } = useSocket();
+  const { socket } = useContext(SocketContext);
 
   const handleFinish = (values) => {
     openChatByPhone({ phone_num: values.phoneNumber, socket });

client/src/components/chat-open-button/chat-open-button.component.jsx

@@ -1,4 +1,5 @@
 import parsePhoneNumber from "libphonenumber-js";
+import React, { useContext } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { openChatByPhone } from "../../redux/messaging/messaging.actions";
@@ -7,7 +8,7 @@ import PhoneNumberFormatter from "../../utils/PhoneFormatter";
 import { createStructuredSelector } from "reselect";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import { searchingForConversation } from "../../redux/messaging/messaging.selectors";
-import { useSocket } from "../../contexts/SocketIO/useSocket.jsx";
+import SocketContext from "../../contexts/SocketIO/socketContext.jsx";
 import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
 
 const mapStateToProps = createStructuredSelector({
@@ -21,7 +22,7 @@ const mapDispatchToProps = (dispatch) => ({
 
 export function ChatOpenButton({ bodyshop, searchingForConversation, phone, jobid, openChatByPhone }) {
   const { t } = useTranslation();
-  const { socket } = useSocket();
+  const { socket } = useContext(SocketContext);
   const notification = useNotification();
 
   if (!phone) return <></>;

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

@@ -1,7 +1,7 @@
 import { InfoCircleOutlined, MessageOutlined, ShrinkOutlined, SyncOutlined } from "@ant-design/icons";
 import { useApolloClient, useLazyQuery, useQuery } from "@apollo/client";
 import { Badge, Card, Col, Row, Space, Tag, Tooltip, Typography } from "antd";
-import { useEffect, useState } from "react";
+import React, { useContext, useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
@@ -12,9 +12,8 @@ import ChatConversationListComponent from "../chat-conversation-list/chat-conver
 import ChatConversationContainer from "../chat-conversation/chat-conversation.container";
 import ChatNewConversation from "../chat-new-conversation/chat-new-conversation.component";
 import LoadingSpinner from "../loading-spinner/loading-spinner.component";
-import { useSocket } from "../../contexts/SocketIO/useSocket.jsx";
-
 import "./chat-popup.styles.scss";
+import SocketContext from "../../contexts/SocketIO/socketContext.jsx";
 
 const mapStateToProps = createStructuredSelector({
   selectedConversation: selectSelectedConversation,
@@ -28,7 +27,7 @@ const mapDispatchToProps = (dispatch) => ({
 export function ChatPopupComponent({ chatVisible, selectedConversation, toggleChatVisible }) {
   const { t } = useTranslation();
   const [pollInterval, setPollInterval] = useState(0);
-  const { socket } = useSocket();
+  const { socket } = useContext(SocketContext);
   const client = useApolloClient(); // Apollo Client instance for cache operations
 
   // Lazy query for conversations

client/src/components/chat-tag-ro/chat-tag-ro.container.jsx

@@ -2,13 +2,13 @@ import { PlusOutlined } from "@ant-design/icons";
 import { useLazyQuery, useMutation } from "@apollo/client";
 import { Tag } from "antd";
 import _ from "lodash";
-import { useState } from "react";
+import React, { useContext, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { logImEXEvent } from "../../firebase/firebase.utils";
 import { INSERT_CONVERSATION_TAG } from "../../graphql/job-conversations.queries";
 import { SEARCH_FOR_JOBS } from "../../graphql/jobs.queries";
 import ChatTagRo from "./chat-tag-ro.component";
-import { useSocket } from "../../contexts/SocketIO/useSocket.jsx";
+import SocketContext from "../../contexts/SocketIO/socketContext.jsx";
 import { createStructuredSelector } from "reselect";
 import { selectBodyshop } from "../../redux/user/user.selectors.js";
 import { connect } from "react-redux";
@@ -22,7 +22,7 @@ const mapDispatchToProps = () => ({});
 export function ChatTagRoContainer({ conversation, bodyshop }) {
   const { t } = useTranslation();
   const [open, setOpen] = useState(false);
-  const { socket } = useSocket();
+  const { socket } = useContext(SocketContext);
 
   const [loadRo, { loading, data }] = useLazyQuery(SEARCH_FOR_JOBS);
 

client/src/components/error-boundary/error-boundary.component.jsx

@@ -123,7 +123,7 @@ class ErrorBoundary extends React.Component {
           <Row>
             <Col offset={6} span={12}>
               <Collapse bordered={false}>
-                <Collapse.Panel key="errors-panel" header={t("general.labels.errors")}>
+                <Collapse.Panel header={t("general.labels.errors")}>
                   <div>
                     <strong>{this.state.error.message}</strong>
                   </div>

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

@@ -78,7 +78,9 @@ const Eula = ({ currentEula, currentUser, acceptEula }) => {
     } catch (err) {
       notification.error({
         message: t("eula.errors.acceptance.message"),
-        description: t("eula.errors.acceptance.description")
+        description: t("eula.errors.acceptance.description"),
+        placement: "bottomRight",
+        duration: 5000
       });
       console.log(`${t("eula.errors.acceptance.message")}`);
       console.dir({

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

@@ -1,7 +1,6 @@
-import {
+import Icon, {
   BankFilled,
   BarChartOutlined,
-  BellFilled,
   CarFilled,
   CheckCircleOutlined,
   ClockCircleFilled,
@@ -26,10 +25,8 @@ import {
   UnorderedListOutlined,
   UserOutlined
 } from "@ant-design/icons";
-import { useQuery } from "@apollo/client";
 import { useSplitTreatments } from "@splitsoftware/splitio-react";
-import { Badge, Layout, Menu, Spin } from "antd";
-import { useEffect, useRef, useState } from "react";
+import { Layout, Menu, Space } from "antd";
 import { useTranslation } from "react-i18next";
 import { BsKanban } from "react-icons/bs";
 import { FaCalendarAlt, FaCarCrash, FaCreditCard, FaFileInvoiceDollar, FaTasks } from "react-icons/fa";
@@ -40,19 +37,14 @@ import { RiSurveyLine } from "react-icons/ri";
 import { connect } from "react-redux";
 import { Link } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
-import { useSocket } from "../../contexts/SocketIO/useSocket.jsx";
-import { GET_UNREAD_COUNT } from "../../graphql/notifications.queries.js";
 import { selectRecentItems, selectSelectedHeader } from "../../redux/application/application.selectors";
 import { setModalContext } from "../../redux/modals/modals.actions";
 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 { HasFeatureAccess } from "../feature-wrapper/feature-wrapper.component";
 import LockWrapper from "../lock-wrapper/lock-wrapper.component";
-import NotificationCenterContainer from "../notification-center/notification-center.container.jsx";
 
-// Redux mappings
 const mapStateToProps = createStructuredSelector({
   currentUser: selectCurrentUser,
   recentItems: selectRecentItems,
@@ -61,13 +53,43 @@ const mapStateToProps = createStructuredSelector({
 });
 
 const mapDispatchToProps = (dispatch) => ({
-  setBillEnterContext: (context) => dispatch(setModalContext({ context, modal: "billEnter" })),
-  setTimeTicketContext: (context) => dispatch(setModalContext({ context, modal: "timeTicket" })),
-  setPaymentContext: (context) => dispatch(setModalContext({ context, modal: "payment" })),
-  setReportCenterContext: (context) => dispatch(setModalContext({ context, modal: "reportCenter" })),
+  setBillEnterContext: (context) =>
+    dispatch(
+      setModalContext({
+        context: context,
+        modal: "billEnter"
+      })
+    ),
+  setTimeTicketContext: (context) =>
+    dispatch(
+      setModalContext({
+        context: context,
+        modal: "timeTicket"
+      })
+    ),
+  setPaymentContext: (context) => dispatch(setModalContext({ context: context, modal: "payment" })),
+  setReportCenterContext: (context) =>
+    dispatch(
+      setModalContext({
+        context: context,
+        modal: "reportCenter"
+      })
+    ),
   signOutStart: () => dispatch(signOutStart()),
-  setCardPaymentContext: (context) => dispatch(setModalContext({ context, modal: "cardPayment" })),
-  setTaskUpsertContext: (context) => dispatch(setModalContext({ context, modal: "taskUpsert" }))
+  setCardPaymentContext: (context) =>
+    dispatch(
+      setModalContext({
+        context: context,
+        modal: "cardPayment"
+      })
+    ),
+  setTaskUpsertContext: (context) =>
+    dispatch(
+      setModalContext({
+        context: context,
+        modal: "taskUpsert"
+      })
+    )
 });
 
 function Header({
@@ -93,81 +115,24 @@ function Header({
   });
 
   const { t } = useTranslation();
-  const { isConnected, scenarioNotificationsOn } = useSocket();
-  const [notificationVisible, setNotificationVisible] = useState(false);
-  const baseTitleRef = useRef(document.title || "");
-  const lastSetTitleRef = useRef("");
-  const userAssociationId = bodyshop?.associations?.[0]?.id;
 
-  const {
-    data: unreadData,
-    refetch: refetchUnread,
-    loading: unreadLoading
-  } = useQuery(GET_UNREAD_COUNT, {
-    variables: { associationid: userAssociationId },
-    fetchPolicy: "network-only",
-    pollInterval: isConnected ? 0 : day.duration(60, "seconds").asMilliseconds(),
-    skip: !userAssociationId || !scenarioNotificationsOn
-  });
+  // const deleteBetaCookie = () => {
+  //   const cookieExists = document.cookie.split("; ").some((row) => row.startsWith(`betaSwitchImex=`));
+  //   if (cookieExists) {
+  //     const domain = window.location.hostname.split(".").slice(-2).join(".");
+  //     document.cookie = `betaSwitchImex=; expires=Thu, 01 Jan 1970 00:00:00 GMT; path=/; domain=.${domain}`;
+  //   }
+  // };
+  //
+  // deleteBetaCookie();
 
-  const unreadCount = unreadData?.notifications_aggregate?.aggregate?.count ?? 0;
+  const accountingChildren = [];
 
-  useEffect(() => {
-    if (userAssociationId) {
-      refetchUnread().catch((e) => console.error(`Error fetching unread notifications: ${e?.message}`));
-    }
-  }, [refetchUnread, userAssociationId]);
-
-  useEffect(() => {
-    if (!isConnected && !unreadLoading && userAssociationId) {
-      refetchUnread().catch((e) => console.error(`Error fetching unread notifications: ${e?.message}`));
-    }
-  }, [isConnected, unreadLoading, refetchUnread, userAssociationId]);
-
-  // Keep The unread count in the title.
-  useEffect(() => {
-    const updateTitle = () => {
-      const currentTitle = document.title;
-      // Check if the current title differs from what we last set
-      if (currentTitle !== lastSetTitleRef.current) {
-        // Extract base title by removing any unread count prefix
-        const baseTitleMatch = currentTitle.match(/^\(\d+\)\s*(.*)$/);
-        baseTitleRef.current = baseTitleMatch ? baseTitleMatch[1] : currentTitle;
-      }
-
-      // Apply unread count to the base title
-      const newTitle = unreadCount > 0 ? `(${unreadCount}) ${baseTitleRef.current}` : baseTitleRef.current;
-
-      // Only update if the title has changed to avoid unnecessary DOM writes
-      if (document.title !== newTitle) {
-        document.title = newTitle;
-        lastSetTitleRef.current = newTitle; // Store what we set
-      }
-    };
-
-    // Initial update
-    updateTitle();
-
-    // Poll every 100ms to catch child component changes
-    const interval = setInterval(updateTitle, 100);
-
-    // Cleanup
-    return () => {
-      clearInterval(interval);
-      document.title = baseTitleRef.current; // Reset to base title on unmount
-    };
-  }, [unreadCount]); // Re-run when unreadCount changes
-
-  const handleNotificationClick = (e) => {
-    setNotificationVisible(!notificationVisible);
-    if (handleMenuClick) handleMenuClick(e);
-  };
-
-  const accountingChildren = [
+  accountingChildren.push(
     {
       key: "bills",
       id: "header-accounting-bills",
-      icon: <FaFileInvoiceDollar />,
+      icon: <Icon component={FaFileInvoiceDollar} />,
       label: (
         <Link to="/manage/bills">
           <LockWrapper featureName="bills" bodyshop={bodyshop}>
@@ -179,60 +144,92 @@ function Header({
     {
       key: "enterbills",
       id: "header-accounting-enterbills",
-      icon: <GiPayMoney />,
+      icon: <Icon component={GiPayMoney} />,
       label: (
-        <LockWrapper featureName="bills" bodyshop={bodyshop}>
-          {t("menus.header.enterbills")}
-        </LockWrapper>
+        <Space>
+          <LockWrapper featureName="bills" bodyshop={bodyshop}>
+            {t("menus.header.enterbills")}
+          </LockWrapper>
+        </Space>
       ),
-      onClick: () =>
+      onClick: () => {
         HasFeatureAccess({ featureName: "bills", bodyshop }) &&
-        setBillEnterContext({
-          actions: {},
-          context: {}
-        })
+          setBillEnterContext({
+            actions: {},
+            context: {}
+          });
+      }
+    }
+  );
+
+  if (Simple_Inventory.treatment === "on") {
+    accountingChildren.push(
+      {
+        type: "divider"
+      },
+      {
+        key: "inventory",
+        id: "header-accounting-inventory",
+        icon: <Icon component={FaFileInvoiceDollar} />,
+        label: <Link to="/manage/inventory">{t("menus.header.inventory")}</Link>
+      }
+    );
+  }
+
+  accountingChildren.push(
+    {
+      type: "divider"
     },
-    ...(Simple_Inventory.treatment === "on"
-      ? [
-          { type: "divider" },
-          {
-            key: "inventory",
-            id: "header-accounting-inventory",
-            icon: <FaFileInvoiceDollar />,
-            label: <Link to="/manage/inventory">{t("menus.header.inventory")}</Link>
-          }
-        ]
-      : []),
-    { type: "divider" },
     {
       key: "allpayments",
       id: "header-accounting-allpayments",
       icon: <BankFilled />,
-      label: <Link to="/manage/payments">{t("menus.header.allpayments")}</Link>
+      label: (
+        <Link to="/manage/payments">
+          <LockWrapper featureName="payments" bodyshop={bodyshop}>
+            {t("menus.header.allpayments")}
+          </LockWrapper>
+        </Link>
+      )
     },
     {
       key: "enterpayments",
       id: "header-accounting-enterpayments",
-      icon: <FaCreditCard />,
-      label: t("menus.header.enterpayment"),
-      onClick: () =>
-        setPaymentContext({
+      icon: <Icon component={FaCreditCard} />,
+      label: (
+        <LockWrapper featureName="payments" bodyshop={bodyshop}>
+          {t("menus.header.enterpayment")}
+        </LockWrapper>
+      ),
+      onClick: () => {
+        HasFeatureAccess({ featureName: "payments", bodyshop }) &&
+          setPaymentContext({
+            actions: {},
+            context: null
+          });
+      }
+    }
+  );
+
+  if (ImEXPay.treatment === "on") {
+    accountingChildren.push({
+      key: "entercardpayments",
+      id: "header-accounting-entercardpayments",
+      icon: <Icon component={FaCreditCard} />,
+      label: t("menus.header.entercardpayment"),
+      onClick: () => {
+        setCardPaymentContext({
           actions: {},
-          context: null
-        })
+          context: {}
+        });
+      }
+    });
+  }
+
+  accountingChildren.push(
+    {
+      type: "divider"
     },
-    ...(ImEXPay.treatment === "on"
-      ? [
-          {
-            key: "entercardpayments",
-            id: "header-accounting-entercardpayments",
-            icon: <FaCreditCard />,
-            label: t("menus.header.entercardpayment"),
-            onClick: () => setCardPaymentContext({ actions: {}, context: {} })
-          }
-        ]
-      : []),
-    { type: "divider" },
     {
       key: "timetickets",
       id: "header-accounting-timetickets",
@@ -244,124 +241,132 @@ function Header({
           </LockWrapper>
         </Link>
       )
-    },
-    ...(bodyshop?.md_tasks_presets?.use_approvals
-      ? [
-          {
-            key: "ttapprovals",
-            id: "header-accounting-ttapprovals",
-            icon: <FieldTimeOutlined />,
-            label: <Link to="/manage/ttapprovals">{t("menus.header.ttapprovals")}</Link>
-          }
-        ]
-      : []),
+    }
+  );
+
+  if (bodyshop?.md_tasks_presets?.use_approvals) {
+    accountingChildren.push({
+      key: "ttapprovals",
+      id: "header-accounting-ttapprovals",
+      icon: <FieldTimeOutlined />,
+      label: <Link to="/manage/ttapprovals">{t("menus.header.ttapprovals")}</Link>
+    });
+  }
+  accountingChildren.push(
     {
       key: "entertimetickets",
-      id: "header-accounting-entertimetickets",
-      icon: <GiPlayerTime />,
+      icon: <Icon component={GiPlayerTime} />,
       label: (
         <LockWrapper featureName="timetickets" bodyshop={bodyshop}>
           {t("menus.header.entertimeticket")}
         </LockWrapper>
       ),
-      onClick: () =>
+      id: "header-accounting-entertimetickets",
+      onClick: () => {
         HasFeatureAccess({ featureName: "timetickets", bodyshop }) &&
-        setTimeTicketContext({
-          actions: {},
-          context: {
-            created_by: currentUser.displayName
-              ? `${currentUser.email} | ${currentUser.displayName}`
-              : currentUser.email
-          }
-        })
+          setTimeTicketContext({
+            actions: {},
+            context: {
+              created_by: currentUser.displayName
+                ? currentUser.email.concat(" | ", currentUser.displayName)
+                : currentUser.email
+            }
+          });
+      }
     },
-    { type: "divider" },
     {
-      key: "accountingexport",
-      id: "header-accounting-export",
-      icon: <ExportOutlined />,
+      type: "divider"
+    }
+  );
+
+  const accountingExportChildren = [
+    {
+      key: "receivables",
+      id: "header-accounting-receivables",
       label: (
-        <LockWrapper featureName="export" bodyshop={bodyshop}>
-          {t("menus.header.export")}
-        </LockWrapper>
-      ),
-      children: [
-        {
-          key: "receivables",
-          id: "header-accounting-receivables",
-          label: (
-            <Link to="/manage/accounting/receivables">
-              <LockWrapper featureName="export" bodyshop={bodyshop}>
-                {t("menus.header.accounting-receivables")}
-              </LockWrapper>
-            </Link>
-          )
-        },
-        ...(!((bodyshop && bodyshop.cdk_dealerid) || (bodyshop && bodyshop.pbs_serialnumber)) ||
-        DmsAp.treatment === "on"
-          ? [
-              {
-                key: "payables",
-                id: "header-accounting-payables",
-                label: (
-                  <Link to="/manage/accounting/payables">
-                    <LockWrapper featureName="export" bodyshop={bodyshop}>
-                      {t("menus.header.accounting-payables")}
-                    </LockWrapper>
-                  </Link>
-                )
-              }
-            ]
-          : []),
-        ...(!((bodyshop && bodyshop.cdk_dealerid) || (bodyshop && bodyshop.pbs_serialnumber))
-          ? [
-              {
-                key: "payments",
-                id: "header-accounting-payments",
-                label: (
-                  <Link to="/manage/accounting/payments">
-                    <LockWrapper featureName="export" bodyshop={bodyshop}>
-                      {t("menus.header.accounting-payments")}
-                    </LockWrapper>
-                  </Link>
-                )
-              }
-            ]
-          : []),
-        { type: "divider" },
-        {
-          key: "exportlogs",
-          id: "header-accounting-exportlogs",
-          label: (
-            <Link to="/manage/accounting/exportlogs">
-              <LockWrapper featureName="export" bodyshop={bodyshop}>
-                {t("menus.header.export-logs")}
-              </LockWrapper>
-            </Link>
-          )
-        }
-      ]
+        <Link to="/manage/accounting/receivables">
+          <LockWrapper featureName="export" bodyshop={bodyshop}>
+            {t("menus.header.accounting-receivables")}
+          </LockWrapper>
+        </Link>
+      )
     }
   ];
 
-  // Left menu items (includes original navigation items)
-  const leftMenuItems = [
+  if (!((bodyshop && bodyshop.cdk_dealerid) || (bodyshop && bodyshop.pbs_serialnumber)) || DmsAp.treatment === "on") {
+    accountingExportChildren.push({
+      key: "payables",
+      id: "header-accounting-payables",
+      label: (
+        <Link to="/manage/accounting/payables">
+          <LockWrapper featureName="export" bodyshop={bodyshop}>
+            {t("menus.header.accounting-payables")}
+          </LockWrapper>
+        </Link>
+      )
+    });
+  }
+
+  if (!((bodyshop && bodyshop.cdk_dealerid) || (bodyshop && bodyshop.pbs_serialnumber))) {
+    accountingExportChildren.push({
+      key: "payments",
+      id: "header-accounting-payments",
+      label: (
+        <Link to="/manage/accounting/payments">
+          <LockWrapper featureName="export" bodyshop={bodyshop}>
+            {t("menus.header.accounting-payments")}
+          </LockWrapper>
+        </Link>
+      )
+    });
+  }
+
+  accountingExportChildren.push(
+    {
+      type: "divider"
+    },
+    {
+      key: "exportlogs",
+      id: "header-accounting-exportlogs",
+      label: (
+        <Link to="/manage/accounting/exportlogs">
+          <LockWrapper featureName="export" bodyshop={bodyshop}>
+            {t("menus.header.export-logs")}
+          </LockWrapper>
+        </Link>
+      )
+    }
+  );
+
+  accountingChildren.push({
+    key: "accountingexport",
+    id: "header-accounting-export",
+    icon: <ExportOutlined />,
+    label: (
+      <LockWrapper featureName="export" bodyshop={bodyshop}>
+        {t("menus.header.export")}
+      </LockWrapper>
+    ),
+    children: accountingExportChildren
+  });
+
+  const menuItems = [
     {
       key: "home",
-      id: "header-home",
       icon: <HomeFilled />,
+      id: "header-home",
       label: <Link to="/manage/">{t("menus.header.home")}</Link>
     },
     {
       key: "schedule",
       id: "header-schedule",
-      icon: <FaCalendarAlt />,
+      icon: <Icon component={FaCalendarAlt} />,
       label: <Link to="/manage/schedule">{t("menus.header.schedule")}</Link>
     },
     {
       key: "jobssubmenu",
       id: "header-jobs",
-      icon: <FaCarCrash />,
+      icon: <Icon component={FaCarCrash} />,
       label: t("menus.header.jobs"),
       children: [
         {
@@ -394,24 +399,31 @@ function Header({
           icon: <FileAddOutlined />,
           label: <Link to="/manage/jobs/new">{t("menus.header.newjob")}</Link>
         },
-        { type: "divider" },
+        {
+          type: "divider",
+          id: "header-jobs-divider"
+        },
         {
           key: "alljobs",
           id: "header-all-jobs",
           icon: <UnorderedListOutlined />,
           label: <Link to="/manage/jobs/all">{t("menus.header.alljobs")}</Link>
         },
-        { type: "divider" },
+        {
+          type: "divider",
+          id: "header-jobs-divider2"
+        },
         {
           key: "productionlist",
           id: "header-production-list",
           icon: <ScheduleOutlined />,
           label: <Link to="/manage/production/list">{t("menus.header.productionlist")}</Link>
         },
+
         {
           key: "productionboard",
           id: "header-production-board",
-          icon: <BsKanban />,
+          icon: <Icon component={BsKanban} />,
           label: (
             <Link to="/manage/production/board">
               <LockWrapper featureName="visualboard" bodyshop={bodyshop}>
@@ -420,7 +432,11 @@ function Header({
             </Link>
           )
         },
-        { type: "divider" },
+
+        {
+          type: "divider",
+          id: "header-jobs-divider3"
+        },
         {
           key: "scoreboard",
           id: "header-scoreboard",
@@ -437,8 +453,8 @@ function Header({
     },
     {
       key: "customers",
-      id: "header-customers",
       icon: <UserOutlined />,
+      id: "header-customers",
       label: t("menus.header.customers"),
       children: [
         {
@@ -503,6 +519,7 @@ function Header({
         }
       ]
     },
+
     ...(accountingChildren.length > 0
       ? [
           {
@@ -520,6 +537,7 @@ function Header({
       icon: <PhoneOutlined />,
       label: <Link to="/manage/phonebook">{t("menus.header.phonebook")}</Link>
     },
+
     {
       key: "temporarydocs",
       id: "header-temporarydocs",
@@ -532,6 +550,7 @@ function Header({
         </Link>
       )
     },
+
     {
       key: "tasks",
       id: "tasks",
@@ -543,7 +562,12 @@ function Header({
           id: "header-create-task",
           icon: <PlusCircleOutlined />,
           label: t("menus.header.create_task"),
-          onClick: () => setTaskUpsertContext({ actions: {}, context: {} })
+          onClick: () => {
+            setTaskUpsertContext({
+              actions: {},
+              context: {}
+            });
+          }
         },
         {
           key: "mytasks",
@@ -568,7 +592,7 @@ function Header({
         {
           key: "shop",
           id: "header-shop",
-          icon: <GiSettingsKnobs />,
+          icon: <Icon component={GiSettingsKnobs} />,
           label: <Link to="/manage/shop?tab=info">{t("menus.header.shop_config")}</Link>
         },
         {
@@ -586,18 +610,24 @@ function Header({
           id: "header-reportcenter",
           icon: <BarChartOutlined />,
           label: t("menus.header.reportcenter"),
-          onClick: () => setReportCenterContext({ actions: {}, context: {} })
+          onClick: () => {
+            setReportCenterContext({
+              actions: {},
+              context: {}
+            });
+          }
         },
         {
           key: "shop-vendors",
           id: "header-shop-vendors",
-          icon: <IoBusinessOutline />,
+          icon: <Icon component={IoBusinessOutline} />,
           label: <Link to="/manage/shop/vendors">{t("menus.header.shop_vendors")}</Link>
         },
+
         {
           key: "shop-csi",
           id: "header-shop-csi",
-          icon: <RiSurveyLine />,
+          icon: <Icon component={RiSurveyLine} />,
           label: (
             <Link to="/manage/shop/csi">
               <LockWrapper featureName="export" bodyshop={bodyshop}>
@@ -608,27 +638,14 @@ function Header({
         }
       ]
     },
-    {
-      key: "recent",
-      id: "header-recent",
-      icon: <ClockCircleFilled />,
-      label: t("menus.header.recent"),
-      children: recentItems.map((i, idx) => ({
-        key: idx,
-        id: `header-recent-${idx}`,
-        label: <Link to={i.url}>{i.label}</Link>
-      }))
-    },
     {
       key: "user",
-      id: "header-user",
-      icon: <UserOutlined />,
-      label: t("menus.currentuser.profile"),
+      label: currentUser.displayName || currentUser.email || t("general.labels.unknown"),
       children: [
         {
           key: "signout",
           id: "header-signout",
-          icon: <FiLogOut />,
+          icon: <Icon component={FiLogOut} />,
           danger: true,
           label: t("user.actions.signout"),
           onClick: () => signOutStart()
@@ -636,25 +653,33 @@ function Header({
         {
           key: "help",
           id: "header-help",
-          icon: <QuestionCircleFilled />,
+          icon: <Icon component={QuestionCircleFilled} />,
           label: t("menus.header.help"),
-          onClick: () => window.open("https://help.imex.online/", "_blank")
+          onClick: () => {
+            window.open("https://help.imex.online/", "_blank");
+          }
         },
-        ...(InstanceRenderManager({ imex: true, rome: false })
+        ...(InstanceRenderManager({
+          imex: true,
+          rome: false
+        })
           ? [
               {
                 key: "rescue",
                 id: "header-rescue",
-                icon: <CarFilled />,
+                icon: <Icon component={CarFilled} />,
                 label: t("menus.header.rescueme"),
-                onClick: () => window.open("https://imexrescue.com/", "_blank")
+                onClick: () => {
+                  window.open("https://imexrescue.com/", "_blank");
+                }
               }
             ]
           : []),
+
         {
           key: "shiftclock",
           id: "header-shiftclock",
-          icon: <GiPlayerTime />,
+          icon: <Icon component={GiPlayerTime} />,
           label: (
             <Link to="/manage/shiftclock">
               <LockWrapper featureName="export" bodyshop={bodyshop}>
@@ -663,79 +688,64 @@ function Header({
             </Link>
           )
         },
+
         {
           key: "profile",
           id: "header-profile",
           icon: <UserOutlined />,
           label: <Link to="/manage/profile">{t("menus.currentuser.profile")}</Link>
         }
+        // {
+        //   key: 'langselecter',
+        //   label: t("menus.currentuser.languageselector"),
+        //   children: [
+        //     {
+        //       key: 'en-US',
+        //       label: t("general.languages.english"),
+        //       onClick: () => {
+        //         window.location.href = "/?lang=en-US";
+        //       }
+        //     },
+        //     {
+        //       key: 'fr-CA',
+        //       label: t("general.languages.french"),
+        //       onClick: () => {
+        //         window.location.href = "/?lang=fr-CA";
+        //       }
+        //     },
+        //     {
+        //       key: 'es-MX',
+        //       label: t("general.languages.spanish"),
+        //       onClick: () => {
+        //         window.location.href = "/?lang=es-MX";
+        //       }
+        //     },
+        //   ]
+        // },
       ]
+    },
+    {
+      key: "recent",
+      icon: <ClockCircleFilled />,
+      id: "header-recent",
+      children: recentItems.map((i, idx) => ({
+        key: idx,
+        id: `header-recent-${idx}`,
+        label: <Link to={i.url}>{i.label}</Link>
+      }))
     }
   ];
 
-  // Notifications item (always on the right)
-  const notificationItem = scenarioNotificationsOn
-    ? [
-        {
-          key: "notifications",
-          id: "header-notifications",
-          icon: unreadLoading ? (
-            <Spin size="small" />
-          ) : (
-            <Badge offset={[8, 0]} size="small" count={unreadCount}>
-              <BellFilled />
-            </Badge>
-          ),
-          onClick: handleNotificationClick
-        }
-      ]
-    : [];
-
   return (
-    <Layout.Header style={{ padding: 0, background: "#001529" }}>
-      <div
-        style={{
-          display: "flex",
-          justifyContent: "space-between",
-          alignItems: "center",
-          height: "100%",
-          overflow: "hidden"
-        }}
-      >
-        <Menu
-          mode="horizontal"
-          theme="dark"
-          selectedKeys={[selectedHeader]}
-          onClick={handleMenuClick}
-          subMenuCloseDelay={0.3}
-          items={leftMenuItems}
-          style={{
-            flex: "1 1 auto",
-            minWidth: 0,
-            overflowX: "auto",
-            borderBottom: "none",
-            background: "transparent"
-          }}
-        />
-        {scenarioNotificationsOn && (
-          <Menu
-            mode="horizontal"
-            theme="dark"
-            selectedKeys={[selectedHeader]}
-            onClick={handleMenuClick}
-            subMenuCloseDelay={0.3}
-            items={notificationItem}
-            style={{ flex: "0 0 auto", minWidth: 0, borderBottom: "none", background: "transparent" }}
-          />
-        )}
-      </div>
-      {scenarioNotificationsOn && (
-        <NotificationCenterContainer
-          visible={notificationVisible}
-          onClose={() => setNotificationVisible(false)}
-          unreadCount={unreadCount}
-        />
-      )}
+    <Layout.Header>
+      <Menu
+        mode="horizontal"
+        theme={"dark"}
+        selectedKeys={[selectedHeader]}
+        onClick={handleMenuClick}
+        subMenuCloseDelay={0.3}
+        items={menuItems}
+      />
     </Layout.Header>
   );
 }

client/src/components/header/header.container.jsx

@@ -1,7 +1,30 @@
 import { connect } from "react-redux";
 import HeaderComponent from "./header.component";
 
+// const mapDispatchToProps = (dispatch) => ({
+//   setUserLanguage: (language) => dispatch(setUserLanguage(language))
+// });
+
+// setUserLanguage was removed from signature because it is not used in the component, and it is throwing a deprecation warning
 export function HeaderContainer() {
+  // Commented out the handleMenuClick function because it is not used in the component, and it is throwing a deprecation warning
+
+  /*  const handleMenuClick = (e) => {
+    if (e.item.props.actiontype === "lang-select") {
+      i18next.changeLanguage(e.key, (err, t) => {
+        if (err) {
+          logImEXEvent("language_change_error", { error: err });
+
+          return console.log("Error encountered when changing languages.", err);
+        }
+        logImEXEvent("language_change", { language: e.key });
+
+        setUserLanguage(e.key);
+      });
+    }
+  };*/
+  // return <HeaderComponent handleMenuClick={handleMenuClick} />;
+
   return <HeaderComponent />;
 }
 

client/src/components/job-at-change/schedule-event.component.jsx

@@ -3,12 +3,12 @@ import { useMutation } from "@apollo/client";
 import { Button, Divider, Dropdown, Form, Input, Popover, Select, Space } from "antd";
 import parsePhoneNumber from "libphonenumber-js";
 import queryString from "query-string";
-import { useState } from "react";
+import React, { useContext, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { Link, useLocation, useNavigate } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
-import { useSocket } from "../../contexts/SocketIO/useSocket.jsx";
+import SocketContext from "../../contexts/SocketIO/socketContext.jsx";
 import { UPDATE_APPOINTMENT } from "../../graphql/appointments.queries";
 import { openChatByPhone, setMessage } from "../../redux/messaging/messaging.actions";
 import { setModalContext } from "../../redux/modals/modals.actions";
@@ -51,7 +51,7 @@ export function ScheduleEventComponent({
   const searchParams = queryString.parse(useLocation().search);
   const [updateAppointment] = useMutation(UPDATE_APPOINTMENT);
   const [title, setTitle] = useState(event.title);
-  const { socket } = useSocket();
+  const { socket } = useContext(SocketContext);
   const notification = useNotification();
 
   const blockContent = (

client/src/components/job-close-ro-guard/job-close-ro-guard.container.jsx

@@ -216,7 +216,7 @@ export function JobCloseRoGuardContainer({ job, jobRO, bodyshop, form }) {
           </Form.Item>
         </Collapse.Panel>
 
-        <Collapse.Panel key="job-performance" header={t("jobs.labels.performance")}>
+        <Collapse.Panel header={t("jobs.labels.performance")}>
           <Row gutter={[32, 32]}>
             <Col className="ro-guard-col" span={24}>
               <JobCloseRoGuardTtLifecycle job={job} />

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

@@ -21,8 +21,6 @@ import JobDetailCardsInsuranceComponent from "./job-detail-cards.insurance.compo
 import JobDetailCardsNotesComponent from "./job-detail-cards.notes.component";
 import JobDetailCardsPartsComponent from "./job-detail-cards.parts.component";
 import JobDetailCardsTotalsComponent from "./job-detail-cards.totals.component";
-import JobWatcherToggleContainer from "../job-watcher-toggle/job-watcher-toggle.container.jsx";
-import { useSocket } from "../../contexts/SocketIO/useSocket.jsx";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop
@@ -39,7 +37,6 @@ const span = {
 };
 
 export function JobDetailCards({ bodyshop, setPrintCenterContext }) {
-  const { scenarioNotificationsOn } = useSocket();
   const selectedBreakpoint = Object.entries(Grid.useBreakpoint())
     .filter((screen) => !!screen[1])
     .slice(-1)[0];
@@ -81,12 +78,7 @@ export function JobDetailCards({ bodyshop, setPrintCenterContext }) {
       {data ? (
         <Card
           title={
-            <Space>
-              {scenarioNotificationsOn && <JobWatcherToggleContainer job={data.jobs_by_pk} />}
-              <Link to={`/manage/jobs/${data.jobs_by_pk.id}`}>
-                {data.jobs_by_pk.ro_number || t("general.labels.na")}
-              </Link>
-            </Space>
+            <Link to={`/manage/jobs/${data.jobs_by_pk.id}`}>{data.jobs_by_pk.ro_number || t("general.labels.na")}</Link>
           }
           extra={
             <Space wrap>
@@ -130,11 +122,7 @@ export function JobDetailCards({ bodyshop, setPrintCenterContext }) {
             </Col>
             {!bodyshop.uselocalmediaserver && (
               <Col {...span}>
-                <JobDetailCardsDocumentsComponent
-                  loading={loading}
-                  data={data ? data.jobs_by_pk : null}
-                  bodyshop={bodyshop}
-                />
+                <JobDetailCardsDocumentsComponent loading={loading} data={data ? data.jobs_by_pk : null} bodyshop={bodyshop} />
               </Col>
             )}
             <Col {...span}>

client/src/components/job-totals-table/job-totals-table.component.jsx

@@ -69,7 +69,7 @@ export function JobsTotalsTableComponent({ jobRO, currentUser, job }) {
                 <Card title="DEVELOPMENT USE ONLY">
                   <JobCalculateTotals job={job} disabled={jobRO} />
                   <Collapse>
-                    <Collapse.Panel key="json-totals" header="JSON Tree Totals">
+                    <Collapse.Panel header="JSON Tree Totals">
                       <div>
                         <pre>
                           {JSON.stringify(

client/src/components/job-watcher-toggle/job-watcher-toggle.component.jsx

@@ -1,154 +0,0 @@
-import React from "react";
-import { EyeFilled, EyeOutlined, UserOutlined } from "@ant-design/icons";
-import { Avatar, Button, Divider, List, Popover, Select, Tooltip, Typography } from "antd";
-import { useTranslation } from "react-i18next";
-import EmployeeSearchSelectComponent from "../../components/employee-search-select/employee-search-select.component.jsx";
-import LoadingSpinner from "../../components/loading-spinner/loading-spinner.component.jsx";
-import { BiSolidTrash } from "react-icons/bi";
-
-const { Text } = Typography;
-
-export default function JobWatcherToggleComponent({
-  jobWatchers,
-  isWatching,
-  watcherLoading,
-  adding,
-  removing,
-  open,
-  setOpen,
-  selectedWatcher,
-  setSelectedWatcher,
-  selectedTeam,
-  bodyshop,
-  Enhanced_Payroll,
-  handleToggleSelf,
-  handleRemoveWatcher,
-  handleWatcherSelect,
-  handleTeamSelect
-}) {
-  const { t } = useTranslation();
-
-  const handleRenderItem = (watcher) => {
-    // Check if watcher is defined and has user_email
-    if (!watcher || !watcher.user_email) {
-      return null; // Skip rendering invalid watchers
-    }
-
-    const employee = bodyshop?.employees?.find((e) => e.user_email === watcher.user_email);
-    const displayName = employee ? `${employee.first_name} ${employee.last_name}` : watcher.user_email;
-
-    return (
-      <List.Item
-        actions={[
-          <Button
-            type="default"
-            danger
-            size="medium"
-            icon={<BiSolidTrash />}
-            onClick={() => handleRemoveWatcher(watcher.user_email)}
-            disabled={adding || removing} // Optional: Disable button during mutations
-          >
-            {t("notifications.actions.remove")}
-          </Button>
-        ]}
-      >
-        <List.Item.Meta
-          avatar={<Avatar icon={<UserOutlined />} />}
-          title={<Text>{displayName}</Text>}
-          description={watcher.user_email}
-        />
-      </List.Item>
-    );
-  };
-
-  const popoverContent = (
-    <div style={{ width: "30em" }}>
-      <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>
-          ]}
-        >
-          <List.Item.Meta>
-            <Text type="secondary" style={{ marginBottom: 8, display: "block" }}>
-              {t("notifications.labels.watching-issue")}
-            </Text>
-          </List.Item.Meta>
-        </List.Item>
-      </List>
-      {watcherLoading ? (
-        <LoadingSpinner />
-      ) : jobWatchers && jobWatchers.length > 0 ? (
-        <List dataSource={jobWatchers} renderItem={handleRenderItem} />
-      ) : (
-        <Text type="secondary">{t("notifications.labels.no-watchers")}</Text>
-      )}
-
-      <Divider />
-      <Text type="secondary">{t("notifications.labels.add-watchers")}</Text>
-      <EmployeeSearchSelectComponent
-        style={{ minWidth: "100%" }}
-        options={
-          bodyshop?.employees?.filter((e) =>
-            jobWatchers.every((w) => w.user_email !== e.user_email && e.active && e.user_email)
-          ) || []
-        }
-        placeholder={t("notifications.labels.employee-search")}
-        value={selectedWatcher}
-        onChange={(value) => {
-          setSelectedWatcher(value);
-          handleWatcherSelect(value);
-        }}
-      />
-      {Enhanced_Payroll && bodyshop?.employee_teams?.length > 0 && (
-        <>
-          <Divider />
-          <Text type="secondary">{t("notifications.labels.add-watchers-team")}</Text>
-          <Select
-            showSearch
-            style={{ minWidth: "100%" }}
-            placeholder={t("notifications.labels.teams-search")}
-            value={selectedTeam}
-            onChange={handleTeamSelect}
-            options={
-              bodyshop?.employee_teams?.map((team) => {
-                const teamMembers = team.employee_team_members
-                  .map((member) => {
-                    const employee = bodyshop?.employees?.find((e) => e.id === member.employeeid);
-                    return employee?.user_email && employee?.active ? employee.user_email : null;
-                  })
-                  .filter(Boolean);
-                return {
-                  value: JSON.stringify(teamMembers),
-                  label: team.name
-                };
-              }) || []
-            }
-          />
-        </>
-      )}
-    </div>
-  );
-
-  return (
-    <Popover placement="rightTop" content={popoverContent} trigger="click" open={open} onOpenChange={setOpen}>
-      <Tooltip title={t("notifications.tooltips.job-watchers")}>
-        <Button
-          shape="circle"
-          type={isWatching ? "primary" : "default"}
-          icon={isWatching ? <EyeFilled /> : <EyeOutlined />}
-          loading={watcherLoading}
-        />
-      </Tooltip>
-    </Popover>
-  );
-}

client/src/components/job-watcher-toggle/job-watcher-toggle.container.jsx

@@ -1,219 +0,0 @@
-import { useCallback, useEffect, useMemo, useState } from "react";
-import { useMutation, useQuery } from "@apollo/client";
-import { ADD_JOB_WATCHER, GET_JOB_WATCHERS, REMOVE_JOB_WATCHER } from "../../graphql/jobs.queries.js";
-import { connect } from "react-redux";
-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";
-
-const mapStateToProps = createStructuredSelector({
-  bodyshop: selectBodyshop,
-  currentUser: selectCurrentUser
-});
-
-function JobWatcherToggleContainer({ job, currentUser, bodyshop }) {
-  const {
-    treatments: { Enhanced_Payroll }
-  } = useSplitTreatments({
-    attributes: {},
-    names: ["Enhanced_Payroll"],
-    splitKey: bodyshop && bodyshop.imexshopid
-  });
-
-  const userEmail = currentUser.email;
-  const jobid = job.id;
-
-  const [open, setOpen] = useState(false);
-  const [selectedWatcher, setSelectedWatcher] = useState(null);
-  const [selectedTeam, setSelectedTeam] = useState(null);
-
-  // Fetch current watchers with refetch capability
-  const {
-    data: watcherData,
-    loading: watcherLoading,
-    refetch
-  } = useQuery(GET_JOB_WATCHERS, {
-    variables: { jobid },
-    fetchPolicy: "cache-and-network" // Ensure fresh data from server
-  });
-
-  // Refetch jobWatchers when the popover opens (open changes to true)
-  useEffect(() => {
-    if (open) {
-      refetch().catch((err) =>
-        console.error(`Something went wrong fetching Notification Watchers on popover open: ${err?.message}`, {
-          stack: err?.stack
-        })
-      );
-    }
-  }, [open, refetch]);
-
-  const jobWatchers = useMemo(() => (watcherData?.job_watchers ? [...watcherData.job_watchers] : []), [watcherData]);
-  const isWatching = jobWatchers.some((w) => w.user_email === userEmail);
-
-  const [addWatcher, { loading: adding }] = useMutation(ADD_JOB_WATCHER, {
-    onCompleted: () =>
-      refetch().catch((err) =>
-        console.error(`Something went wrong fetching Notification Watchers after add: ${err?.message}`, {
-          stack: err?.stack
-        })
-      ),
-    onError: (err) => {
-      if (err.graphQLErrors && err.graphQLErrors.length > 0) {
-        const errorMessage = err.graphQLErrors[0].message;
-        if (
-          errorMessage.includes("Uniqueness violation") ||
-          errorMessage.includes("idx_job_watchers_jobid_user_email_unique")
-        ) {
-          console.warn("Watcher already exists for this job and user.");
-          refetch().catch((err) =>
-            console.error(
-              `Something went wrong fetching Notification Watchers after uniqueness violation: ${err?.message}`,
-              { stack: err?.stack }
-            )
-          ); // Sync with server to ensure UI reflects actual state
-        } else {
-          console.error(`Error adding job watcher: ${errorMessage}`);
-        }
-      } else {
-        console.error(`Unexpected error adding job watcher: ${err.message || JSON.stringify(err)}`);
-      }
-    },
-    update(cache, { data }) {
-      if (!data || !data.insert_job_watchers_one) {
-        console.warn("No data or insert_job_watchers_one returned from mutation, skipping cache update.");
-        refetch().catch((err) =>
-          console.error(`Something went wrong updating Notification Watchers after add: ${err?.message}`, {
-            stack: err?.stack
-          })
-        );
-        return;
-      }
-
-      const insert_job_watchers_one = data.insert_job_watchers_one;
-      const existingData = cache.readQuery({
-        query: GET_JOB_WATCHERS,
-        variables: { jobid }
-      });
-
-      cache.writeQuery({
-        query: GET_JOB_WATCHERS,
-        variables: { jobid },
-        data: {
-          ...existingData,
-          job_watchers: [...(existingData?.job_watchers || []), insert_job_watchers_one]
-        }
-      });
-    }
-  });
-
-  const [removeWatcher, { loading: removing }] = useMutation(REMOVE_JOB_WATCHER, {
-    onCompleted: () =>
-      refetch().catch((err) =>
-        console.error(`Something went wrong fetching Notification Watchers after remove: ${err?.message}`, {
-          stack: err?.stack
-        })
-      ), // Refetch to sync with server after success
-    onError: (err) => console.error(`Error removing job watcher: ${err.message}`),
-    update(cache, { data: { delete_job_watchers } }) {
-      const existingData = cache.readQuery({
-        query: GET_JOB_WATCHERS,
-        variables: { jobid }
-      });
-
-      const deletedWatcher = delete_job_watchers.returning[0];
-      const updatedWatchers = deletedWatcher
-        ? (existingData?.job_watchers || []).filter((watcher) => watcher.user_email !== deletedWatcher.user_email)
-        : existingData?.job_watchers || [];
-
-      cache.writeQuery({
-        query: GET_JOB_WATCHERS,
-        variables: { jobid },
-        data: {
-          ...existingData,
-          job_watchers: updatedWatchers
-        }
-      });
-    }
-  });
-
-  const handleToggleSelf = useCallback(async () => {
-    if (adding || removing) return;
-    if (isWatching) {
-      await removeWatcher({ variables: { jobid, userEmail } });
-    } else {
-      await addWatcher({ variables: { jobid, userEmail } });
-    }
-  }, [isWatching, addWatcher, removeWatcher, jobid, userEmail, adding, removing]);
-
-  const handleRemoveWatcher = useCallback(
-    async (email) => {
-      if (removing) return;
-      await removeWatcher({ variables: { jobid, userEmail: email } });
-    },
-    [removeWatcher, jobid, removing]
-  );
-
-  const handleWatcherSelect = useCallback(
-    async (selectedUser) => {
-      if (adding || removing) return;
-      const employee = bodyshop.employees.find((e) => e.id === selectedUser);
-      if (!employee) return;
-
-      const email = employee.user_email;
-      const isAlreadyWatching = jobWatchers.some((w) => w.user_email === email);
-
-      if (isAlreadyWatching) {
-        await handleRemoveWatcher(email);
-      } else {
-        await addWatcher({ variables: { jobid, userEmail: email } });
-      }
-      setSelectedWatcher(null);
-    },
-    [jobWatchers, addWatcher, handleRemoveWatcher, jobid, bodyshop, adding, removing]
-  );
-
-  const handleTeamSelect = useCallback(
-    async (team) => {
-      if (adding) return;
-      const selectedTeamMembers = JSON.parse(team);
-      const newWatchers = selectedTeamMembers.filter(
-        (email) => !jobWatchers.some((watcher) => watcher.user_email === email)
-      );
-
-      if (newWatchers.length === 0) {
-        console.warn("All selected team members are already watchers.");
-        setSelectedTeam(null);
-        return;
-      }
-      await Promise.all(newWatchers.map((email) => addWatcher({ variables: { jobid, userEmail: email } })));
-    },
-    [jobWatchers, addWatcher, jobid, adding]
-  );
-
-  return (
-    <JobWatcherToggleComponent
-      jobWatchers={jobWatchers}
-      isWatching={isWatching}
-      watcherLoading={watcherLoading}
-      adding={adding}
-      removing={removing}
-      open={open}
-      setOpen={setOpen}
-      selectedWatcher={selectedWatcher}
-      setSelectedWatcher={setSelectedWatcher}
-      selectedTeam={selectedTeam}
-      setSelectedTeam={setSelectedTeam}
-      bodyshop={bodyshop}
-      Enhanced_Payroll={Enhanced_Payroll}
-      handleToggleSelf={handleToggleSelf}
-      handleRemoveWatcher={handleRemoveWatcher}
-      handleWatcherSelect={handleWatcherSelect}
-      handleTeamSelect={handleTeamSelect}
-      currentUser={currentUser}
-    />
-  );
-}
-
-export default connect(mapStateToProps)(JobWatcherToggleContainer);

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

@@ -4,12 +4,12 @@ import { useSplitTreatments } from "@splitsoftware/splitio-react";
 import { Button, Card, Dropdown, Form, Input, Modal, Popconfirm, Popover, Select, Space } from "antd";
 import axios from "axios";
 import parsePhoneNumber from "libphonenumber-js";
-import { useMemo, useState } from "react";
+import { useContext, useMemo, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { Link, useNavigate } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
-import { useSocket } from "../../contexts/SocketIO/useSocket.jsx";
+import SocketContext from "../../contexts/SocketIO/socketContext.jsx";
 import { auth, logImEXEvent } from "../../firebase/firebase.utils";
 import { CANCEL_APPOINTMENTS_BY_JOB_ID, INSERT_MANUAL_APPT } from "../../graphql/appointments.queries";
 import { GET_CURRENT_QUESTIONSET_ID, INSERT_CSI } from "../../graphql/csi.queries";
@@ -28,11 +28,11 @@ import { HasFeatureAccess } from "../feature-wrapper/feature-wrapper.component";
 import FormDateTimePickerComponent from "../form-date-time-picker/form-date-time-picker.component";
 import LockerWrapperComponent from "../lock-wrapper/lock-wrapper.component";
 import RbacWrapper from "../rbac-wrapper/rbac-wrapper.component";
-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";
+import ShareToTeamsButton from "../share-to-teams/share-to-teams.component.jsx";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -130,7 +130,7 @@ export function JobsDetailHeaderActions({
   const [updateJob] = useMutation(UPDATE_JOB);
   const [voidJob] = useMutation(VOID_JOB);
   const [cancelAllAppointments] = useMutation(CANCEL_APPOINTMENTS_BY_JOB_ID);
-  const { socket } = useSocket();
+  const { socket } = useContext(SocketContext);
   const notification = useNotification();
 
   const {
@@ -775,14 +775,15 @@ export function JobsDetailHeaderActions({
     key: "enterpayments",
     id: "job-actions-enterpayments",
     disabled: !job.converted,
-    label: t("menus.header.enterpayment"),
+    label: <LockerWrapperComponent featureName="payments">{t("menus.header.enterpayment")}</LockerWrapperComponent>,
     onClick: () => {
       logImEXEvent("job_header_enter_payment");
 
-      setPaymentContext({
-        actions: {},
-        context: { jobid: job.id }
-      });
+      HasFeatureAccess({ featureName: "payments", bodyshop }) &&
+        setPaymentContext({
+          actions: {},
+          context: { jobid: job.id }
+        });
     }
   });
 

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

@@ -119,7 +119,7 @@ export function JobsDetailHeader({ job, bodyshop, disabled }) {
               <DataLabel label={t("jobs.labels.contracts")}>
                 {job.cccontracts.map((c, index) => (
                   <Space key={c.id} wrap>
-                    <Link to={`/manage/courtesycars/contracts/${c.id}`}>
+                    <Link  to={`/manage/courtesycars/contracts/${c.id}`}>
                       {`${c.agreementnumber} - ${c.courtesycar.fleetnumber} ${c.courtesycar.year} ${c.courtesycar.make} ${c.courtesycar.model}`}
                       {index !== job.cccontracts.length - 1 ? "," : null}
                     </Link>

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

@@ -5,7 +5,6 @@ import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { selectJobReadOnly } from "../../redux/application/application.selectors";
 import { selectBodyshop } from "../../redux/user/user.selectors";
-import InstanceRenderManager from "../../utils/instanceRenderMgr";
 import CABCpvrtCalculator from "../ca-bc-pvrt-calculator/ca-bc-pvrt-calculator.component";
 import CurrencyInput from "../form-items-formatted/currency-form-item.component";
 import JobsDetailRatesChangeButton from "../jobs-detail-rates-change-button/jobs-detail-rates-change-button.component";
@@ -15,8 +14,9 @@ import JobsDetailRatesLabor from "./jobs-detail-rates.labor.component";
 import JobsDetailRatesMaterials from "./jobs-detail-rates.materials.component";
 import JobsDetailRatesOther from "./jobs-detail-rates.other.component";
 import JobsDetailRatesParts from "./jobs-detail-rates.parts.component";
-import JobsDetailRatesProfileOVerride from "./jobs-detail-rates.profile-override.component";
 import JobsDetailRatesTaxes from "./jobs-detail-rates.taxes.component";
+import JobsDetailRatesProfileOVerride from "./jobs-detail-rates.profile-override.component";
+import InstanceRenderManager from "../../utils/instanceRenderMgr";
 
 const mapStateToProps = createStructuredSelector({
   jobRO: selectJobReadOnly,
@@ -66,48 +66,14 @@ export function JobsDetailRates({ jobRO, form, job, bodyshop }) {
           </Space>
         )}
         <Form.Item label={t("jobs.fields.auto_add_ats")} name="auto_add_ats" valuePropName="checked">
-          <Switch
-            disabled={jobRO}
-            onChange={(checked) => {
-              if (checked) {
-                form.setFieldsValue({ flat_rate_ats: false });
-                form.setFieldsValue({ rate_ats: form.getFieldValue('rate_ats') || bodyshop.shoprates.rate_ats });
-              }
-            }}
-          />
+          <Switch disabled={jobRO} />
         </Form.Item>
+
         <Form.Item noStyle shouldUpdate={(prev, cur) => prev.auto_add_ats !== cur.auto_add_ats}>
           {() => {
             if (form.getFieldValue("auto_add_ats"))
               return (
-                <Form.Item label={t("jobs.fields.rate_ats")} name="rate_ats">
-                  <CurrencyInput disabled={jobRO} />
-                </Form.Item>
-              );
-
-            return null;
-          }}
-        </Form.Item>
-        <Form.Item label={t("jobs.fields.flat_rate_ats")} name="flat_rate_ats" valuePropName="checked">
-          <Switch
-            disabled={jobRO}
-            onChange={(checked) => {
-              if (checked) {
-                form.setFieldsValue({ auto_add_ats: false });
-                form.setFieldsValue({ rate_ats_flat: form.getFieldValue('rate_ats_flat') || bodyshop.shoprates.rate_ats_flat });
-
-              }
-            }}
-          />
-        </Form.Item>
-        <Form.Item noStyle shouldUpdate={(prev, cur) => prev.flat_rate_ats !== cur.flat_rate_ats}>
-          {() => {
-            if (form.getFieldValue("flat_rate_ats"))
-              return (
-                <Form.Item
-                  label={t("jobs.fields.rate_ats_flat")}
-                  name="rate_ats_flat"
-                >
+                <Form.Item label={t("jobs.fields.rate_ats")} name="rate_ats" initialValue={bodyshop.shoprates.rate_atp}>
                   <CurrencyInput disabled={jobRO} />
                 </Form.Item>
               );

client/src/components/notification-center/notification-center.component.jsx

@@ -1,122 +0,0 @@
-import { Virtuoso } from "react-virtuoso";
-import { 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 { DateTimeFormat } from "../../utils/DateFormatter.jsx";
-
-const { Text, Title } = Typography;
-
-/**
- * Notification Center Component
- * @type {React.ForwardRefExoticComponent<React.PropsWithoutRef<{readonly visible?: *, readonly onClose?: *, readonly notifications?: *, readonly loading?: *, readonly showUnreadOnly?: *, readonly toggleUnreadOnly?: *, readonly markAllRead?: *, readonly loadMore?: *, readonly onNotificationClick?: *, readonly unreadCount?: *}> & React.RefAttributes<unknown>>}
- */
-const NotificationCenterComponent = forwardRef(
-  (
-    {
-      visible,
-      onClose,
-      notifications,
-      loading,
-      showUnreadOnly,
-      toggleUnreadOnly,
-      markAllRead,
-      loadMore,
-      onNotificationClick,
-      unreadCount
-    },
-    ref
-  ) => {
-    const { t } = useTranslation();
-    const navigate = useNavigate();
-    const virtuosoRef = useRef(null);
-
-    // Scroll to top when showUnreadOnly changes
-    useEffect(() => {
-      if (virtuosoRef.current) {
-        virtuosoRef.current.scrollToIndex({ index: 0, behavior: "smooth" });
-      }
-    }, [showUnreadOnly]);
-
-    const renderNotification = (index, notification) => {
-      const handleClick = () => {
-        if (!notification.read) {
-          onNotificationClick(notification.id);
-        }
-        navigate(`/manage/jobs/${notification.jobid}`);
-      };
-
-      return (
-        <div
-          key={`${notification.id}-${index}`}
-          className={`notification-item ${notification.read ? "notification-read" : "notification-unread"}`}
-          onClick={handleClick}
-        >
-          <Badge dot={!notification.read}>
-            <div className="notification-content">
-              <Title level={5} className="notification-title">
-                <span className="ro-number">
-                  {t("notifications.labels.ro-number", { ro_number: notification.roNumber || t("general.labels.na") })}
-                </span>
-                <Text type="secondary" className="relative-time" title={DateTimeFormat(notification.created_at)}>
-                  {day(notification.created_at).fromNow()}
-                </Text>
-              </Title>
-              <Text strong={!notification.read} className="notification-body">
-                <ul>
-                  {notification.scenarioText.map((text, idx) => (
-                    <li key={`${notification.id}-${idx}`}>{text}</li>
-                  ))}
-                </ul>
-              </Text>
-            </div>
-          </Badge>
-        </div>
-      );
-    };
-
-    return (
-      <div className={`notification-center ${visible ? "visible" : ""}`} ref={ref}>
-        <div className="notification-header">
-          <Space direction="horizontal">
-            <h3>{t("notifications.labels.notification-center")}</h3>
-            {loading && <Spin spinning={loading} size="small"></Spin>}
-          </Space>
-          <div className="notification-controls">
-            <Tooltip title={t("notifications.labels.show-unread-only")}>
-              <Space size={4} align="center" className="notification-toggle">
-                {showUnreadOnly ? (
-                  <EyeFilled className="notification-toggle-icon" />
-                ) : (
-                  <EyeOutlined className="notification-toggle-icon" />
-                )}
-                <Switch checked={showUnreadOnly} onChange={(checked) => toggleUnreadOnly(checked)} size="small" />
-              </Space>
-            </Tooltip>
-            <Tooltip title={t("notifications.labels.mark-all-read")}>
-              <Button
-                type="link"
-                icon={!unreadCount ? <CheckCircleFilled /> : <CheckCircleOutlined />}
-                onClick={markAllRead}
-                disabled={!unreadCount}
-              />
-            </Tooltip>
-          </div>
-        </div>
-        <Virtuoso
-          ref={virtuosoRef}
-          style={{ height: "400px", width: "100%" }}
-          data={notifications}
-          totalCount={notifications.length}
-          endReached={loadMore}
-          itemContent={renderNotification}
-        />
-      </div>
-    );
-  }
-);
-
-export default NotificationCenterComponent;

client/src/components/notification-center/notification-center.container.jsx

@@ -1,202 +0,0 @@
-import { useCallback, useEffect, useMemo, useRef, useState } from "react";
-import { useQuery } from "@apollo/client";
-import { connect } from "react-redux";
-import NotificationCenterComponent from "./notification-center.component";
-import { GET_NOTIFICATIONS } from "../../graphql/notifications.queries";
-import { INITIAL_NOTIFICATIONS, useSocket } from "../../contexts/SocketIO/useSocket.jsx";
-import { createStructuredSelector } from "reselect";
-import { selectBodyshop } from "../../redux/user/user.selectors.js";
-import day from "../../utils/day.js";
-
-// This will be used to poll for notifications when the socket is disconnected
-const NOTIFICATION_POLL_INTERVAL_SECONDS = 60;
-
-/**
- * Notification Center Container
- * @param visible
- * @param onClose
- * @param bodyshop
- * @param unreadCount
- * @returns {JSX.Element}
- * @constructor
- */
-const NotificationCenterContainer = ({ visible, onClose, bodyshop, unreadCount }) => {
-  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 baseWhereClause = useMemo(() => {
-    return { associationid: { _eq: userAssociationId } };
-  }, [userAssociationId]);
-
-  const whereClause = useMemo(() => {
-    return showUnreadOnly ? { ...baseWhereClause, read: { _is_null: true } } : baseWhereClause;
-  }, [baseWhereClause, showUnreadOnly]);
-
-  const {
-    data,
-    fetchMore,
-    loading: queryLoading,
-    refetch
-  } = useQuery(GET_NOTIFICATIONS, {
-    variables: {
-      limit: INITIAL_NOTIFICATIONS,
-      offset: 0,
-      where: whereClause
-    },
-    fetchPolicy: "cache-and-network",
-    notifyOnNetworkStatusChange: true,
-    pollInterval: isConnected ? 0 : day.duration(NOTIFICATION_POLL_INTERVAL_SECONDS, "seconds").asMilliseconds(),
-    skip: !userAssociationId,
-    onError: (err) => {
-      console.error(`Error polling Notifications: ${err?.message || ""}`);
-      setTimeout(() => refetch(), day.duration(2, "seconds").asMilliseconds());
-    }
-  });
-
-  useEffect(() => {
-    const handleClickOutside = (event) => {
-      // Prevent open + close behavior from the header
-      if (event.target.closest("#header-notifications")) return;
-      if (visible && notificationRef.current && !notificationRef.current.contains(event.target)) {
-        onClose();
-      }
-    };
-    document.addEventListener("mousedown", handleClickOutside);
-    return () => document.removeEventListener("mousedown", handleClickOutside);
-  }, [visible, onClose]);
-
-  useEffect(() => {
-    if (data?.notifications) {
-      const processedNotifications = data.notifications
-        .map((notif) => {
-          let scenarioText;
-          let scenarioMeta;
-          try {
-            scenarioText = notif.scenario_text ? JSON.parse(notif.scenario_text) : [];
-            scenarioMeta = notif.scenario_meta ? JSON.parse(notif.scenario_meta) : {};
-          } catch (e) {
-            console.error("Error parsing JSON for notification:", notif.id, e);
-            scenarioText = [notif.fcm_text || "Invalid notification data"];
-            scenarioMeta = {};
-          }
-          if (!Array.isArray(scenarioText)) scenarioText = [scenarioText];
-          const roNumber = notif.job.ro_number;
-          if (!Array.isArray(scenarioMeta)) scenarioMeta = [scenarioMeta];
-          return {
-            id: notif.id,
-            jobid: notif.jobid,
-            associationid: notif.associationid,
-            scenarioText,
-            scenarioMeta,
-            roNumber,
-            created_at: notif.created_at,
-            read: notif.read,
-            __typename: notif.__typename
-          };
-        })
-        .sort((a, b) => new Date(b.created_at) - new Date(a.created_at));
-      setNotifications(processedNotifications);
-    }
-  }, [data]);
-
-  const loadMore = useCallback(() => {
-    if (!queryLoading && data?.notifications.length) {
-      setIsLoading(true); // Show spinner during fetchMore
-      fetchMore({
-        variables: { offset: data.notifications.length, where: whereClause },
-        updateQuery: (prev, { fetchMoreResult }) => {
-          if (!fetchMoreResult) return prev;
-          return {
-            notifications: [...prev.notifications, ...fetchMoreResult.notifications]
-          };
-        }
-      })
-        .catch((err) => {
-          console.error("Fetch more error:", err);
-        })
-        .finally(() => setIsLoading(false)); // Hide spinner when done
-    }
-  }, [data?.notifications?.length, fetchMore, queryLoading, whereClause]);
-
-  const handleToggleUnreadOnly = (value) => {
-    setShowUnreadOnly(value);
-  };
-
-  const handleMarkAllRead = useCallback(() => {
-    setIsLoading(true);
-    markAllNotificationsRead()
-      .then(() => {
-        const timestamp = new Date().toISOString();
-        setNotifications((prev) => {
-          const updatedNotifications = prev.map((notif) =>
-            notif.read === null && notif.associationid === userAssociationId
-              ? {
-                  ...notif,
-                  read: timestamp
-                }
-              : notif
-          );
-          // Filter out read notifications if in unread only mode
-          return showUnreadOnly ? updatedNotifications.filter((notif) => !notif.read) : updatedNotifications;
-        });
-      })
-      .catch((e) => console.error(`Error marking all notifications read: ${e?.message || ""}`))
-      .finally(() => setIsLoading(false));
-  }, [markAllNotificationsRead, userAssociationId, showUnreadOnly]);
-
-  const handleNotificationClick = useCallback(
-    (notificationId) => {
-      setIsLoading(true);
-      markNotificationRead({ variables: { id: notificationId } })
-        .then(() => {
-          const timestamp = new Date().toISOString();
-          setNotifications((prev) => {
-            const updatedNotifications = prev.map((notif) =>
-              notif.id === notificationId && !notif.read ? { ...notif, read: timestamp } : notif
-            );
-            // Filter out the read notification if in unread only mode
-            return showUnreadOnly ? updatedNotifications.filter((notif) => !notif.read) : updatedNotifications;
-          });
-        })
-        .catch((e) => console.error(`Error marking notification read: ${e?.message || ""}`))
-        .finally(() => setIsLoading(false));
-    },
-    [markNotificationRead, showUnreadOnly]
-  );
-
-  useEffect(() => {
-    if (visible && !isConnected) {
-      setIsLoading(true);
-      refetch()
-        .catch((err) => console.error(`Error re-fetching notifications: ${err?.message || ""}`))
-        .finally(() => setIsLoading(false));
-    }
-  }, [visible, isConnected, refetch]);
-
-  return (
-    <NotificationCenterComponent
-      ref={notificationRef}
-      visible={visible}
-      onClose={onClose}
-      notifications={notifications}
-      loading={isLoading}
-      showUnreadOnly={showUnreadOnly}
-      toggleUnreadOnly={handleToggleUnreadOnly}
-      markAllRead={handleMarkAllRead}
-      loadMore={loadMore}
-      onNotificationClick={handleNotificationClick}
-      unreadCount={unreadCount}
-    />
-  );
-};
-
-const mapStateToProps = createStructuredSelector({
-  bodyshop: selectBodyshop
-});
-
-export default connect(mapStateToProps, null)(NotificationCenterContainer);

client/src/components/notification-center/notification-center.styles.scss

@@ -1,175 +0,0 @@
-.notification-center {
-  position: absolute;
-  top: 64px;
-  right: 0;
-  width: 400px;
-  max-width: 400px;
-  background: #fff;
-  color: rgba(0, 0, 0, 0.85);
-  border: 1px solid #d9d9d9;
-  border-radius: 6px;
-  box-shadow: 0 6px 16px rgba(0, 0, 0, 0.08), 0 3px 6px rgba(0, 0, 0, 0.06);
-  z-index: 1000;
-  display: none;
-  overflow-x: hidden;
-
-  &.visible {
-    display: block;
-  }
-
-  .notification-header {
-    padding: 4px 16px;
-    border-bottom: 1px solid #f0f0f0;
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    background: #fafafa;
-
-    h3 {
-      margin: 0;
-      font-size: 14px;
-      color: rgba(0, 0, 0, 0.85);
-    }
-
-    .notification-controls {
-      display: flex;
-      align-items: center;
-      gap: 8px;
-
-      // Styles for the eye icon and switch (custom classes)
-      .notification-toggle {
-        align-items: center; // Ensure vertical alignment
-      }
-
-      .notification-toggle-icon {
-        font-size: 14px;
-        color: #1677ff;
-        vertical-align: middle;
-      }
-
-      .ant-switch {
-        &.ant-switch-small {
-          min-width: 28px;
-          height: 16px;
-          line-height: 16px;
-
-          .ant-switch-handle {
-            width: 12px;
-            height: 12px;
-          }
-
-          &.ant-switch-checked {
-            background-color: #1677ff;
-            .ant-switch-handle {
-              left: calc(100% - 14px);
-            }
-          }
-        }
-      }
-
-      // Styles for the "Mark All Read" button (restore original link button style)
-      .ant-btn-link {
-        padding: 0;
-        color: #1677ff;
-
-        &:hover {
-          color: #69b1ff;
-        }
-
-        &:disabled {
-          color: rgba(0, 0, 0, 0.25);
-          cursor: not-allowed;
-        }
-
-        &.active {
-          color: #0958d9;
-        }
-      }
-    }
-  }
-
-  .notification-read {
-    background: #fff;
-    color: rgba(0, 0, 0, 0.65);
-  }
-
-  .notification-unread {
-    background: #f5f5f5;
-    color: rgba(0, 0, 0, 0.85);
-  }
-
-  .notification-item {
-    padding: 12px 16px;
-    border-bottom: 1px solid #f0f0f0;
-    display: block;
-    overflow: visible;
-    width: 100%;
-    box-sizing: border-box;
-    cursor: pointer;
-
-    &:hover {
-      background: #fafafa;
-    }
-
-    .notification-content {
-      width: 100%;
-    }
-
-    .notification-title {
-      margin: 0;
-      display: flex;
-      justify-content: space-between;
-      align-items: center;
-      width: 100%;
-      box-sizing: border-box;
-
-      .ro-number {
-        margin: 0;
-        color: #1677ff;
-        flex-shrink: 0;
-        white-space: nowrap;
-      }
-
-      .relative-time {
-        margin: 0;
-        font-size: 12px;
-        color: rgba(0, 0, 0, 0.45);
-        white-space: nowrap;
-        flex-shrink: 0;
-        margin-left: auto;
-      }
-    }
-
-    .notification-body {
-      margin-top: 4px;
-
-      .ant-typography {
-        color: inherit;
-      }
-
-      ul {
-        margin: 0;
-        padding: 0;
-      }
-
-      li {
-        margin-bottom: 2px;
-      }
-    }
-  }
-
-  .ant-badge {
-    width: 100%;
-  }
-
-  .ant-alert {
-    margin: 8px;
-    background: #fff1f0;
-    color: rgba(0, 0, 0, 0.85);
-    border: 1px solid #ffa39e;
-
-    .ant-alert-message {
-      color: #ff4d4f;
-    }
-  }
-}

client/src/components/notification-settings/column-header-checkbox.component.jsx

@@ -1,56 +0,0 @@
-import { notificationScenarios } from "../../utils/jobNotificationScenarios.js";
-import { Checkbox, Form } from "antd";
-import { useTranslation } from "react-i18next";
-import PropTypes from "prop-types";
-
-/**
- * ColumnHeaderCheckbox
- * @param channel
- * @param form
- * @param disabled
- * @param onHeaderChange
- * @returns {JSX.Element}
- * @constructor
- */
-const ColumnHeaderCheckbox = ({ channel, form, disabled = false, onHeaderChange }) => {
-  const { t } = useTranslation();
-
-  // Subscribe to all form values so that this component re-renders on changes.
-  const formValues = Form.useWatch([], form) || {};
-
-  // Determine if all scenarios for this channel are checked.
-  const allChecked =
-    notificationScenarios.length > 0 && notificationScenarios.every((scenario) => formValues[scenario]?.[channel]);
-
-  const onChange = (e) => {
-    const checked = e.target.checked;
-    // Get current form values.
-    const currentValues = form.getFieldsValue();
-    // Update each scenario for this channel.
-    const newValues = { ...currentValues };
-    notificationScenarios.forEach((scenario) => {
-      newValues[scenario] = { ...newValues[scenario], [channel]: checked };
-    });
-    // Update form values.
-    form.setFieldsValue(newValues);
-    // Manually mark the form as dirty.
-    if (onHeaderChange) {
-      onHeaderChange();
-    }
-  };
-
-  return (
-    <Checkbox onChange={onChange} checked={allChecked} disabled={disabled}>
-      {t(`notifications.channels.${channel}`)}
-    </Checkbox>
-  );
-};
-
-ColumnHeaderCheckbox.propTypes = {
-  channel: PropTypes.oneOf(["app", "email", "fcm"]).isRequired,
-  form: PropTypes.object.isRequired,
-  disabled: PropTypes.bool,
-  onHeaderChange: PropTypes.func
-};
-
-export default ColumnHeaderCheckbox;

client/src/components/notification-settings/notification-settings-form.component.jsx

@@ -1,168 +0,0 @@
-import { useMutation, useQuery } from "@apollo/client";
-import { useEffect, useState } from "react";
-import { Button, Card, Checkbox, Form, Space, Table } from "antd";
-import { useTranslation } from "react-i18next";
-import { connect } from "react-redux";
-import { createStructuredSelector } from "reselect";
-import { 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 { 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";
-
-/**
- * Notifications Settings Form
- * @param currentUser
- * @returns {JSX.Element}
- * @constructor
- */
-const NotificationSettingsForm = ({ currentUser }) => {
-  const { t } = useTranslation();
-  const [form] = Form.useForm();
-  const [initialValues, setInitialValues] = useState({});
-  const [isDirty, setIsDirty] = useState(false);
-  const notification = useNotification();
-
-  // Fetch notification settings.
-  const { loading, error, data } = useQuery(QUERY_NOTIFICATION_SETTINGS, {
-    fetchPolicy: "network-only",
-    nextFetchPolicy: "network-only",
-    variables: { email: currentUser.email },
-    skip: !currentUser
-  });
-
-  const [updateNotificationSettings, { loading: saving }] = useMutation(UPDATE_NOTIFICATION_SETTINGS);
-
-  // 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 formattedValues = notificationScenarios.reduce((acc, scenario) => {
-        acc[scenario] = settings[scenario] ?? { app: false, email: false, fcm: false };
-        return acc;
-      }, {});
-
-      setInitialValues(formattedValues);
-      form.setFieldsValue(formattedValues);
-      setIsDirty(false); // Reset dirty state when new data loads.
-    }
-  }, [data, form]);
-
-  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 {
-        notification.error({ message: t("notifications.labels.notification-settings-failure") });
-      }
-    }
-  };
-
-  // Mark the form as dirty on any manual change.
-  const handleFormChange = () => {
-    setIsDirty(true);
-  };
-
-  const handleReset = () => {
-    form.setFieldsValue(initialValues);
-    setIsDirty(false);
-  };
-
-  if (error) return <AlertComponent type="error" message={error.message} />;
-  if (loading) return <LoadingSpinner />;
-
-  const columns = [
-    {
-      title: t("notifications.labels.scenario"),
-      dataIndex: "scenarioLabel",
-      key: "scenario",
-      render: (_, record) => t(`notifications.scenarios.${record.key}`),
-      width: "90%"
-    },
-    {
-      title: <ColumnHeaderCheckbox channel="app" form={form} onHeaderChange={() => setIsDirty(true)} />,
-      dataIndex: "app",
-      key: "app",
-      align: "center",
-      render: (_, record) => (
-        <Form.Item name={[record.key, "app"]} valuePropName="checked" noStyle>
-          <Checkbox />
-        </Form.Item>
-      )
-    },
-    {
-      title: <ColumnHeaderCheckbox channel="email" form={form} onHeaderChange={() => setIsDirty(true)} />,
-      dataIndex: "email",
-      key: "email",
-      align: "center",
-      render: (_, record) => (
-        <Form.Item name={[record.key, "email"]} valuePropName="checked" noStyle>
-          <Checkbox />
-        </Form.Item>
-      )
-    }
-    // TODO: Disabled for now until FCM is implemented.
-    // {
-    //   title: <ColumnHeaderCheckbox channel="fcm" form={form} disabled onHeaderChange={() => setIsDirty(true)} />,
-    //   dataIndex: "fcm",
-    //   key: "fcm",
-    //   align: "center",
-    //   render: (_, record) => (
-    //     <Form.Item name={[record.key, "fcm"]} valuePropName="checked" noStyle>
-    //       <Checkbox disabled />
-    //     </Form.Item>
-    //   )
-    // }
-  ];
-
-  const dataSource = notificationScenarios.map((scenario) => ({ key: scenario }));
-
-  return (
-    <Form
-      form={form}
-      onFinish={handleSave}
-      onValuesChange={handleFormChange}
-      initialValues={initialValues}
-      autoComplete="off"
-      layout="vertical"
-    >
-      <Card
-        title={t("notifications.labels.notificationscenarios")}
-        extra={
-          <Space>
-            <Button type="default" onClick={handleReset} disabled={!isDirty}>
-              {t("general.actions.clear")}
-            </Button>
-
-            <Button type="primary" htmlType="submit" disabled={!isDirty} loading={saving}>
-              {t("notifications.labels.save")}
-            </Button>
-          </Space>
-        }
-      >
-        <Table dataSource={dataSource} columns={columns} pagination={false} bordered rowKey="key" />
-      </Card>
-    </Form>
-  );
-};
-
-NotificationSettingsForm.propTypes = {
-  currentUser: PropTypes.shape({
-    email: PropTypes.string.isRequired
-  }).isRequired
-};
-
-const mapStateToProps = createStructuredSelector({
-  currentUser: selectCurrentUser
-});
-
-export default connect(mapStateToProps)(NotificationSettingsForm);

client/src/components/payments-generate-link/payments-generate-link.component.jsx

@@ -2,15 +2,15 @@ import { CopyFilled } from "@ant-design/icons";
 import { Button, Form, message, Popover, Space } from "antd";
 import axios from "axios";
 import Dinero from "dinero.js";
-import { parsePhoneNumberWithError, ParseError } from "libphonenumber-js";
-import React, { useState } from "react";
+import { parsePhoneNumber } from "libphonenumber-js";
+import React, { useContext, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { openChatByPhone, setMessage } from "../../redux/messaging/messaging.actions";
 import { selectBodyshop, selectCurrentUser } from "../../redux/user/user.selectors";
 import CurrencyFormItemComponent from "../form-items-formatted/currency-form-item.component";
-import { useSocket } from "../../contexts/SocketIO/useSocket.jsx";
+import SocketContext from "../../contexts/SocketIO/socketContext.jsx";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -29,34 +29,22 @@ export function PaymentsGenerateLink({ bodyshop, currentUser, callback, job, ope
   const [open, setOpen] = useState(false);
   const [loading, setLoading] = useState(false);
   const [paymentLink, setPaymentLink] = useState(null);
-  const { socket } = useSocket();
+  const { socket } = useContext(SocketContext);
 
   const handleFinish = async ({ amount }) => {
     setLoading(true);
     let p;
     try {
-      // Updated to use parsePhoneNumberWithError
-      p = parsePhoneNumberWithError(job.ownr_ph1 || "", "CA");
+      p = parsePhoneNumber(job.ownr_ph1 || "", "CA");
     } catch (error) {
-      if (error instanceof ParseError) {
-        // Handle specific parsing errors
-        console.log(`Phone number parsing failed: ${error.message}`);
-      } else {
-        // Handle other unexpected errors
-        console.log("Unexpected error while parsing phone number:", error);
-      }
+      console.log("Unable to parse phone number");
     }
     setLoading(true);
     const response = await axios.post("/intellipay/generate_payment_url", {
       bodyshop,
       amount: amount,
       account: job.ro_number,
-      comment: btoa(
-        JSON.stringify({
-          payments: [{ jobid: job.id, amount }],
-          userEmail: currentUser.email
-        })
-      )
+      comment: btoa(JSON.stringify({ payments: [{ jobid: job.id, amount }], userEmail: currentUser.email }))
     });
     setLoading(false);
     setPaymentLink(response.data.shorUrl);
@@ -118,20 +106,7 @@ export function PaymentsGenerateLink({ bodyshop, currentUser, callback, job, ope
             </Space>
             <Button
               onClick={() => {
-                let p;
-                try {
-                  // Updated second instance of phone parsing
-                  p = parsePhoneNumberWithError(job.ownr_ph1, "CA");
-                } catch (error) {
-                  if (error instanceof ParseError) {
-                    // Handle specific parsing errors
-                    console.log(`Phone number parsing failed: ${error.message}`);
-                  } else {
-                    // Handle other unexpected errors
-                    console.log("Unexpected error while parsing phone number:", error);
-                  }
-                  return;
-                }
+                const p = parsePhoneNumber(job.ownr_ph1, "CA");
                 openChatByPhone({
                   phone_num: p.formatInternational(),
                   jobid: job.id,

client/src/components/production-board-kanban/production-board-kanban.component.jsx

@@ -4,7 +4,7 @@ import { useApolloClient } from "@apollo/client";
 import { Button, Skeleton, Space } from "antd";
 import cloneDeep from "lodash/cloneDeep";
 import isEqual from "lodash/isEqual";
-import { useCallback, useEffect, useMemo, useState } from "react";
+import React, { useCallback, useEffect, useMemo, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";

client/src/components/production-board-kanban/production-board-kanban.container.jsx

@@ -1,4 +1,4 @@
-import { useEffect, useMemo, useRef } from "react";
+import React, { useContext, useEffect, useMemo, useRef } from "react";
 import { useApolloClient, useQuery, useSubscription } from "@apollo/client";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
@@ -12,7 +12,7 @@ import { QUERY_KANBAN_SETTINGS } from "../../graphql/user.queries";
 import { selectBodyshop, selectCurrentUser } from "../../redux/user/user.selectors";
 import ProductionBoardKanbanComponent from "./production-board-kanban.component";
 import { useSplitTreatments } from "@splitsoftware/splitio-react";
-import { useSocket } from "../../contexts/SocketIO/useSocket.jsx";
+import SocketContext from "../../contexts/SocketIO/socketContext.jsx";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -22,7 +22,7 @@ const mapStateToProps = createStructuredSelector({
 function ProductionBoardKanbanContainer({ bodyshop, currentUser, subscriptionType = "direct" }) {
   const fired = useRef(false);
   const client = useApolloClient();
-  const { socket } = useSocket();
+  const { socket } = useContext(SocketContext); // Get the socket from context
   const reconnectTimeout = useRef(null); // To store the reconnect timeout
   const disconnectTime = useRef(null); // To track disconnection time
   const acceptableReconnectTime = 2000; // 2 seconds threshold

client/src/components/production-list-detail/production-list-detail.component.jsx

@@ -27,8 +27,6 @@ import ScoreboardAddButton from "../job-scoreboard-add-button/job-scoreboard-add
 import LoadingSkeleton from "../loading-skeleton/loading-skeleton.component";
 import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
 import ProductionRemoveButton from "../production-remove-button/production-remove-button.component";
-import JobWatcherToggleContainer from "../job-watcher-toggle/job-watcher-toggle.container.jsx";
-import { useSocket } from "../../contexts/SocketIO/useSocket.jsx";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -43,7 +41,6 @@ export function ProductionListDetail({ bodyshop, jobs, setPrintCenterContext, te
   const search = queryString.parse(useLocation().search);
   const history = useNavigate();
   const { selected } = search;
-  const { scenarioNotificationsOn } = useSocket();
 
   const { t } = useTranslation();
   const theJob = jobs.find((j) => j.id === selected) || {};
@@ -63,12 +60,7 @@ export function ProductionListDetail({ bodyshop, jobs, setPrintCenterContext, te
     <Drawer
       title={
         <PageHeader
-          title={
-            <Space>
-              {!technician && scenarioNotificationsOn && <JobWatcherToggleContainer job={theJob} />}
-              {theJob.ro_number}
-            </Space>
-          }
+          title={theJob.ro_number}
           extra={
             <Space wrap>
               {!technician ? <ProductionRemoveButton jobId={theJob.id} /> : null}

client/src/components/production-list-table/production-list-table.container.jsx

@@ -1,5 +1,5 @@
 import { useApolloClient, useQuery, useSubscription } from "@apollo/client";
-import { useEffect, useRef, useState } from "react";
+import React, { useContext, useEffect, useState, useRef } from "react";
 import {
   QUERY_EXACT_JOB_IN_PRODUCTION,
   QUERY_EXACT_JOBS_IN_PRODUCTION,
@@ -10,11 +10,11 @@ import {
 import ProductionListTable from "./production-list-table.component";
 import _ from "lodash";
 import { useSplitTreatments } from "@splitsoftware/splitio-react";
-import { useSocket } from "../../contexts/SocketIO/useSocket.jsx";
+import SocketContext from "../../contexts/SocketIO/socketContext.jsx";
 
 export default function ProductionListTableContainer({ bodyshop, subscriptionType = "direct" }) {
   const client = useApolloClient();
-  const { socket } = useSocket();
+  const { socket } = useContext(SocketContext);
   const [joblist, setJoblist] = useState([]);
   const reconnectTimeout = useRef(null); // To store the reconnect timeout
   const disconnectTime = useRef(null); // To store the time of disconnection

client/src/components/production-remove-button/production-remove-button.component.jsx

@@ -39,7 +39,7 @@ export default function ProductionRemoveButton({ jobId }) {
   };
 
   return (
-    <Button loading={loading} onClick={handleRemoveFromProd} type="default" danger>
+    <Button loading={loading} onClick={handleRemoveFromProd} type={"danger"}>
       {t("production.actions.remove")}
     </Button>
   );

client/src/components/profile-my/profile-my.component.jsx

@@ -1,5 +1,6 @@
 import { Button, Card, Col, Form, Input } from "antd";
 import { LockOutlined } from "@ant-design/icons";
+import React from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
@@ -8,8 +9,6 @@ import { selectCurrentUser } from "../../redux/user/user.selectors";
 import { logImEXEvent, updateCurrentPassword } from "../../firebase/firebase.utils";
 import LayoutFormRow from "../layout-form-row/layout-form-row.component";
 import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
-import { useSocket } from "../../contexts/SocketIO/useSocket.jsx";
-import NotificationSettingsForm from "../notification-settings/notification-settings-form.component.jsx";
 
 const mapStateToProps = createStructuredSelector({
   currentUser: selectCurrentUser
@@ -23,7 +22,6 @@ export default connect(
 )(function ProfileMyComponent({ currentUser, updateUserDetails }) {
   const { t } = useTranslation();
   const notification = useNotification();
-  const { scenarioNotificationsOn } = useSocket();
 
   const handleFinish = (values) => {
     logImEXEvent("profile_update");
@@ -119,11 +117,6 @@ export default connect(
           </Card>
         </Form>
       </Col>
-      {scenarioNotificationsOn && (
-        <Col span={24}>
-          <NotificationSettingsForm />
-        </Col>
-      )}
     </>
   );
 });

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

@@ -1,5 +1,6 @@
 import { DeleteFilled } from "@ant-design/icons";
-import { Button, Form, Input, Space } from "antd";
+import { Button, Form, Input } from "antd";
+import React from "react";
 import { useTranslation } from "react-i18next";
 import CurrencyInput from "../form-items-formatted/currency-form-item.component";
 import FormListMoveArrows from "../form-list-move-arrows/form-list-move-arrows.component";
@@ -9,338 +10,326 @@ export default function ShopInfoLaborRates({ form }) {
   const { t } = useTranslation();
 
   return (
-    <>
-      <LayoutFormRow header={t("bodyshop.labels.shoprates")}>
-        <Form.Item label={t("jobs.fields.rate_ats")} name={["shoprates", "rate_ats"]}>
-          <CurrencyInput min={0} />
-        </Form.Item>
-        <Form.Item label={t("jobs.fields.rate_ats_flat")} name={["shoprates", "rate_ats_flat"]}>
-          <CurrencyInput min={0} />
-        </Form.Item>
-      </LayoutFormRow>
-      <LayoutFormRow header={t("bodyshop.labels.laborrates")}>
-        <Form.List name={["md_labor_rates"]}>
-          {(fields, { add, remove, move }) => {
-            return (
-              <div>
-                {fields.map((field, index) => (
-                  <Form.Item key={field.key}>
-                    <LayoutFormRow noDivider={index === 0}>
-                      <Form.Item
-                        label={t("jobs.fields.labor_rate_desc")}
-                        key={`${index}rate_label`}
-                        name={[field.name, "rate_label"]}
-                        rules={[
-                          {
-                            required: true
-                            //message: t("general.validation.required"),
-                          }
-                        ]}
-                      >
-                        <Input />
-                      </Form.Item>
-                      <Form.Item
-                        label={t("jobs.fields.rate_laa")}
-                        key={`${index}rate_laa`}
-                        name={[field.name, "rate_laa"]}
-                        rules={[
-                          {
-                            required: true
-                            //message: t("general.validation.required"),
-                          }
-                        ]}
-                      >
-                        <CurrencyInput min={0} />
-                      </Form.Item>
-                      <Form.Item
-                        label={t("jobs.fields.rate_lab")}
-                        key={`${index}rate_lab`}
-                        name={[field.name, "rate_lab"]}
-                        rules={[
-                          {
-                            required: true
-                            //message: t("general.validation.required"),
-                          }
-                        ]}
-                      >
-                        <CurrencyInput min={0} />
-                      </Form.Item>
-                      <Form.Item
-                        label={t("jobs.fields.rate_lad")}
-                        key={`${index}rate_lad`}
-                        name={[field.name, "rate_lad"]}
-                        rules={[
-                          {
-                            required: true
-                            //message: t("general.validation.required"),
-                          }
-                        ]}
-                      >
-                        <CurrencyInput min={0} />
-                      </Form.Item>
-                      <Form.Item
-                        label={t("jobs.fields.rate_lae")}
-                        key={`${index}rate_lae`}
-                        name={[field.name, "rate_lae"]}
-                        rules={[
-                          {
-                            required: true
-                            //message: t("general.validation.required"),
-                          }
-                        ]}
-                      >
-                        <CurrencyInput min={0} />
-                      </Form.Item>
-                      <Form.Item
-                        label={t("jobs.fields.rate_laf")}
-                        key={`${index}rate_laf`}
-                        name={[field.name, "rate_laf"]}
-                        rules={[
-                          {
-                            required: true
-                            //message: t("general.validation.required"),
-                          }
-                        ]}
-                      >
-                        <CurrencyInput min={0} />
-                      </Form.Item>
-                      <Form.Item
-                        label={t("jobs.fields.rate_lag")}
-                        key={`${index}rate_lag`}
-                        name={[field.name, "rate_lag"]}
-                        rules={[
-                          {
-                            required: true
-                            //message: t("general.validation.required"),
-                          }
-                        ]}
-                      >
-                        <CurrencyInput min={0} />
-                      </Form.Item>
-                      <Form.Item
-                        label={t("jobs.fields.rate_lam")}
-                        key={`${index}rate_lam`}
-                        name={[field.name, "rate_lam"]}
-                        rules={[
-                          {
-                            required: true
-                            //message: t("general.validation.required"),
-                          }
-                        ]}
-                      >
-                        <CurrencyInput min={0} />
-                      </Form.Item>
-                      <Form.Item
-                        label={t("jobs.fields.rate_lar")}
-                        key={`${index}rate_lar`}
-                        name={[field.name, "rate_lar"]}
-                        rules={[
-                          {
-                            required: true
-                            //message: t("general.validation.required"),
-                          }
-                        ]}
-                      >
-                        <CurrencyInput min={0} />
-                      </Form.Item>
-                      <Form.Item
-                        label={t("jobs.fields.rate_las")}
-                        key={`${index}rate_las`}
-                        name={[field.name, "rate_las"]}
-                        rules={[
-                          {
-                            required: true
-                            //message: t("general.validation.required"),
-                          }
-                        ]}
-                      >
-                        <CurrencyInput min={0} />
-                      </Form.Item>
-                      <Form.Item
-                        label={t("jobs.fields.rate_la1")}
-                        key={`${index}rate_la1`}
-                        name={[field.name, "rate_la1"]}
-                        rules={[
-                          {
-                            required: true
-                            //message: t("general.validation.required"),
-                          }
-                        ]}
-                      >
-                        <CurrencyInput min={0} />
-                      </Form.Item>
-                      <Form.Item
-                        label={t("jobs.fields.rate_la2")}
-                        key={`${index}rate_la2`}
-                        name={[field.name, "rate_la2"]}
-                        rules={[
-                          {
-                            required: true
-                            //message: t("general.validation.required"),
-                          }
-                        ]}
-                      >
-                        <CurrencyInput min={0} />
-                      </Form.Item>
-                      <Form.Item
-                        label={t("jobs.fields.rate_la3")}
-                        key={`${index}rate_la3`}
-                        name={[field.name, "rate_la3"]}
-                        rules={[
-                          {
-                            required: true
-                            //message: t("general.validation.required"),
-                          }
-                        ]}
-                      >
-                        <CurrencyInput min={0} />
-                      </Form.Item>
-                      <Form.Item
-                        label={t("jobs.fields.rate_la4")}
-                        key={`${index}rate_la4`}
-                        name={[field.name, "rate_la4"]}
-                        rules={[
-                          {
-                            required: true
-                            //message: t("general.validation.required"),
-                          }
-                        ]}
-                      >
-                        <CurrencyInput min={0} />
-                      </Form.Item>
-                      <Form.Item
-                        label={t("jobs.fields.rate_mash")}
-                        key={`${index}rate_mash`}
-                        name={[field.name, "rate_mash"]}
-                        rules={[
-                          {
-                            required: true
-                            //message: t("general.validation.required"),
-                          }
-                        ]}
-                      >
-                        <CurrencyInput min={0} />
-                      </Form.Item>
-                      <Form.Item
-                        label={t("jobs.fields.rate_mapa")}
-                        key={`${index}rate_mapa`}
-                        name={[field.name, "rate_mapa"]}
-                        rules={[
-                          {
-                            required: true
-                            //message: t("general.validation.required"),
-                          }
-                        ]}
-                      >
-                        <CurrencyInput min={0} />
-                      </Form.Item>
-                      <Form.Item
-                        label={t("jobs.fields.rate_ma2s")}
-                        key={`${index}rate_ma2s`}
-                        name={[field.name, "rate_ma2s"]}
-                        rules={[
-                          {
-                            required: true
-                            //message: t("general.validation.required"),
-                          }
-                        ]}
-                      >
-                        <CurrencyInput min={0} />
-                      </Form.Item>
-                      <Form.Item
-                        label={t("jobs.fields.rate_ma3s")}
-                        key={`${index}rate_ma3s`}
-                        name={[field.name, "rate_ma3s"]}
-                        rules={[
-                          {
-                            required: true
-                            //message: t("general.validation.required"),
-                          }
-                        ]}
-                      >
-                        <CurrencyInput min={0} />
-                      </Form.Item>
-                      {
-                        // <Form.Item
-                        //   label={t("jobs.fields.rate_mabl")}
-                        //   key={`${index}rate_mabl`}
-                        //   name={[field.name, "rate_mabl"]}
-                        //   rules={[
-                        //     {
-                        //       required: true,
-                        //       //message: t("general.validation.required"),
-                        //     },
-                        //   ]}
-                        // >
-                        //   <CurrencyInput min={0} />
-                        // </Form.Item>
-                        // <Form.Item
-                        //   label={t("jobs.fields.rate_macs")}
-                        //   key={`${index}rate_macs`}
-                        //   name={[field.name, "rate_macs"]}
-                        //   rules={[
-                        //     {
-                        //       required: true,
-                        //       //message: t("general.validation.required"),
-                        //     },
-                        //   ]}
-                        // >
-                        //   <CurrencyInput min={0} />
-                        // </Form.Item>
-                      }
-                      <Form.Item
-                        label={t("jobs.fields.rate_matd")}
-                        key={`${index}rate_matd`}
-                        name={[field.name, "rate_matd"]}
-                        rules={[
-                          {
-                            required: true
-                            //message: t("general.validation.required"),
-                          }
-                        ]}
-                      >
-                        <CurrencyInput min={0} />
-                      </Form.Item>
-                      <Form.Item
-                        label={t("jobs.fields.rate_mahw")}
-                        key={`${index}rate_mahw`}
-                        name={[field.name, "rate_mahw"]}
-                        rules={[
-                          {
-                            required: true
-                            //message: t("general.validation.required"),
-                          }
-                        ]}
-                      >
-                        <CurrencyInput min={0} />
-                      </Form.Item>
-                      <Space>
-                        <DeleteFilled
-                          onClick={() => {
-                            remove(field.name);
-                          }}
-                        />
-                        <FormListMoveArrows move={move} index={index} total={fields.rate_length} />
-                      </Space>
-                    </LayoutFormRow>
-                  </Form.Item>
-                ))}
-                <Form.Item>
-                  <Button
-                    type="dashed"
-                    onClick={() => {
-                      add();
-                    }}
-                    style={{ width: "100%" }}
-                  >
-                    {t("bodyshop.actions.newlaborrate")}
-                  </Button>
+    <div>
+      <Form.List name={["md_labor_rates"]}>
+        {(fields, { add, remove, move }) => {
+          return (
+            <div>
+              {fields.map((field, index) => (
+                <Form.Item key={field.key}>
+                  <LayoutFormRow>
+                    <Form.Item
+                      label={t("jobs.fields.labor_rate_desc")}
+                      key={`${index}rate_label`}
+                      name={[field.name, "rate_label"]}
+                      rules={[
+                        {
+                          required: true
+                          //message: t("general.validation.required"),
+                        }
+                      ]}
+                    >
+                      <Input />
+                    </Form.Item>
+                    <Form.Item
+                      label={t("jobs.fields.rate_laa")}
+                      key={`${index}rate_laa`}
+                      name={[field.name, "rate_laa"]}
+                      rules={[
+                        {
+                          required: true
+                          //message: t("general.validation.required"),
+                        }
+                      ]}
+                    >
+                      <CurrencyInput min={0} />
+                    </Form.Item>
+                    <Form.Item
+                      label={t("jobs.fields.rate_lab")}
+                      key={`${index}rate_lab`}
+                      name={[field.name, "rate_lab"]}
+                      rules={[
+                        {
+                          required: true
+                          //message: t("general.validation.required"),
+                        }
+                      ]}
+                    >
+                      <CurrencyInput min={0} />
+                    </Form.Item>
+                    <Form.Item
+                      label={t("jobs.fields.rate_lad")}
+                      key={`${index}rate_lad`}
+                      name={[field.name, "rate_lad"]}
+                      rules={[
+                        {
+                          required: true
+                          //message: t("general.validation.required"),
+                        }
+                      ]}
+                    >
+                      <CurrencyInput min={0} />
+                    </Form.Item>
+                    <Form.Item
+                      label={t("jobs.fields.rate_lae")}
+                      key={`${index}rate_lae`}
+                      name={[field.name, "rate_lae"]}
+                      rules={[
+                        {
+                          required: true
+                          //message: t("general.validation.required"),
+                        }
+                      ]}
+                    >
+                      <CurrencyInput min={0} />
+                    </Form.Item>
+                    <Form.Item
+                      label={t("jobs.fields.rate_laf")}
+                      key={`${index}rate_laf`}
+                      name={[field.name, "rate_laf"]}
+                      rules={[
+                        {
+                          required: true
+                          //message: t("general.validation.required"),
+                        }
+                      ]}
+                    >
+                      <CurrencyInput min={0} />
+                    </Form.Item>
+                    <Form.Item
+                      label={t("jobs.fields.rate_lag")}
+                      key={`${index}rate_lag`}
+                      name={[field.name, "rate_lag"]}
+                      rules={[
+                        {
+                          required: true
+                          //message: t("general.validation.required"),
+                        }
+                      ]}
+                    >
+                      <CurrencyInput min={0} />
+                    </Form.Item>
+                    <Form.Item
+                      label={t("jobs.fields.rate_lam")}
+                      key={`${index}rate_lam`}
+                      name={[field.name, "rate_lam"]}
+                      rules={[
+                        {
+                          required: true
+                          //message: t("general.validation.required"),
+                        }
+                      ]}
+                    >
+                      <CurrencyInput min={0} />
+                    </Form.Item>
+                    <Form.Item
+                      label={t("jobs.fields.rate_lar")}
+                      key={`${index}rate_lar`}
+                      name={[field.name, "rate_lar"]}
+                      rules={[
+                        {
+                          required: true
+                          //message: t("general.validation.required"),
+                        }
+                      ]}
+                    >
+                      <CurrencyInput min={0} />
+                    </Form.Item>
+                    <Form.Item
+                      label={t("jobs.fields.rate_las")}
+                      key={`${index}rate_las`}
+                      name={[field.name, "rate_las"]}
+                      rules={[
+                        {
+                          required: true
+                          //message: t("general.validation.required"),
+                        }
+                      ]}
+                    >
+                      <CurrencyInput min={0} />
+                    </Form.Item>
+                    <Form.Item
+                      label={t("jobs.fields.rate_la1")}
+                      key={`${index}rate_la1`}
+                      name={[field.name, "rate_la1"]}
+                      rules={[
+                        {
+                          required: true
+                          //message: t("general.validation.required"),
+                        }
+                      ]}
+                    >
+                      <CurrencyInput min={0} />
+                    </Form.Item>
+                    <Form.Item
+                      label={t("jobs.fields.rate_la2")}
+                      key={`${index}rate_la2`}
+                      name={[field.name, "rate_la2"]}
+                      rules={[
+                        {
+                          required: true
+                          //message: t("general.validation.required"),
+                        }
+                      ]}
+                    >
+                      <CurrencyInput min={0} />
+                    </Form.Item>
+                    <Form.Item
+                      label={t("jobs.fields.rate_la3")}
+                      key={`${index}rate_la3`}
+                      name={[field.name, "rate_la3"]}
+                      rules={[
+                        {
+                          required: true
+                          //message: t("general.validation.required"),
+                        }
+                      ]}
+                    >
+                      <CurrencyInput min={0} />
+                    </Form.Item>
+                    <Form.Item
+                      label={t("jobs.fields.rate_la4")}
+                      key={`${index}rate_la4`}
+                      name={[field.name, "rate_la4"]}
+                      rules={[
+                        {
+                          required: true
+                          //message: t("general.validation.required"),
+                        }
+                      ]}
+                    >
+                      <CurrencyInput min={0} />
+                    </Form.Item>
+                    <Form.Item
+                      label={t("jobs.fields.rate_mash")}
+                      key={`${index}rate_mash`}
+                      name={[field.name, "rate_mash"]}
+                      rules={[
+                        {
+                          required: true
+                          //message: t("general.validation.required"),
+                        }
+                      ]}
+                    >
+                      <CurrencyInput min={0} />
+                    </Form.Item>
+                    <Form.Item
+                      label={t("jobs.fields.rate_mapa")}
+                      key={`${index}rate_mapa`}
+                      name={[field.name, "rate_mapa"]}
+                      rules={[
+                        {
+                          required: true
+                          //message: t("general.validation.required"),
+                        }
+                      ]}
+                    >
+                      <CurrencyInput min={0} />
+                    </Form.Item>
+                    <Form.Item
+                      label={t("jobs.fields.rate_ma2s")}
+                      key={`${index}rate_ma2s`}
+                      name={[field.name, "rate_ma2s"]}
+                      rules={[
+                        {
+                          required: true
+                          //message: t("general.validation.required"),
+                        }
+                      ]}
+                    >
+                      <CurrencyInput min={0} />
+                    </Form.Item>
+                    <Form.Item
+                      label={t("jobs.fields.rate_ma3s")}
+                      key={`${index}rate_ma3s`}
+                      name={[field.name, "rate_ma3s"]}
+                      rules={[
+                        {
+                          required: true
+                          //message: t("general.validation.required"),
+                        }
+                      ]}
+                    >
+                      <CurrencyInput min={0} />
+                    </Form.Item>
+                    {
+                      // <Form.Item
+                      //   label={t("jobs.fields.rate_mabl")}
+                      //   key={`${index}rate_mabl`}
+                      //   name={[field.name, "rate_mabl"]}
+                      //   rules={[
+                      //     {
+                      //       required: true,
+                      //       //message: t("general.validation.required"),
+                      //     },
+                      //   ]}
+                      // >
+                      //   <CurrencyInput min={0} />
+                      // </Form.Item>
+                      // <Form.Item
+                      //   label={t("jobs.fields.rate_macs")}
+                      //   key={`${index}rate_macs`}
+                      //   name={[field.name, "rate_macs"]}
+                      //   rules={[
+                      //     {
+                      //       required: true,
+                      //       //message: t("general.validation.required"),
+                      //     },
+                      //   ]}
+                      // >
+                      //   <CurrencyInput min={0} />
+                      // </Form.Item>
+                    }
+                    <Form.Item
+                      label={t("jobs.fields.rate_matd")}
+                      key={`${index}rate_matd`}
+                      name={[field.name, "rate_matd"]}
+                      rules={[
+                        {
+                          required: true
+                          //message: t("general.validation.required"),
+                        }
+                      ]}
+                    >
+                      <CurrencyInput min={0} />
+                    </Form.Item>
+                    <Form.Item
+                      label={t("jobs.fields.rate_mahw")}
+                      key={`${index}rate_mahw`}
+                      name={[field.name, "rate_mahw"]}
+                      rules={[
+                        {
+                          required: true
+                          //message: t("general.validation.required"),
+                        }
+                      ]}
+                    >
+                      <CurrencyInput min={0} />
+                    </Form.Item>
+                    <DeleteFilled
+                      onClick={() => {
+                        remove(field.name);
+                      }}
+                    />
+                    <FormListMoveArrows move={move} index={index} total={fields.rate_length} />
+                  </LayoutFormRow>
                 </Form.Item>
-              </div>
-            );
-          }}
-        </Form.List>
-      </LayoutFormRow>
-    </>
+              ))}
+              <Form.Item>
+                <Button
+                  type="dashed"
+                  onClick={() => {
+                    add();
+                  }}
+                  style={{ width: "100%" }}
+                >
+                  {t("bodyshop.actions.newlaborrate")}
+                </Button>
+              </Form.Item>
+            </div>
+          );
+        }}
+      </Form.List>
+    </div>
   );
 }

client/src/components/shop-info/shop-intellipay-config.component.jsx

@@ -1,10 +1,11 @@
-import { Alert, Form, Select, Switch } from "antd";
+import { Alert, Form, Switch } from "antd";
+import React from "react";
 import { useTranslation } from "react-i18next";
 import LayoutFormRow from "../layout-form-row/layout-form-row.component";
 
-import { connect } from "react-redux";
-import { createStructuredSelector } from "reselect";
-import { selectBodyshop } from "../../redux/user/user.selectors";
+import {connect} from "react-redux";
+import {createStructuredSelector} from "reselect";
+import {selectBodyshop} from "../../redux/user/user.selectors";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop
@@ -15,17 +16,17 @@ const mapDispatchToProps = () => ({
 export default connect(mapStateToProps, mapDispatchToProps)(ShopInfoIntellipay);
 
 // noinspection JSUnusedLocalSymbols
-export function ShopInfoIntellipay({ bodyshop, form }) {
-  const { t } = useTranslation();
+export function ShopInfoIntellipay({bodyshop, form}) {
+  const {t} = useTranslation();
 
   return (
     <>
       <Form.Item dependencies={[["intellipay_config", "enable_cash_discount"]]}>
         {() => {
-          const { intellipay_config } = form.getFieldsValue();
+          const {intellipay_config} = form.getFieldsValue();
 
           if (intellipay_config?.enable_cash_discount)
-            return <Alert message={t("bodyshop.labels.intellipay_cash_discount")} />;
+            return <Alert message={t("bodyshop.labels.intellipay_cash_discount")}/>;
         }}
       </Form.Item>
 
@@ -35,93 +36,7 @@ export function ShopInfoIntellipay({ bodyshop, form }) {
           valuePropName="checked"
           name={["intellipay_config", "enable_cash_discount"]}
         >
-          <Switch />
-        </Form.Item>
-      </LayoutFormRow>
-      <LayoutFormRow header={t("bodyshop.fields.intellipay_config.payment_type")}>
-        <Form.Item
-          label={t("bodyshop.fields.intellipay_config.payment_map.visa")}
-          name={["intellipay_config", "payment_map", "visa"]}
-        >
-          <Select showSearch>
-            {bodyshop.md_payment_types.map((item, idx) => (
-              <Select.Option key={idx} value={item}>
-                {item}
-              </Select.Option>
-            ))}
-          </Select>
-        </Form.Item>
-        <Form.Item
-          label={t("bodyshop.fields.intellipay_config.payment_map.mast")}
-          name={["intellipay_config", "payment_map", "mast"]}
-        >
-          <Select showSearch>
-            {bodyshop.md_payment_types.map((item, idx) => (
-              <Select.Option key={idx} value={item}>
-                {item}
-              </Select.Option>
-            ))}
-          </Select>
-        </Form.Item>
-        <Form.Item
-          label={t("bodyshop.fields.intellipay_config.payment_map.amex")}
-          name={["intellipay_config", "payment_map", "amex"]}
-        >
-          <Select showSearch>
-            {bodyshop.md_payment_types.map((item, idx) => (
-              <Select.Option key={idx} value={item}>
-                {item}
-              </Select.Option>
-            ))}
-          </Select>
-        </Form.Item>
-        <Form.Item
-          label={t("bodyshop.fields.intellipay_config.payment_map.disc")}
-          name={["intellipay_config", "payment_map", "disc"]}
-        >
-          <Select showSearch>
-            {bodyshop.md_payment_types.map((item, idx) => (
-              <Select.Option key={idx} value={item}>
-                {item}
-              </Select.Option>
-            ))}
-          </Select>
-        </Form.Item>
-        <Form.Item
-          label={t("bodyshop.fields.intellipay_config.payment_map.dnrs")}
-          name={["intellipay_config", "payment_map", "dnrs"]}
-        >
-          <Select showSearch>
-            {bodyshop.md_payment_types.map((item, idx) => (
-              <Select.Option key={idx} value={item}>
-                {item}
-              </Select.Option>
-            ))}
-          </Select>
-        </Form.Item>
-        <Form.Item
-          label={t("bodyshop.fields.intellipay_config.payment_map.jcb")}
-          name={["intellipay_config", "payment_map", "jcb"]}
-        >
-          <Select showSearch>
-            {bodyshop.md_payment_types.map((item, idx) => (
-              <Select.Option key={idx} value={item}>
-                {item}
-              </Select.Option>
-            ))}
-          </Select>
-        </Form.Item>
-        <Form.Item
-          label={t("bodyshop.fields.intellipay_config.payment_map.intr")}
-          name={["intellipay_config", "payment_map", "intr"]}
-        >
-          <Select showSearch>
-            {bodyshop.md_payment_types.map((item, idx) => (
-              <Select.Option key={idx} value={item}>
-                {item}
-              </Select.Option>
-            ))}
-          </Select>
+          <Switch/>
         </Form.Item>
       </LayoutFormRow>
     </>

client/src/components/update-alert/update-alert.component.jsx

@@ -1,7 +1,7 @@
 import { AlertOutlined } from "@ant-design/icons";
 import { Alert, Button, Col, Row, Space } from "antd";
 import i18n from "i18next";
-import { useCallback, useEffect, useState } from "react";
+import React, { useCallback, useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
@@ -81,7 +81,8 @@ export function UpdateAlert({ updateAvailable }) {
             imex: "$t(titles.imexonline)",
             rome: "$t(titles.romeonline)"
           })
-        })
+        }),
+        placement: "bottomRight"
       });
     }
     if (needRefresh && timerStarted && timeLeft <= 0) {

client/src/contexts/Notifications/notificationContext.jsx

@@ -1,4 +1,5 @@
-import { createContext, useContext } from "react";
+// NotificationProvider.jsx
+import React, { createContext, useContext } from "react";
 import { notification } from "antd";
 
 /**
@@ -21,11 +22,7 @@ export const useNotification = () => {
  *  - Provide `api` via the NotificationContext.
  */
 export const NotificationProvider = ({ children }) => {
-  const [api, contextHolder] = notification.useNotification({
-    placement: "bottomRight",
-    bottom: 70,
-    showProgress: true
-  });
+  const [api, contextHolder] = notification.useNotification();
 
   return (
     <NotificationContext.Provider value={api}>

client/src/contexts/SocketIO/socketContext.jsx

@@ -0,0 +1,13 @@
+import React, { createContext } from "react";
+import useSocket from "./useSocket"; // Import the custom hook
+
+// Create the SocketContext
+const SocketContext = createContext(null);
+
+export const SocketProvider = ({ children, bodyshop }) => {
+  const { socket, clientId } = useSocket(bodyshop);
+
+  return <SocketContext.Provider value={{ socket, clientId }}> {children}</SocketContext.Provider>;
+};
+
+export default SocketContext;

client/src/contexts/SocketIO/useSocket.js

@@ -0,0 +1,125 @@
+import { useEffect, useRef, useState } from "react";
+import SocketIO from "socket.io-client";
+import { auth } from "../../firebase/firebase.utils";
+import { store } from "../../redux/store";
+import { addAlerts, setWssStatus } from "../../redux/application/application.actions";
+
+const useSocket = (bodyshop) => {
+  const socketRef = useRef(null);
+  const [clientId, setClientId] = useState(null);
+
+  useEffect(() => {
+    const initializeSocket = async (token) => {
+      if (!bodyshop || !bodyshop.id) return;
+
+      const endpoint = import.meta.env.PROD ? import.meta.env.VITE_APP_AXIOS_BASE_API_URL : "";
+
+      const socketInstance = SocketIO(endpoint, {
+        path: "/wss",
+        withCredentials: true,
+        auth: { token },
+        reconnectionAttempts: Infinity,
+        reconnectionDelay: 2000,
+        reconnectionDelayMax: 10000
+      });
+
+      socketRef.current = socketInstance;
+
+      // Handle socket events
+      const handleBodyshopMessage = (message) => {
+        if (!message || !message.type) return;
+
+        switch (message.type) {
+          case "alert-update":
+            store.dispatch(addAlerts(message.payload));
+            break;
+          default:
+            break;
+        }
+
+        if (!import.meta.env.DEV) return;
+        console.log(`Received message for bodyshop ${bodyshop.id}:`, message);
+      };
+
+      const handleConnect = () => {
+        socketInstance.emit("join-bodyshop-room", bodyshop.id);
+        setClientId(socketInstance.id);
+        store.dispatch(setWssStatus("connected"));
+      };
+
+      const handleReconnect = () => {
+        store.dispatch(setWssStatus("connected"));
+      };
+
+      const handleConnectionError = (err) => {
+        console.error("Socket connection error:", err);
+
+        // Handle token expiration
+        if (err.message.includes("auth/id-token-expired")) {
+          console.warn("Token expired, refreshing...");
+          auth.currentUser?.getIdToken(true).then((newToken) => {
+            socketInstance.auth = { token: newToken }; // Update socket auth
+            socketInstance.connect(); // Retry connection
+          });
+        } else {
+          store.dispatch(setWssStatus("error"));
+        }
+      };
+
+      const handleDisconnect = (reason) => {
+        console.warn("Socket disconnected:", reason);
+        store.dispatch(setWssStatus("disconnected"));
+
+        // Manually trigger reconnection if necessary
+        if (!socketInstance.connected && reason !== "io server disconnect") {
+          setTimeout(() => {
+            if (socketInstance.disconnected) {
+              console.log("Manually triggering reconnection...");
+              socketInstance.connect();
+            }
+          }, 2000); // Retry after 2 seconds
+        }
+      };
+
+      // Register event handlers
+      socketInstance.on("connect", handleConnect);
+      socketInstance.on("reconnect", handleReconnect);
+      socketInstance.on("connect_error", handleConnectionError);
+      socketInstance.on("disconnect", handleDisconnect);
+      socketInstance.on("bodyshop-message", handleBodyshopMessage);
+    };
+
+    const unsubscribe = auth.onIdTokenChanged(async (user) => {
+      if (user) {
+        const token = await user.getIdToken();
+
+        if (socketRef.current) {
+          // Update token if socket exists
+          socketRef.current.emit("update-token", token);
+        } else {
+          // Initialize socket if not already connected
+          initializeSocket(token);
+        }
+      } else {
+        // User is not authenticated
+        if (socketRef.current) {
+          socketRef.current.disconnect();
+          socketRef.current = null;
+        }
+      }
+    });
+
+    // Clean up on unmount
+    return () => {
+      unsubscribe();
+      if (socketRef.current) {
+        socketRef.current.disconnect();
+        socketRef.current = null;
+      }
+    };
+  }, [bodyshop]);
+
+  return { socket: socketRef.current, clientId };
+};
+
+export default useSocket;

client/src/contexts/SocketIO/useSocket.jsx

@@ -1,500 +0,0 @@
-import { createContext, useContext, useEffect, useRef, useState } from "react";
-import SocketIO from "socket.io-client";
-import { auth } from "../../firebase/firebase.utils";
-import { store } from "../../redux/store";
-import { addAlerts, setWssStatus } from "../../redux/application/application.actions";
-import client from "../../utils/GraphQLClient";
-import { useNotification } from "../Notifications/notificationContext.jsx";
-import {
-  GET_NOTIFICATIONS,
-  GET_UNREAD_COUNT,
-  MARK_ALL_NOTIFICATIONS_READ,
-  MARK_NOTIFICATION_READ,
-  UPDATE_NOTIFICATIONS_READ_FRAGMENT
-} from "../../graphql/notifications.queries.js";
-import { useMutation } from "@apollo/client";
-import { useTranslation } from "react-i18next";
-import { useSplitTreatments } from "@splitsoftware/splitio-react";
-
-const SocketContext = createContext(null);
-
-const INITIAL_NOTIFICATIONS = 10;
-
-/**
- * Socket Provider - Scenario Notifications / Web Socket related items
- * @param children
- * @param bodyshop
- * @param navigate
- * @param currentUser
- * @returns {JSX.Element}
- * @constructor
- */
-const SocketProvider = ({ children, bodyshop, navigate, currentUser }) => {
-  const socketRef = useRef(null);
-  const [clientId, setClientId] = useState(null);
-  const [isConnected, setIsConnected] = useState(false);
-  const notification = useNotification();
-  const userAssociationId = bodyshop?.associations?.[0]?.id;
-  const { t } = useTranslation();
-
-  const {
-    treatments: { Realtime_Notifications_UI }
-  } = useSplitTreatments({
-    attributes: {},
-    names: ["Realtime_Notifications_UI"],
-    splitKey: bodyshop?.imexshopid
-  });
-
-  const [markNotificationRead] = useMutation(MARK_NOTIFICATION_READ, {
-    update: (cache, { data: { update_notifications } }) => {
-      const timestamp = new Date().toISOString();
-      const updatedNotification = update_notifications.returning[0];
-
-      cache.modify({
-        fields: {
-          notifications(existing = [], { readField }) {
-            return existing.map((notif) =>
-              readField("id", notif) === updatedNotification.id
-                ? {
-                    ...notif,
-                    read: timestamp
-                  }
-                : notif
-            );
-          }
-        }
-      });
-
-      const unreadCountQuery = cache.readQuery({
-        query: GET_UNREAD_COUNT,
-        variables: { associationid: userAssociationId }
-      });
-
-      if (unreadCountQuery?.notifications_aggregate?.aggregate?.count > 0) {
-        cache.writeQuery({
-          query: GET_UNREAD_COUNT,
-          variables: { associationid: userAssociationId },
-          data: {
-            notifications_aggregate: {
-              ...unreadCountQuery.notifications_aggregate,
-              aggregate: {
-                ...unreadCountQuery.notifications_aggregate.aggregate,
-                count: unreadCountQuery.notifications_aggregate.aggregate.count - 1
-              }
-            }
-          }
-        });
-      }
-
-      if (socketRef.current && isConnected) {
-        socketRef.current.emit("sync-notification-read", {
-          email: currentUser?.email,
-          bodyshopId: bodyshop.id,
-          notificationId: updatedNotification.id
-        });
-      }
-    },
-    onError: (err) =>
-      console.error("MARK_NOTIFICATION_READ error:", {
-        message: err?.message,
-        stack: err?.stack
-      })
-  });
-
-  const [markAllNotificationsRead] = useMutation(MARK_ALL_NOTIFICATIONS_READ, {
-    variables: { associationid: userAssociationId },
-    update: (cache) => {
-      const timestamp = new Date().toISOString();
-      cache.modify({
-        fields: {
-          notifications(existing = [], { readField }) {
-            return existing.map((notif) =>
-              readField("read", notif) === null && readField("associationid", notif) === userAssociationId
-                ? { ...notif, read: timestamp }
-                : notif
-            );
-          },
-          notifications_aggregate() {
-            return { aggregate: { count: 0, __typename: "notifications_aggregate_fields" } };
-          }
-        }
-      });
-
-      const baseWhereClause = { associationid: { _eq: userAssociationId } };
-      const cachedNotifications = cache.readQuery({
-        query: GET_NOTIFICATIONS,
-        variables: { limit: INITIAL_NOTIFICATIONS, offset: 0, where: baseWhereClause }
-      });
-
-      if (cachedNotifications?.notifications) {
-        cache.writeQuery({
-          query: GET_NOTIFICATIONS,
-          variables: { limit: INITIAL_NOTIFICATIONS, offset: 0, where: baseWhereClause },
-          data: {
-            notifications: cachedNotifications.notifications.map((notif) =>
-              notif.read === null ? { ...notif, read: timestamp } : notif
-            )
-          }
-        });
-      }
-
-      if (socketRef.current && isConnected) {
-        socketRef.current.emit("sync-all-notifications-read", {
-          email: currentUser?.email,
-          bodyshopId: bodyshop.id
-        });
-      }
-    },
-    onError: (err) => console.error("MARK_ALL_NOTIFICATIONS_READ error:", err)
-  });
-
-  useEffect(() => {
-    const initializeSocket = async (token) => {
-      if (!bodyshop || !bodyshop.id || socketRef.current) return;
-
-      const endpoint = import.meta.env.PROD ? import.meta.env.VITE_APP_AXIOS_BASE_API_URL : "";
-      const socketInstance = SocketIO(endpoint, {
-        path: "/wss",
-        withCredentials: true,
-        auth: { token, bodyshopId: bodyshop.id },
-        reconnectionAttempts: Infinity,
-        reconnectionDelay: 2000,
-        reconnectionDelayMax: 10000
-      });
-
-      socketRef.current = socketInstance;
-
-      const handleBodyshopMessage = (message) => {
-        if (!message || !message.type) return;
-        switch (message.type) {
-          case "alert-update":
-            store.dispatch(addAlerts(message.payload));
-            break;
-          default:
-            break;
-        }
-      };
-
-      const handleConnect = () => {
-        socketInstance.emit("join-bodyshop-room", bodyshop.id);
-        setClientId(socketInstance.id);
-        setIsConnected(true);
-        store.dispatch(setWssStatus("connected"));
-      };
-
-      const handleReconnect = () => {
-        setIsConnected(true);
-        store.dispatch(setWssStatus("connected"));
-      };
-
-      const handleConnectionError = (err) => {
-        console.error("Socket connection error:", err);
-        setIsConnected(false);
-        if (err.message.includes("auth/id-token-expired")) {
-          console.warn("Token expired, refreshing...");
-          auth.currentUser?.getIdToken(true).then((newToken) => {
-            socketInstance.auth = { token: newToken };
-            socketInstance.connect();
-          });
-        } else {
-          store.dispatch(setWssStatus("error"));
-        }
-      };
-
-      const handleDisconnect = (reason) => {
-        console.warn("Socket disconnected:", reason);
-        setIsConnected(false);
-        store.dispatch(setWssStatus("disconnected"));
-        if (!socketInstance.connected && reason !== "io server disconnect") {
-          setTimeout(() => {
-            if (socketInstance.disconnected) {
-              console.log("Manually triggering reconnection...");
-              socketInstance.connect();
-            }
-          }, 2000);
-        }
-      };
-
-      const handleNotification = (data) => {
-        // Scenario Notifications have been disabled, bail.
-        if (Realtime_Notifications_UI?.treatment !== "on") {
-          return;
-        }
-
-        const { jobId, jobRoNumber, notificationId, associationId, notifications } = data;
-        if (associationId !== userAssociationId) return;
-
-        const newNotification = {
-          __typename: "notifications",
-          id: notificationId,
-          jobid: jobId,
-          associationid: associationId,
-          scenario_text: JSON.stringify(notifications.map((notif) => notif.body)),
-          fcm_text: notifications.map((notif) => notif.body).join(". ") + ".",
-          scenario_meta: JSON.stringify(notifications.map((notif) => notif.variables || {})),
-          created_at: new Date(notifications[0].timestamp).toISOString(),
-          read: null,
-          job: { ro_number: jobRoNumber }
-        };
-
-        const baseVariables = {
-          limit: INITIAL_NOTIFICATIONS,
-          offset: 0,
-          where: { associationid: { _eq: userAssociationId } }
-        };
-
-        try {
-          const existingNotifications =
-            client.cache.readQuery({
-              query: GET_NOTIFICATIONS,
-              variables: baseVariables
-            })?.notifications || [];
-          if (!existingNotifications.some((n) => n.id === newNotification.id)) {
-            client.cache.writeQuery({
-              query: GET_NOTIFICATIONS,
-              variables: baseVariables,
-              data: {
-                notifications: [newNotification, ...existingNotifications].sort(
-                  (a, b) => new Date(b.created_at) - new Date(a.created_at)
-                )
-              },
-              broadcast: true
-            });
-
-            const unreadVariables = {
-              ...baseVariables,
-              where: { ...baseVariables.where, read: { _is_null: true } }
-            };
-            const unreadNotifications =
-              client.cache.readQuery({
-                query: GET_NOTIFICATIONS,
-                variables: unreadVariables
-              })?.notifications || [];
-            if (newNotification.read === null && !unreadNotifications.some((n) => n.id === newNotification.id)) {
-              client.cache.writeQuery({
-                query: GET_NOTIFICATIONS,
-                variables: unreadVariables,
-                data: {
-                  notifications: [newNotification, ...unreadNotifications].sort(
-                    (a, b) => new Date(b.created_at) - new Date(a.created_at)
-                  )
-                },
-                broadcast: true
-              });
-            }
-
-            client.cache.modify({
-              id: "ROOT_QUERY",
-              fields: {
-                notifications_aggregate(existing = { aggregate: { count: 0 } }) {
-                  return {
-                    ...existing,
-                    aggregate: {
-                      ...existing.aggregate,
-                      count: existing.aggregate.count + (newNotification.read === null ? 1 : 0)
-                    }
-                  };
-                }
-              }
-            });
-
-            notification.info({
-              message: (
-                <div
-                  onClick={() => {
-                    markNotificationRead({ variables: { id: notificationId } })
-                      .then(() => navigate(`/manage/jobs/${jobId}`))
-                      .catch((e) => console.error(`Error marking notification read: ${e?.message || ""}`));
-                  }}
-                >
-                  {t("notifications.labels.notification-popup-title", {
-                    ro_number: jobRoNumber || t("general.labels.na")
-                  })}
-                </div>
-              ),
-              description: (
-                <ul
-                  className="notification-alert-unordered-list"
-                  onClick={() => {
-                    markNotificationRead({ variables: { id: notificationId } })
-                      .then(() => navigate(`/manage/jobs/${jobId}`))
-                      .catch((e) => console.error(`Error marking notification read: ${e?.message || ""}`));
-                  }}
-                >
-                  {notifications.map((notif, index) => (
-                    <li className="notification-alert-unordered-list-item" key={index}>
-                      {notif.body}
-                    </li>
-                  ))}
-                </ul>
-              )
-            });
-          }
-        } catch (error) {
-          console.error(`Error handling new notification: ${error?.message || ""}`);
-        }
-      };
-
-      const handleSyncNotificationRead = ({ notificationId, timestamp }) => {
-        // Scenario Notifications have been disabled, bail.
-        if (Realtime_Notifications_UI?.treatment !== "on") {
-          return;
-        }
-
-        try {
-          const notificationRef = client.cache.identify({
-            __typename: "notifications",
-            id: notificationId
-          });
-          client.cache.writeFragment({
-            id: notificationRef,
-            fragment: UPDATE_NOTIFICATIONS_READ_FRAGMENT,
-            data: { read: timestamp }
-          });
-
-          const unreadCountData = client.cache.readQuery({
-            query: GET_UNREAD_COUNT,
-            variables: { associationid: userAssociationId }
-          });
-          if (unreadCountData?.notifications_aggregate?.aggregate?.count > 0) {
-            const newCount = Math.max(unreadCountData.notifications_aggregate.aggregate.count - 1, 0);
-            client.cache.writeQuery({
-              query: GET_UNREAD_COUNT,
-              variables: { associationid: userAssociationId },
-              data: {
-                notifications_aggregate: {
-                  __typename: "notifications_aggregate",
-                  aggregate: {
-                    __typename: "notifications_aggregate_fields",
-                    count: newCount
-                  }
-                }
-              }
-            });
-          }
-        } catch (error) {
-          console.error("Error in handleSyncNotificationRead:", error);
-        }
-      };
-
-      const handleSyncAllNotificationsRead = ({ timestamp }) => {
-        // Scenario Notifications have been disabled, bail.
-        if (Realtime_Notifications_UI?.treatment !== "on") {
-          return;
-        }
-
-        try {
-          const queryVars = {
-            limit: INITIAL_NOTIFICATIONS,
-            offset: 0,
-            where: { associationid: { _eq: userAssociationId } }
-          };
-          const cachedData = client.cache.readQuery({
-            query: GET_NOTIFICATIONS,
-            variables: queryVars
-          });
-
-          if (cachedData?.notifications) {
-            cachedData.notifications.forEach((notif) => {
-              if (!notif.read) {
-                const notifRef = client.cache.identify({ __typename: "notifications", id: notif.id });
-                client.cache.writeFragment({
-                  id: notifRef,
-                  fragment: UPDATE_NOTIFICATIONS_READ_FRAGMENT,
-                  data: { read: timestamp }
-                });
-              }
-            });
-          }
-
-          client.cache.writeQuery({
-            query: GET_UNREAD_COUNT,
-            variables: { associationid: userAssociationId },
-            data: {
-              notifications_aggregate: {
-                __typename: "notifications_aggregate",
-                aggregate: {
-                  __typename: "notifications_aggregate_fields",
-                  count: 0
-                }
-              }
-            }
-          });
-        } catch (error) {
-          console.error(`Error In HandleSyncAllNotificationsRead: ${error?.message || ""}`);
-        }
-      };
-
-      socketInstance.on("connect", handleConnect);
-      socketInstance.on("reconnect", handleReconnect);
-      socketInstance.on("connect_error", handleConnectionError);
-      socketInstance.on("disconnect", handleDisconnect);
-      socketInstance.on("bodyshop-message", handleBodyshopMessage);
-      socketInstance.on("notification", handleNotification);
-      socketInstance.on("sync-notification-read", handleSyncNotificationRead);
-      socketInstance.on("sync-all-notifications-read", handleSyncAllNotificationsRead);
-    };
-
-    const unsubscribe = auth.onIdTokenChanged(async (user) => {
-      if (user) {
-        const token = await user.getIdToken();
-        if (socketRef.current) {
-          socketRef.current.emit("update-token", { token, bodyshopId: bodyshop.id });
-        } else {
-          initializeSocket(token).catch((err) =>
-            console.error(`Something went wrong Initializing Sockets: ${err?.message || ""}`)
-          );
-        }
-      } else {
-        if (socketRef.current) {
-          socketRef.current.disconnect();
-          socketRef.current = null;
-          setIsConnected(false);
-        }
-      }
-    });
-
-    return () => {
-      unsubscribe();
-      if (socketRef.current) {
-        socketRef.current.disconnect();
-        socketRef.current = null;
-        setIsConnected(false);
-      }
-    };
-  }, [
-    bodyshop,
-    notification,
-    userAssociationId,
-    markNotificationRead,
-    markAllNotificationsRead,
-    navigate,
-    currentUser,
-    Realtime_Notifications_UI,
-    t
-  ]);
-
-  return (
-    <SocketContext.Provider
-      value={{
-        socket: socketRef.current,
-        clientId,
-        isConnected,
-        markNotificationRead,
-        markAllNotificationsRead,
-        scenarioNotificationsOn: Realtime_Notifications_UI?.treatment === "on"
-      }}
-    >
-      {children}
-    </SocketContext.Provider>
-  );
-};
-
-const useSocket = () => {
-  const context = useContext(SocketContext);
-  // NOTE: Not sure if we absolutely require this, does cause slipups on dev env
-  if (!context) throw new Error("useSocket must be used within a SocketProvider");
-  return context;
-};
-
-export { SocketContext, SocketProvider, INITIAL_NOTIFICATIONS, useSocket };

client/src/graphql/bodyshop.queries.js

@@ -349,13 +349,3 @@ export const QUERY_STRIPE_ID = gql`
     }
   }
 `;
-
-export const GET_ACTIVE_EMPLOYEES_IN_SHOP = gql`
-  query GetActiveEmployeesInShop($shopid: uuid!) {
-    associations(where: { shopid: { _eq: $shopid } }) {
-      id
-      useremail
-      shopid
-    }
-  }
-`;

client/src/graphql/jobs.queries.js

@@ -509,7 +509,6 @@ export const GET_JOB_BY_PK = gql`
       est_ct_ln
       est_ea
       est_ph1
-      flat_rate_ats
       federal_tax_rate
       id
       inproduction
@@ -525,10 +524,6 @@ export const GET_JOB_BY_PK = gql`
       invoice_final_note
       iouparent
       job_totals
-      job_watchers {
-        id
-        user_email
-      }
       joblines(where: { removed: { _eq: false } }, order_by: { line_no: asc }) {
         act_price
         act_price_before_ppc
@@ -650,7 +645,6 @@ export const GET_JOB_BY_PK = gql`
       policy_no
       production_vars
       rate_ats
-      rate_ats_flat
       rate_la1
       rate_la2
       rate_la3
@@ -2573,34 +2567,3 @@ export const GET_JOB_BY_PK_QUICK_INTAKE = gql`
     }
   }
 `;
-
-export const GET_JOB_WATCHERS = gql`
-  query GET_JOB_WATCHERS($jobid: uuid!) {
-    job_watchers(where: { jobid: { _eq: $jobid } }) {
-      id
-      user_email
-    }
-  }
-`;
-
-export const ADD_JOB_WATCHER = gql`
-  mutation ADD_JOB_WATCHER($jobid: uuid!, $userEmail: String!) {
-    insert_job_watchers_one(object: { jobid: $jobid, user_email: $userEmail }) {
-      id
-      jobid
-      user_email
-    }
-  }
-`;
-
-export const REMOVE_JOB_WATCHER = gql`
-  mutation REMOVE_JOB_WATCHER($jobid: uuid!, $userEmail: String!) {
-    delete_job_watchers(where: { jobid: { _eq: $jobid }, user_email: { _eq: $userEmail } }) {
-      affected_rows
-      returning {
-        id
-        user_email
-      }
-    }
-  }
-`;

client/src/graphql/notifications.queries.js

@@ -1,58 +0,0 @@
-import { gql } from "@apollo/client";
-
-export const GET_NOTIFICATIONS = gql`
-  query GetNotifications($limit: Int!, $offset: Int!, $where: notifications_bool_exp) {
-    notifications(limit: $limit, offset: $offset, order_by: { created_at: desc }, where: $where) {
-      id
-      jobid
-      associationid
-      scenario_text
-      fcm_text
-      scenario_meta
-      created_at
-      read
-      job {
-        id
-        ro_number
-      }
-    }
-  }
-`;
-
-export const GET_UNREAD_COUNT = gql`
-  query GetUnreadCount($associationid: uuid!) {
-    notifications_aggregate(where: { read: { _is_null: true }, associationid: { _eq: $associationid } }) {
-      aggregate {
-        count
-      }
-    }
-  }
-`;
-
-export const MARK_ALL_NOTIFICATIONS_READ = gql`
-  mutation MarkAllNotificationsRead($associationid: uuid!) {
-    update_notifications(
-      where: { read: { _is_null: true }, associationid: { _eq: $associationid } }
-      _set: { read: "now()" }
-    ) {
-      affected_rows
-    }
-  }
-`;
-
-export const MARK_NOTIFICATION_READ = gql`
-  mutation MarkNotificationRead($id: uuid!) {
-    update_notifications(where: { id: { _eq: $id } }, _set: { read: "now()" }) {
-      returning {
-        id
-        read
-      }
-    }
-  }
-`;
-
-export const UPDATE_NOTIFICATIONS_READ_FRAGMENT = gql`
-  fragment UpdateNotificationRead on notifications {
-    read
-  }
-`;

client/src/graphql/user.queries.js

@@ -85,21 +85,3 @@ export const UPDATE_KANBAN_SETTINGS = gql`
     }
   }
 `;
-
-export const QUERY_NOTIFICATION_SETTINGS = gql`
-  query QUERY_NOTIFICATION_SETTINGS($email: String!) {
-    associations(where: { _and: { useremail: { _eq: $email }, active: { _eq: true } } }) {
-      id
-      notification_settings
-    }
-  }
-`;
-
-export const UPDATE_NOTIFICATION_SETTINGS = gql`
-  mutation UPDATE_NOTIFICATION_SETTINGS($id: uuid!, $ns: jsonb) {
-    update_associations_by_pk(pk_columns: { id: $id }, _set: { notification_settings: $ns }) {
-      id
-      notification_settings
-    }
-  }
-`;

client/src/pages/jobs-detail/jobs-detail.page.component.jsx

@@ -56,8 +56,6 @@ import { DateTimeFormat } from "../../utils/DateFormatter";
 import dayjs from "../../utils/day";
 import UndefinedToNull from "../../utils/undefinedtonull";
 import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
-import { useSocket } from "../../contexts/SocketIO/useSocket.jsx";
-import JobWatcherToggleContainer from "../../components/job-watcher-toggle/job-watcher-toggle.container.jsx";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -104,7 +102,6 @@ export function JobsDetailPage({
     nextFetchPolicy: "network-only"
   });
   const notification = useNotification();
-  const { scenarioNotificationsOn } = useSocket();
 
   useEffect(() => {
     //form.setFieldsValue(transormJobToForm(job));
@@ -322,13 +319,7 @@ export function JobsDetailPage({
       >
         <PageHeader
           // onBack={() => window.history.back()}
-
-          title={
-            <Space>
-              {scenarioNotificationsOn && <JobWatcherToggleContainer job={job} />}
-              {job.ro_number || t("general.labels.na")}
-            </Space>
-          }
+          title={job.ro_number || t("general.labels.na")}
           extra={menuExtra}
         />
         <JobsDetailHeader job={job} />

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

@@ -1,7 +1,7 @@
 import { FloatButton, Layout, Spin } from "antd";
 
 // import preval from "preval.macro";
-import React, { lazy, Suspense, useEffect, useState } from "react";
+import React, { lazy, Suspense, useContext, useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { Link, Route, Routes } from "react-router-dom";
@@ -20,7 +20,7 @@ import PartnerPingComponent from "../../components/partner-ping/partner-ping.com
 import PrintCenterModalContainer from "../../components/print-center-modal/print-center-modal.container";
 import ShopSubStatusComponent from "../../components/shop-sub-status/shop-sub-status.component";
 import { requestForToken } from "../../firebase/firebase.utils";
-import { useSocket } from "../../contexts/SocketIO/useSocket.jsx";
+import SocketContext from "../../contexts/SocketIO/socketContext.jsx";
 import { selectBodyshop, selectInstanceConflict } from "../../redux/user/user.selectors";
 import UpdateAlert from "../../components/update-alert/update-alert.component";
 import InstanceRenderManager from "../../utils/instanceRenderMgr.js";
@@ -29,7 +29,6 @@ import WssStatusDisplayComponent from "../../components/wss-status-display/wss-s
 import { selectAlerts } from "../../redux/application/application.selectors.js";
 import { addAlerts } from "../../redux/application/application.actions.js";
 import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
-
 const JobsPage = lazy(() => import("../jobs/jobs.page"));
 
 const CardPaymentModalContainer = lazy(
@@ -123,7 +122,7 @@ const mapDispatchToProps = (dispatch) => ({
 export function Manage({ conflict, bodyshop, alerts, setAlerts }) {
   const { t } = useTranslation();
   const [chatVisible] = useState(false);
-  const { socket, clientId } = useSocket();
+  const { socket, clientId } = useContext(SocketContext);
   const notification = useNotification();
 
   // State to track displayed alerts
@@ -147,7 +146,7 @@ export function Manage({ conflict, bodyshop, alerts, setAlerts }) {
       }
     };
 
-    fetchAlerts().catch((err) => `Error fetching Bodyshop Alerts: ${err?.message || ""}`);
+    fetchAlerts();
   }, [setAlerts]);
 
   // Use useEffect to watch for new alerts
@@ -167,6 +166,7 @@ export function Manage({ conflict, bodyshop, alerts, setAlerts }) {
           description: alert.description,
           type: alert.type || "info",
           duration: 0,
+          placement: "bottomRight",
           closable: true,
           onClose: () => {
             // When the notification is closed, update displayed alerts state and localStorage

client/src/pages/payments-all/payments-all.container.page.jsx

@@ -1,6 +1,6 @@
 import { useQuery } from "@apollo/client";
 import queryString from "query-string";
-import { useEffect } from "react";
+import React, { useEffect } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { useLocation } from "react-router-dom";
@@ -10,17 +10,23 @@ import PaymentsListPaginated from "../../components/payments-list-paginated/paym
 import RbacWrapper from "../../components/rbac-wrapper/rbac-wrapper.component";
 import { QUERY_ALL_PAYMENTS_PAGINATED } from "../../graphql/payments.queries";
 import { setBreadcrumbs, setSelectedHeader } from "../../redux/application/application.actions";
+import { selectBodyshop } from "../../redux/user/user.selectors";
 import { pageLimit } from "../../utils/config";
+import FeatureWrapperComponent from "../../components/feature-wrapper/feature-wrapper.component";
 import InstanceRenderManager from "../../utils/instanceRenderMgr";
+import UpsellComponent, { upsellEnum } from "../../components/upsell/upsell.component";
+import { Card } from "antd";
 
-const mapStateToProps = createStructuredSelector({});
+const mapStateToProps = createStructuredSelector({
+  bodyshop: selectBodyshop
+});
 
 const mapDispatchToProps = (dispatch) => ({
   setBreadcrumbs: (breadcrumbs) => dispatch(setBreadcrumbs(breadcrumbs)),
   setSelectedHeader: (key) => dispatch(setSelectedHeader(key))
 });
 
-export function AllJobs({ setBreadcrumbs, setSelectedHeader }) {
+export function AllJobs({ bodyshop, setBreadcrumbs, setSelectedHeader }) {
   const searchParams = queryString.parse(useLocation().search);
   const { page, sortcolumn, sortorder, searchObj } = searchParams;
 
@@ -54,15 +60,25 @@ export function AllJobs({ setBreadcrumbs, setSelectedHeader }) {
 
   if (error) return <AlertComponent message={error.message} type="error" />;
   return (
-    <RbacWrapper action="payments:list">
-      <PaymentsListPaginated
-        refetch={refetch}
-        loading={loading}
-        searchParams={searchParams}
-        total={data ? data.payments_aggregate.aggregate.count : 0}
-        payments={data ? data.payments : []}
-      />
-    </RbacWrapper>
+    <FeatureWrapperComponent
+      featureName="payments"
+      noauth={
+        <Card>
+          <UpsellComponent upsell={upsellEnum().payments.general} />
+        </Card>
+      }
+      z
+    >
+      <RbacWrapper action="payments:list">
+        <PaymentsListPaginated
+          refetch={refetch}
+          loading={loading}
+          searchParams={searchParams}
+          total={data ? data.payments_aggregate.aggregate.count : 0}
+          payments={data ? data.payments : []}
+        />
+      </RbacWrapper>
+    </FeatureWrapperComponent>
   );
 }
 

client/src/utils/GraphQLClient.js

@@ -143,41 +143,7 @@ middlewares.push(
   new SentryLink().concat(roundTripLink.concat(retryLink.concat(errorLink.concat(authLink.concat(link)))))
 );
 
-const cache = new InMemoryCache({
-  typePolicies: {
-    Query: {
-      fields: {
-        // Note: This is required because we switch from a read to an unread state with a toggle,
-        notifications: {
-          merge(existing = [], incoming = [], { readField }) {
-            // Create a map to deduplicate by __ref
-            const merged = new Map();
-
-            // Add existing items to retain cached data
-            existing.forEach((item) => {
-              const ref = readField("__ref", item);
-              if (ref) {
-                merged.set(ref, item);
-              }
-            });
-
-            // Add incoming items, overwriting duplicates
-            incoming.forEach((item) => {
-              const ref = readField("__ref", item);
-              if (ref) {
-                merged.set(ref, item);
-              }
-            });
-
-            // Return incoming to respect the current query’s filter (e.g., unread-only or all)
-            return incoming;
-          }
-        }
-      }
-    }
-  }
-});
-
+const cache = new InMemoryCache({});
 const client = new ApolloClient({
   link: ApolloLink.from(middlewares),
   cache,
@@ -197,5 +163,4 @@ const client = new ApolloClient({
     }
   }
 });
-
 export default client;

client/src/utils/jobNotificationScenarios.js

@@ -1,23 +0,0 @@
-/** Notification Scenarios
- * @description This file contains the scenarios for job notifications.
- * @type {string[]}
- */
-const notificationScenarios = [
-  "job-assigned-to-me",
-  "bill-posted",
-  "critical-parts-status-changed",
-  "part-marked-back-ordered",
-  "new-note-added",
-  "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"
-  // "supplement-imported", // Disabled for now
-];
-
-export { notificationScenarios };

docker-compose-cluster.yml

@@ -1,221 +0,0 @@
-services:
-  # Load Balancer (NGINX) with WebSocket support and session persistence
-  load-balancer:
-    image: nginx:latest
-    container_name: load-balancer
-    ports:
-      - "4000:80"  # External port 4000 maps to NGINX's port 80
-    volumes:
-      - ./nginx-websocket.conf:/etc/nginx/nginx.conf:ro  # Mount NGINX configuration
-    networks:
-      - redis-cluster-net
-    depends_on:
-      - node-app-1
-      - node-app-2
-      - node-app-3
-    healthcheck:
-      test: [ "CMD", "curl", "-f", "http://localhost/health" ]
-      interval: 10s
-      timeout: 5s
-      retries: 5
-
-  # Node App Instance 1
-  node-app-1:
-    build:
-      context: .
-    container_name: node-app-1
-    hostname: node-app-1
-    networks:
-      - redis-cluster-net
-    env_file:
-      - .env.development
-    depends_on:
-      redis-node-1:
-        condition: service_healthy
-      redis-node-2:
-        condition: service_healthy
-      redis-node-3:
-        condition: service_healthy
-      localstack:
-        condition: service_healthy
-      aws-cli:
-        condition: service_completed_successfully
-    ports:
-      - "4001:4000"  # Different external port for local access
-    volumes:
-      - .:/app
-      - node-app-npm-cache:/app/node_modules
-
-  # Node App Instance 2
-  node-app-2:
-    build:
-      context: .
-    container_name: node-app-2
-    hostname: node-app-2
-    networks:
-      - redis-cluster-net
-    env_file:
-      - .env.development
-    depends_on:
-      redis-node-1:
-        condition: service_healthy
-      redis-node-2:
-        condition: service_healthy
-      redis-node-3:
-        condition: service_healthy
-      localstack:
-        condition: service_healthy
-      aws-cli:
-        condition: service_completed_successfully
-    ports:
-      - "4002:4000"  # Different external port for local access
-    volumes:
-      - .:/app
-      - node-app-npm-cache:/app/node_modules
-
-  # Node App Instance 3
-  node-app-3:
-    build:
-      context: .
-    container_name: node-app-3
-    hostname: node-app-3
-    networks:
-      - redis-cluster-net
-    env_file:
-      - .env.development
-    depends_on:
-      redis-node-1:
-        condition: service_healthy
-      redis-node-2:
-        condition: service_healthy
-      redis-node-3:
-        condition: service_healthy
-      localstack:
-        condition: service_healthy
-      aws-cli:
-        condition: service_completed_successfully
-    ports:
-      - "4003:4000"  # Different external port for local access
-    volumes:
-      - .:/app
-      - node-app-npm-cache:/app/node_modules
-
-  # Redis Node 1 
-  redis-node-1:
-    build:
-      context: ./redis
-    container_name: redis-node-1
-    hostname: redis-node-1
-    restart: unless-stopped
-    networks:
-      - redis-cluster-net
-    volumes:
-      - redis-node-1-data:/data
-      - redis-lock:/redis-lock
-    healthcheck:
-      test: [ "CMD", "redis-cli", "ping" ]
-      interval: 10s
-      timeout: 5s
-      retries: 10
-
-  # Redis Node 2  
-  redis-node-2:
-    build:
-      context: ./redis
-    container_name: redis-node-2
-    hostname: redis-node-2
-    restart: unless-stopped
-    networks:
-      - redis-cluster-net
-    volumes:
-      - redis-node-2-data:/data
-      - redis-lock:/redis-lock
-    healthcheck:
-      test: [ "CMD", "redis-cli", "ping" ]
-      interval: 10s
-      timeout: 5s
-      retries: 10
-
-  # Redis Node 3
-  redis-node-3:
-    build:
-      context: ./redis
-    container_name: redis-node-3
-    hostname: redis-node-3
-    restart: unless-stopped
-    networks:
-      - redis-cluster-net
-    volumes:
-      - redis-node-3-data:/data
-      - redis-lock:/redis-lock
-    healthcheck:
-      test: [ "CMD", "redis-cli", "ping" ]
-      interval: 10s
-      timeout: 5s
-      retries: 10
-
-  # LocalStack
-  localstack:
-    image: localstack/localstack
-    container_name: localstack
-    hostname: localstack
-    networks:
-      - redis-cluster-net
-    restart: unless-stopped
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
-    environment:
-      - SERVICES=s3,ses,secretsmanager,cloudwatch,logs
-      - DEBUG=0
-      - AWS_ACCESS_KEY_ID=test
-      - AWS_SECRET_ACCESS_KEY=test
-      - AWS_DEFAULT_REGION=ca-central-1
-      - EXTRA_CORS_ALLOWED_HEADERS=Authorization,Content-Type
-      - EXTRA_CORS_ALLOWED_ORIGINS=*
-      - EXTRA_CORS_EXPOSE_HEADERS=Authorization,Content-Type
-    ports:
-      - "4566:4566"
-    healthcheck:
-      test: [ "CMD", "curl", "-f", "http://localhost:4566/_localstack/health" ]
-      interval: 10s
-      timeout: 5s
-      retries: 5
-      start_period: 20s
-
-  # AWS-CLI
-  aws-cli:
-    image: amazon/aws-cli
-    container_name: aws-cli
-    hostname: aws-cli
-    networks:
-      - redis-cluster-net
-    depends_on:
-      localstack:
-        condition: service_healthy
-    volumes:
-      - './localstack:/tmp/localstack'
-      - './certs:/tmp/certs'
-    environment:
-      - AWS_ACCESS_KEY_ID=test
-      - AWS_SECRET_ACCESS_KEY=test
-      - AWS_DEFAULT_REGION=ca-central-1
-    entrypoint: /bin/sh -c
-    command: >
-      "
-        aws --endpoint-url=http://localstack:4566 ses verify-domain-identity --domain imex.online --region ca-central-1
-        aws --endpoint-url=http://localstack:4566 ses verify-email-identity --email-address noreply@imex.online --region ca-central-1
-        aws --endpoint-url=http://localstack:4566 secretsmanager create-secret --name CHATTER_PRIVATE_KEY --secret-string file:///tmp/certs/io-ftp-test.key
-        aws --endpoint-url=http://localstack:4566 logs create-log-group --log-group-name development --region ca-central-1
-        aws --endpoint-url=http://localstack:4566 s3api create-bucket --bucket imex-large-log --create-bucket-configuration LocationConstraint=ca-central-1
-      "
-
-networks:
-  redis-cluster-net:
-    driver: bridge
-
-volumes:
-  node-app-npm-cache:
-  redis-node-1-data:
-  redis-node-2-data:
-  redis-node-3-data:
-  redis-lock:

hasura/metadata/cron_triggers.yaml

@@ -31,14 +31,6 @@
   headers:
     - name: x-imex-auth
       value_from_env: DATAPUMP_AUTH
-- name: Rome Usage Report
-  webhook: '{{HASURA_API_URL}}/data/usagereport'
-  schedule: 0 12 * * 5
-  include_in_metadata: true
-  payload: {}
-  headers:
-    - name: x-imex-auth
-      value_from_env: DATAPUMP_AUTH
 - name: Task Reminders
   webhook: '{{HASURA_API_URL}}/tasks-remind-handler'
   schedule: '*/15 * * * *'
@@ -47,3 +39,11 @@
   headers:
     - name: event-secret
       value_from_env: EVENT_SECRET
+- name: Rome Usage Report
+  webhook: '{{HASURA_API_URL}}/data/usagereport'
+  schedule: 0 12 * * 5
+  include_in_metadata: true
+  payload: {}
+  headers:
+    - name: x-imex-auth
+      value_from_env: DATAPUMP_AUTH

hasura/metadata/tables.yaml

@@ -198,14 +198,6 @@
     - name: user
       using:
         foreign_key_constraint_on: useremail
-  array_relationships:
-    - name: notifications
-      using:
-        foreign_key_constraint_on:
-          column: associationid
-          table:
-            name: notifications
-            schema: public
   select_permissions:
     - role: user
       permission:
@@ -705,6 +697,12 @@
         - name: event-secret
           value_from_env: EVENT_SECRET
       request_transform:
+        body:
+          action: transform
+          template: |-
+            {
+              "success": true
+            }
         method: POST
         query_params: {}
         template_engine: Kriti
@@ -1135,46 +1133,6 @@
               - active:
                   _eq: true
         check: null
-  event_triggers:
-    - name: cache_bodyshop
-      definition:
-        enable_manual: false
-        update:
-          columns:
-            - shopname
-            - md_order_statuses
-      retry_conf:
-        interval_sec: 10
-        num_retries: 0
-        timeout_sec: 60
-      webhook_from_env: HASURA_API_URL
-      headers:
-        - name: event-secret
-          value_from_env: EVENT_SECRET
-      request_transform:
-        body:
-          action: transform
-          template: |-
-            {
-              "created_at": {{$body.created_at}},
-              "delivery_info": {{$body.delivery_info}},
-              "event": {
-                "data": {
-                  "new": {
-                    "id": {{$body.event.data.new.id}},
-                    "shopname": {{$body.event.data.new.shopname}},
-                    "md_order_statuses": {{$body.event.data.new.md_order_statuses}}
-                  }
-                },
-                "op": {{$body.event.op}},
-                "session_variables": {{$body.event.session_variables}}
-                }
-            }
-        method: POST
-        query_params: {}
-        template_engine: Kriti
-        url: '{{$base_url}}/bodyshop-cache'
-        version: 2
 - table:
     name: cccontracts
     schema: public
@@ -2000,29 +1958,6 @@
                           _eq: X-Hasura-User-Id
                     - active:
                         _eq: true
-  event_triggers:
-    - name: notifications_documents
-      definition:
-        enable_manual: false
-        insert:
-          columns: '*'
-        update:
-          columns:
-            - jobid
-      retry_conf:
-        interval_sec: 10
-        num_retries: 0
-        timeout_sec: 60
-      webhook_from_env: HASURA_API_URL
-      headers:
-        - name: event-secret
-          value_from_env: EVENT_SECRET
-      request_transform:
-        method: POST
-        query_params: {}
-        template_engine: Kriti
-        url: '{{$base_url}}/notifications/events/handleDocumentsChange'
-        version: 2
 - table:
     name: email_audit_trail
     schema: public
@@ -2911,12 +2846,13 @@
     - role: user
       permission:
         check:
-          job:
-            bodyshop:
-              associations:
-                user:
-                  authid:
-                    _eq: X-Hasura-User-Id
+          user:
+            _and:
+              - associations:
+                  active:
+                    _eq: true
+              - authid:
+                  _eq: X-Hasura-User-Id
         columns:
           - user_email
           - created_at
@@ -2932,12 +2868,13 @@
           - id
           - jobid
         filter:
-          job:
-            bodyshop:
-              associations:
-                user:
-                  authid:
-                    _eq: X-Hasura-User-Id
+          user:
+            _and:
+              - associations:
+                  active:
+                    _eq: true
+              - authid:
+                  _eq: X-Hasura-User-Id
       comment: ""
   update_permissions:
     - role: user
@@ -2948,24 +2885,26 @@
           - id
           - jobid
         filter:
-          job:
-            bodyshop:
-              associations:
-                user:
-                  authid:
-                    _eq: X-Hasura-User-Id
+          user:
+            _and:
+              - associations:
+                  active:
+                    _eq: true
+              - authid:
+                  _eq: X-Hasura-User-Id
         check: null
       comment: ""
   delete_permissions:
     - role: user
       permission:
         filter:
-          job:
-            bodyshop:
-              associations:
-                user:
-                  authid:
-                    _eq: X-Hasura-User-Id
+          user:
+            _and:
+              - associations:
+                  active:
+                    _eq: true
+              - authid:
+                  _eq: X-Hasura-User-Id
       comment: ""
 - table:
     name: joblines
@@ -3284,31 +3223,6 @@
                         _eq: X-Hasura-User-Id
                   - active:
                       _eq: true
-  event_triggers:
-    - name: notifications_joblines
-      definition:
-        enable_manual: false
-        update:
-          columns:
-            - critical
-            - status
-      retry_conf:
-        interval_sec: 10
-        num_retries: 0
-        timeout_sec: 60
-      webhook_from_env: HASURA_API_URL
-      headers:
-        - name: event-secret
-          value_from_env: EVENT_SECRET
-      request_transform:
-        body:
-          action: transform
-          template: "{\r\n  \"event\": {\r\n  \"session_variables\": {\r\n    \"x-hasura-user-id\": {{$body?.event?.session_variables?.x-hasura-user-id ?? \"Internal\"}},\r\n    \"x-hasura-role\": {{$body?.event?.session_variables?.x-hasura-role ?? \"Internal\"}}\r\n    }, \r\n    \"op\": \"UPDATE\",\r\n    \"data\": {\r\n      \"old\": {\r\n        \"id\": {{$body.event.data.old.id}},\r\n        \"jobid\": {{$body.event.data.old.jobid}},\r\n        \"critical\": {{$body.event.data.old.critical}},\r\n        \"status\": {{$body.event.data.old.status}},\r\n        \"line_desc\": {{$body.event.data.old.line_desc}}\r\n      },\r\n      \"new\": {\r\n        \"id\": {{$body.event.data.new.id}},\r\n        \"jobid\": {{$body.event.data.new.jobid}},\r\n        \"critical\": {{$body.event.data.new.critical}},\r\n        \"status\": {{$body.event.data.new.status}},\r\n        \"line_desc\": {{$body.event.data.new.line_desc}}\r\n      }\r\n    }\r\n  },\r\n  \"trigger\": {\r\n    \"name\": \"notifications_joblines\"\r\n  },\r\n  \"table\": {\r\n    \"schema\": \"public\",\r\n    \"name\": \"joblines\"\r\n  }\r\n}\r\n"
-        method: POST
-        query_params: {}
-        template_engine: Kriti
-        url: '{{$base_url}}/notifications/events/handleJobLinesChange'
-        version: 2
 - table:
     name: joblines_status
     schema: public
@@ -3455,13 +3369,6 @@
           table:
             name: job_conversations
             schema: public
-    - name: job_watchers
-      using:
-        foreign_key_constraint_on:
-          column: jobid
-          table:
-            name: job_watchers
-            schema: public
     - name: joblines
       using:
         foreign_key_constraint_on:
@@ -3492,13 +3399,6 @@
           table:
             name: notes
             schema: public
-    - name: notifications
-      using:
-        foreign_key_constraint_on:
-          column: jobid
-          table:
-            name: notifications
-            schema: public
     - name: parts_dispatches
       using:
         foreign_key_constraint_on:
@@ -3695,7 +3595,6 @@
           - est_st
           - est_zip
           - federal_tax_rate
-          - flat_rate_ats
           - g_bett_amt
           - id
           - inproduction
@@ -3790,7 +3689,6 @@
           - qb_multiple_payers
           - queued_for_parts
           - rate_ats
-          - rate_ats_flat
           - rate_la1
           - rate_la2
           - rate_la3
@@ -3967,7 +3865,6 @@
           - est_st
           - est_zip
           - federal_tax_rate
-          - flat_rate_ats
           - g_bett_amt
           - id
           - inproduction
@@ -4063,7 +3960,6 @@
           - qb_multiple_payers
           - queued_for_parts
           - rate_ats
-          - rate_ats_flat
           - rate_la1
           - rate_la2
           - rate_la3
@@ -4251,7 +4147,6 @@
           - est_st
           - est_zip
           - federal_tax_rate
-          - flat_rate_ats
           - g_bett_amt
           - id
           - inproduction
@@ -4347,7 +4242,6 @@
           - qb_multiple_payers
           - queued_for_parts
           - rate_ats
-          - rate_ats_flat
           - rate_la1
           - rate_la2
           - rate_la3
@@ -4579,7 +4473,10 @@
       request_transform:
         body:
           action: transform
-          template: "{\r\n  \"event\": {\r\n  \"session_variables\": {\r\n    \"x-hasura-user-id\": {{$body?.event?.session_variables?.x-hasura-user-id ?? \"Internal\"}},\r\n    \"x-hasura-role\": {{$body?.event?.session_variables?.x-hasura-role ?? \"Internal\"}}\r\n    }, \r\n    \"op\": \"UPDATE\",\r\n    \"data\": {\r\n      \"old\": {\r\n        \"id\": {{$body.event.data.old.id}},\r\n        \"ro_number\": {{$body.event.data.old.ro_number}},\r\n        \"queued_for_parts\": {{$body.event.data.old.queued_for_parts}},\r\n        \"employee_prep\": {{$body.event.data.old.employee_prep}},\r\n        \"clm_total\": {{$body.event.data.old.clm_total}},\r\n        \"towin\": {{$body.event.data.old.towin}},\r\n        \"employee_body\": {{$body.event.data.old.employee_body}},\r\n        \"converted\": {{$body.event.data.old.converted}},\r\n        \"scheduled_in\": {{$body.event.data.old.scheduled_in}},\r\n        \"scheduled_completion\": {{$body.event.data.old.scheduled_completion}},\r\n        \"scheduled_delivery\": {{$body.event.data.old.scheduled_delivery}},\r\n        \"actual_delivery\": {{$body.event.data.old.actual_delivery}},\r\n        \"actual_completion\": {{$body.event.data.old.actual_completion}},\r\n        \"alt_transport\": {{$body.event.data.old.alt_transport}},\r\n        \"date_exported\": {{$body.event.data.old.date_exported}},\r\n        \"status\": {{$body.event.data.old.status}},\r\n        \"employee_csr\": {{$body.event.data.old.employee_csr}},\r\n        \"actual_in\": {{$body.event.data.old.actual_in}},\r\n        \"deliverchecklist\": {{$body.event.data.old.deliverchecklist}},\r\n        \"comment\": {{$body.event.data.old.comment}},\r\n        \"employee_refinish\": {{$body.event.data.old.employee_refinish}},\r\n        \"inproduction\": {{$body.event.data.old.inproduction}},\r\n        \"production_vars\": {{$body.event.data.old.production_vars}},\r\n        \"intakechecklist\": {{$body.event.data.old.intakechecklist}},\r\n        \"cieca_ttl\": {{$body.event.data.old.cieca_ttl}},\r\n        \"date_invoiced\": {{$body.event.data.old.date_invoiced}}\r\n      },\r\n      \"new\": {\r\n        \"id\": {{$body.event.data.new.id}},\r\n        \"ro_number\": {{$body.event.data.old.ro_number}},\r\n        \"queued_for_parts\": {{$body.event.data.new.queued_for_parts}},\r\n        \"employee_prep\": {{$body.event.data.new.employee_prep}},\r\n        \"clm_total\": {{$body.event.data.new.clm_total}},\r\n        \"towin\": {{$body.event.data.new.towin}},\r\n        \"employee_body\": {{$body.event.data.new.employee_body}},\r\n        \"converted\": {{$body.event.data.new.converted}},\r\n        \"scheduled_in\": {{$body.event.data.new.scheduled_in}},\r\n        \"scheduled_completion\": {{$body.event.data.new.scheduled_completion}},\r\n        \"scheduled_delivery\": {{$body.event.data.new.scheduled_delivery}},\r\n        \"actual_delivery\": {{$body.event.data.new.actual_delivery}},\r\n        \"actual_completion\": {{$body.event.data.new.actual_completion}},\r\n        \"alt_transport\": {{$body.event.data.new.alt_transport}},\r\n        \"date_exported\": {{$body.event.data.new.date_exported}},\r\n        \"status\": {{$body.event.data.new.status}},\r\n        \"employee_csr\": {{$body.event.data.new.employee_csr}},\r\n        \"actual_in\": {{$body.event.data.new.actual_in}},\r\n        \"deliverchecklist\": {{$body.event.data.new.deliverchecklist}},\r\n        \"comment\": {{$body.event.data.new.comment}},\r\n        \"employee_refinish\": {{$body.event.data.new.employee_refinish}},\r\n        \"inproduction\": {{$body.event.data.new.inproduction}},\r\n        \"production_vars\": {{$body.event.data.new.production_vars}},\r\n        \"intakechecklist\": {{$body.event.data.new.intakechecklist}},\r\n        \"cieca_ttl\": {{$body.event.data.new.cieca_ttl}},\r\n        \"date_invoiced\": {{$body.event.data.new.date_invoiced}}\r\n      }\r\n    }\r\n  },\r\n  \"trigger\": {\r\n    \"name\": \"notifications_jobs\"\r\n  },\r\n  \"table\": {\r\n    \"schema\": \"public\",\r\n    \"name\": \"jobs\"\r\n  }\r\n}\r\n"
+          template: |-
+            {
+              "success": true
+            }
         method: POST
         query_params: {}
         template_engine: Kriti
@@ -4928,26 +4825,6 @@
                         _eq: X-Hasura-User-Id
                   - active:
                       _eq: true
-  event_triggers:
-    - name: notifications_notes
-      definition:
-        enable_manual: false
-        insert:
-          columns: '*'
-      retry_conf:
-        interval_sec: 10
-        num_retries: 0
-        timeout_sec: 60
-      webhook_from_env: HASURA_API_URL
-      headers:
-        - name: event-secret
-          value_from_env: EVENT_SECRET
-      request_transform:
-        method: POST
-        query_params: {}
-        template_engine: Kriti
-        url: '{{$base_url}}/notifications/events/handleNotesChange'
-        version: 2
 - table:
     name: notifications
     schema: public
@@ -4958,79 +4835,46 @@
     - name: job
       using:
         foreign_key_constraint_on: jobid
-  insert_permissions:
-    - role: user
-      permission:
-        check:
-          job:
-            bodyshop:
-              associations:
-                _and:
-                  - user:
-                      authid:
-                        _eq: X-Hasura-User-Id
-                  - active:
-                      _eq: true
-        columns:
-          - scenario_meta
-          - scenario_text
-          - fcm_text
-          - created_at
-          - read
-          - updated_at
-          - associationid
-          - id
-          - jobid
-      comment: ""
   select_permissions:
     - role: user
       permission:
         columns:
-          - scenario_meta
-          - scenario_text
-          - fcm_text
-          - created_at
-          - read
-          - updated_at
           - associationid
+          - created_at
+          - fcm_data
+          - fcm_message
+          - fcm_title
           - id
           - jobid
+          - meta
+          - read
+          - ui_translation_meta
+          - ui_translation_string
+          - updated_at
         filter:
-          job:
-            bodyshop:
-              associations:
-                _and:
-                  - user:
-                      authid:
-                        _eq: X-Hasura-User-Id
-                  - active:
-                      _eq: true
-        allow_aggregations: true
+          association:
+            _and:
+              - active:
+                  _eq: true
+              - user:
+                  authid:
+                    _eq: X-Hasura-User-Id
       comment: ""
   update_permissions:
     - role: user
       permission:
         columns:
-          - scenario_meta
-          - scenario_text
-          - fcm_text
-          - created_at
+          - meta
           - read
-          - updated_at
-          - associationid
-          - id
-          - jobid
-        filter: {}
-        check:
-          job:
-            bodyshop:
-              associations:
-                _and:
-                  - user:
-                      authid:
-                        _eq: X-Hasura-User-Id
-                  - active:
-                      _eq: true
+        filter:
+          association:
+            _and:
+              - active:
+                  _eq: true
+              - user:
+                  authid:
+                    _eq: X-Hasura-User-Id
+        check: null
       comment: ""
 - table:
     name: owners
@@ -5272,6 +5116,32 @@
                   - active:
                       _eq: true
         check: null
+  event_triggers:
+    - name: notifications_parts_dispatch
+      definition:
+        enable_manual: false
+        insert:
+          columns: '*'
+      retry_conf:
+        interval_sec: 10
+        num_retries: 0
+        timeout_sec: 60
+      webhook_from_env: HASURA_API_URL
+      headers:
+        - name: event-secret
+          value_from_env: EVENT_SECRET
+      request_transform:
+        body:
+          action: transform
+          template: |-
+            {
+              "success": true
+            }
+        method: POST
+        query_params: {}
+        template_engine: Kriti
+        url: '{{$base_url}}/notifications/events/handlePartsDispatchChange'
+        version: 2
 - table:
     name: parts_dispatch_lines
     schema: public
@@ -5778,25 +5648,6 @@
                   - active:
                       _eq: true
   event_triggers:
-    - name: notifications_payments
-      definition:
-        enable_manual: false
-        insert:
-          columns: '*'
-      retry_conf:
-        interval_sec: 10
-        num_retries: 0
-        timeout_sec: 60
-      webhook_from_env: HASURA_API_URL
-      headers:
-        - name: event-secret
-          value_from_env: EVENT_SECRET
-      request_transform:
-        method: POST
-        query_params: {}
-        template_engine: Kriti
-        url: '{{$base_url}}/notifications/events/handlePaymentsChange'
-        version: 2
     - name: os_payments
       definition:
         delete:
@@ -6268,15 +6119,9 @@
           columns: '*'
         update:
           columns:
-            - joblineid
             - assigned_to
-            - due_date
-            - partsorderid
             - completed
             - description
-            - billid
-            - title
-            - priority
       retry_conf:
         interval_sec: 10
         num_retries: 0
@@ -6286,6 +6131,12 @@
         - name: event-secret
           value_from_env: EVENT_SECRET
       request_transform:
+        body:
+          action: transform
+          template: |-
+            {
+              "success": true
+            }
         method: POST
         query_params: {}
         template_engine: Kriti
@@ -6462,6 +6313,12 @@
         - name: event-secret
           value_from_env: EVENT_SECRET
       request_transform:
+        body:
+          action: transform
+          template: |-
+            {
+              "success": true
+            }
         method: POST
         query_params: {}
         template_engine: Kriti
@@ -6729,13 +6586,6 @@
           table:
             name: ioevents
             schema: public
-    - name: job_watchers
-      using:
-        foreign_key_constraint_on:
-          column: user_email
-          table:
-            name: job_watchers
-            schema: public
     - name: messages
       using:
         foreign_key_constraint_on:

hasura/migrations/1740162115648_alter_table_public_notifications_add_column_html_body/down.sql

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

hasura/migrations/1740162115648_alter_table_public_notifications_add_column_html_body/up.sql

@@ -1,2 +0,0 @@
-alter table "public"."notifications" add column "html_body" text
- not null;

hasura/migrations/1740162296457_alter_table_public_notifications_alter_column_fcm_title/down.sql

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

hasura/migrations/1740162296457_alter_table_public_notifications_alter_column_fcm_title/up.sql

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

hasura/migrations/1740162315085_alter_table_public_notifications_alter_column_fcm_message/down.sql

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

hasura/migrations/1740162315085_alter_table_public_notifications_alter_column_fcm_message/up.sql

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

hasura/migrations/1740417011431_alter_table_public_notifications_drop_column_html_body/down.sql

@@ -1,3 +0,0 @@
-comment on column "public"."notifications"."html_body" is E'Real Time Notifications System';
-alter table "public"."notifications" alter column "html_body" drop not null;
-alter table "public"."notifications" add column "html_body" text;

hasura/migrations/1740417011431_alter_table_public_notifications_drop_column_html_body/up.sql

@@ -1 +0,0 @@
-alter table "public"."notifications" drop column "html_body" cascade;

hasura/migrations/1740417046609_alter_table_public_notifications_drop_column_fcm_data/down.sql

@@ -1,4 +0,0 @@
-comment on column "public"."notifications"."fcm_data" is E'Real Time Notifications System';
-alter table "public"."notifications" alter column "fcm_data" set default jsonb_build_object();
-alter table "public"."notifications" alter column "fcm_data" drop not null;
-alter table "public"."notifications" add column "fcm_data" jsonb;

hasura/migrations/1740417046609_alter_table_public_notifications_drop_column_fcm_data/up.sql

@@ -1 +0,0 @@
-alter table "public"."notifications" drop column "fcm_data" cascade;

hasura/migrations/1740417076166_alter_table_public_notifications_drop_column_fcm_message/down.sql

@@ -1,3 +0,0 @@
-comment on column "public"."notifications"."fcm_message" is E'Real Time Notifications System';
-alter table "public"."notifications" alter column "fcm_message" drop not null;
-alter table "public"."notifications" add column "fcm_message" text;

hasura/migrations/1740417076166_alter_table_public_notifications_drop_column_fcm_message/up.sql

@@ -1 +0,0 @@
-alter table "public"."notifications" drop column "fcm_message" cascade;

hasura/migrations/1740417110704_alter_table_public_notifications_drop_column_ui_translation_string/down.sql

@@ -1,3 +0,0 @@
-comment on column "public"."notifications"."ui_translation_string" is E'Real Time Notifications System';
-alter table "public"."notifications" alter column "ui_translation_string" drop not null;
-alter table "public"."notifications" add column "ui_translation_string" text;

hasura/migrations/1740417110704_alter_table_public_notifications_drop_column_ui_translation_string/up.sql

@@ -1 +0,0 @@
-alter table "public"."notifications" drop column "ui_translation_string" cascade;

hasura/migrations/1740417137294_alter_table_public_notifications_alter_column_fcm_title/down.sql

@@ -1 +0,0 @@
-alter table "public"."notifications" rename column "fcm_text" to "fcm_title";

hasura/migrations/1740417137294_alter_table_public_notifications_alter_column_fcm_title/up.sql

@@ -1 +0,0 @@
-alter table "public"."notifications" rename column "fcm_title" to "fcm_text";

hasura/migrations/1740417505757_alter_table_public_notifications_alter_column_ui_translation_meta/down.sql

@@ -1 +0,0 @@
-alter table "public"."notifications" rename column "scenario_text" to "ui_translation_meta";

hasura/migrations/1740417505757_alter_table_public_notifications_alter_column_ui_translation_meta/up.sql

@@ -1 +0,0 @@
-alter table "public"."notifications" rename column "ui_translation_meta" to "scenario_text";

hasura/migrations/1740417594189_alter_table_public_notifications_alter_column_meta/down.sql

@@ -1 +0,0 @@
-alter table "public"."notifications" rename column "scenario_meta" to "meta";

hasura/migrations/1740417594189_alter_table_public_notifications_alter_column_meta/up.sql

@@ -1 +0,0 @@
-alter table "public"."notifications" rename column "meta" to "scenario_meta";

hasura/migrations/1741145815435_create_index_idx_job_watchers_jobid_user_email_unique/down.sql

@@ -1 +0,0 @@
-DROP INDEX IF EXISTS "public"."idx_job_watchers_jobid_user_email_unique";

hasura/migrations/1741145815435_create_index_idx_job_watchers_jobid_user_email_unique/up.sql

@@ -1,2 +0,0 @@
-CREATE UNIQUE INDEX "idx_job_watchers_jobid_user_email_unique" on
-  "public"."job_watchers" using btree ("jobid", "user_email");

hasura/migrations/1741904378259_create_index_notificiations_idx_jobs/down.sql

@@ -1 +0,0 @@
-DROP INDEX IF EXISTS "public"."notificiations_idx_jobs";

hasura/migrations/1741904378259_create_index_notificiations_idx_jobs/up.sql

@@ -1,2 +0,0 @@
-CREATE  INDEX "notificiations_idx_jobs" on
-  "public"."notifications" using btree ("jobid");

hasura/migrations/1741904395934_create_index_notifications_idx_associations/down.sql

@@ -1 +0,0 @@
-DROP INDEX IF EXISTS "public"."notifications_idx_associations";

hasura/migrations/1741904395934_create_index_notifications_idx_associations/up.sql

@@ -1,2 +0,0 @@
-CREATE  INDEX "notifications_idx_associations" on
-  "public"."notifications" using btree ("associationid");

hasura/migrations/1741904614090_run_sql_migration/down.sql

@@ -1,3 +0,0 @@
--- Could not auto-generate a down migration.
--- Please write an appropriate down migration for the SQL below:
--- CREATE INDEX idx_notifications_created_at_not_read ON notifications(created_at desc, read) where read is null;

hasura/migrations/1741904614090_run_sql_migration/up.sql

@@ -1 +0,0 @@
-CREATE INDEX idx_notifications_created_at_not_read ON notifications(created_at desc, read) where read is null;

hasura/migrations/1741904805838_run_sql_migration/down.sql

@@ -1,3 +0,0 @@
--- Could not auto-generate a down migration.
--- Please write an appropriate down migration for the SQL below:
--- CREATE INDEX idx_notifications_associations_not_read ON notifications(associationid, read) where read is null;

hasura/migrations/1741904805838_run_sql_migration/up.sql

@@ -1 +0,0 @@
-CREATE INDEX idx_notifications_associations_not_read ON notifications(associationid, read) where read is null;

hasura/migrations/1742583400542_alter_table_public_jobs_add_column_flat_rate_ats/down.sql

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

hasura/migrations/1742583400542_alter_table_public_jobs_add_column_flat_rate_ats/up.sql

@@ -1,2 +0,0 @@
-alter table "public"."jobs" add column "flat_rate_ats" boolean
- null default 'false';

hasura/migrations/1742583433746_alter_table_public_jobs_add_column_rate_ats_flat/down.sql

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

hasura/migrations/1742583433746_alter_table_public_jobs_add_column_rate_ats_flat/up.sql

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

nginx-websocket.conf

@@ -1,45 +0,0 @@
-events {
-    worker_connections 1024;
-}
-
-http {
-    upstream node_app {
-        ip_hash;  # Enables session persistence based on client IP
-        server node-app-1:4000;
-        server node-app-2:4000;
-        server node-app-3:4000;
-    }
-
-    # WebSocket upgrade configuration
-    map $http_upgrade $connection_upgrade {
-        default upgrade;
-        ''      close;
-    }
-
-    server {
-        listen 80;
-        
-        location / {
-            proxy_pass http://node_app;
-            proxy_set_header Host $host;
-            proxy_set_header X-Real-IP $remote_addr;
-            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-            proxy_set_header X-Forwarded-Proto $scheme;
-            
-            # WebSocket headers
-            proxy_http_version 1.1;
-            proxy_set_header Upgrade $http_upgrade;
-            proxy_set_header Connection $connection_upgrade;
-            proxy_read_timeout 86400;  # Keep WebSocket connections alive (24 hours)
-        }
-
-        # Health check endpoint
-        location /health {
-            proxy_pass http://node_app;
-            proxy_set_header Host $host;
-            proxy_set_header X-Real-IP $remote_addr;
-            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-            proxy_set_header X-Forwarded-Proto $scheme;
-        }
-    }
-}

package.json

@@ -19,41 +19,39 @@
     "makeitpretty": "prettier --write \"**/*.{css,js,json,jsx,scss}\""
   },
   "dependencies": {
-    "@aws-sdk/client-cloudwatch-logs": "^3.758.0",
-    "@aws-sdk/client-elasticache": "^3.758.0",
-    "@aws-sdk/client-s3": "^3.758.0",
-    "@aws-sdk/client-secrets-manager": "^3.758.0",
-    "@aws-sdk/client-ses": "^3.758.0",
-    "@aws-sdk/credential-provider-node": "^3.758.0",
+    "@aws-sdk/client-cloudwatch-logs": "^3.738.0",
+    "@aws-sdk/client-elasticache": "^3.738.0",
+    "@aws-sdk/client-s3": "^3.738.0",
+    "@aws-sdk/client-secrets-manager": "^3.738.0",
+    "@aws-sdk/client-ses": "^3.738.0",
+    "@aws-sdk/credential-provider-node": "^3.738.0",
     "@opensearch-project/opensearch": "^2.13.0",
     "@socket.io/admin-ui": "^0.5.1",
     "@socket.io/redis-adapter": "^8.3.0",
     "aws4": "^1.13.2",
-    "axios": "^1.8.1",
-    "bee-queue": "^1.7.1",
+    "axios": "^1.7.7",
     "better-queue": "^3.8.12",
     "bluebird": "^3.7.2",
     "body-parser": "^1.20.3",
-    "bullmq": "^5.41.7",
-    "chart.js": "^4.4.8",
+    "chart.js": "^4.4.6",
     "cloudinary": "^2.5.1",
-    "compression": "^1.8.0",
+    "compression": "^1.7.5",
     "cookie-parser": "^1.4.7",
     "cors": "2.8.5",
     "crisp-status-reporter": "^1.2.2",
     "csrf": "^3.1.0",
-    "dd-trace": "^5.40.0",
+    "dd-trace": "^5.33.1",
     "dinero.js": "^1.9.1",
     "dotenv": "^16.4.5",
     "express": "^4.21.1",
-    "firebase-admin": "^13.1.0",
+    "firebase-admin": "^13.0.2",
     "graphql": "^16.10.0",
     "graphql-request": "^6.1.0",
     "inline-css": "^4.0.3",
-    "intuit-oauth": "^4.2.0",
-    "ioredis": "^5.5.0",
+    "intuit-oauth": "^4.1.3",
+    "ioredis": "^5.4.2",
     "json-2-csv": "^5.5.8",
-    "juice": "^11.0.1",
+    "juice": "^11.0.0",
     "lodash": "^4.17.21",
     "moment": "^2.30.1",
     "moment-timezone": "^0.5.47",
@@ -66,7 +64,7 @@
     "redis": "^4.7.0",
     "rimraf": "^6.0.1",
     "skia-canvas": "^2.0.2",
-    "soap": "^1.1.9",
+    "soap": "^1.1.7",
     "socket.io": "^4.8.1",
     "socket.io-adapter": "^2.5.5",
     "ssh2-sftp-client": "^11.0.0",
@@ -78,14 +76,14 @@
     "xmlbuilder2": "^3.1.1"
   },
   "devDependencies": {
-    "@eslint/js": "^9.21.0",
-    "@trivago/prettier-plugin-sort-imports": "^5.2.2",
+    "@eslint/js": "^9.19.0",
+    "@trivago/prettier-plugin-sort-imports": "^4.3.0",
     "concurrently": "^8.2.2",
-    "eslint": "^9.21.0",
+    "eslint": "^9.19.0",
     "eslint-plugin-react": "^7.37.4",
-    "globals": "^15.15.0",
+    "globals": "^15.14.0",
     "p-limit": "^3.1.0",
-    "prettier": "^3.5.3",
+    "prettier": "^3.3.3",
     "source-map-explorer": "^2.5.2"
   }
 }