feature/IO-3000-Migrate-MSG-to-Sockets - Progress Checkpoint

Signed-off-by: Dave Richer <dave@imexsystems.ca>

.circleci/config.yml

@@ -9,13 +9,13 @@ orbs:
 jobs:
   imex-api-deploy:
     docker:
-      - image: cimg/node:22.13.1
+      - image: cimg/node:18.18.2
     steps:
       - checkout
       - eb/setup
       - run:
           command: |
-            eb init imex-online-production-api -r ca-central-1 -p "Node.js 22 running on 64bit Amazon Linux 2"
+            eb init imex-online-production-api -r ca-central-1 -p "Node.js 18 running on 64bit Amazon Linux 2"
             eb status --verbose
             eb deploy
             eb status
@@ -28,7 +28,7 @@ jobs:
 
   imex-hasura-migrate:
     docker:
-      - image: cimg/node:22.13.1
+      - image: cimg/node:18.18.2
     parameters:
       secret:
         type: string
@@ -52,7 +52,7 @@ jobs:
           pipeline_number: << pipeline.number >>
   imex-app-build:
     docker:
-      - image: cimg/node:22.13.1
+      - image: cimg/node:18.18.2
     resource_class: large
     working_directory: ~/repo/client
     steps:
@@ -77,7 +77,7 @@ jobs:
 
   imex-app-beta-build:
     docker:
-      - image: cimg/node:22.13.1
+      - image: cimg/node:18.18.2
     resource_class: large
     working_directory: ~/repo/client
 
@@ -114,7 +114,7 @@ jobs:
       - eb/setup
       - run:
           command: |
-            eb init romeonline-productionapi -r us-east-2 -p "Node.js 22 on 64bit Amazon Linux 2"
+            eb init romeonline-productionapi -r us-east-2 -p "Node.js 18 running on 64bit Amazon Linux 2"
             eb status --verbose
             eb deploy
             eb status
@@ -126,7 +126,7 @@ jobs:
           pipeline_number: << pipeline.number >>
   rome-hasura-migrate:
     docker:
-      - image: cimg/node:22.13.1
+      - image: cimg/node:18.18.2
     parameters:
       secret:
         type: string
@@ -150,7 +150,7 @@ jobs:
           pipeline_number: << pipeline.number >>
   rome-app-build:
     docker:
-      - image: cimg/node:22.13.1
+      - image: cimg/node:18.18.2
 
     working_directory: ~/repo/client
 
@@ -179,9 +179,40 @@ jobs:
           job_type: deployment
           pipeline_number: << pipeline.number >>
 
+  promanager-app-build:
+    docker:
+      - image: cimg/node:18.18.2
+
+    working_directory: ~/repo/client
+
+    steps:
+      - checkout:
+          path: ~/repo
+      - run:
+          name: Install Dependencies
+          command: npm i
+
+      - run: npm run build:production:promanager
+
+      - aws-cli/setup:
+          aws_access_key_id: AWS_ACCESS_KEY_ID
+          aws_secret_access_key: AWS_SECRET_ACCESS_KEY
+          region: AWS_REGION
+
+      - aws-s3/sync:
+          from: dist
+          to: "s3://promanager-production/"
+          arguments: "--exclude '*.map'"
+      - jira/notify:
+          environment: Production (ProManager) - Front End
+          environment_type: production
+          pipeline_id: << pipeline.id >>
+          job_type: deployment
+          pipeline_number: << pipeline.number >>
+
   test-rome-hasura-migrate:
     docker:
-      - image: cimg/node:22.13.1
+      - image: cimg/node:18.18.2
     parameters:
       secret:
         type: string
@@ -208,7 +239,7 @@ jobs:
 
   test-rome-app-build:
     docker:
-      - image: cimg/node:22.13.1
+      - image: cimg/node:18.18.2
 
     working_directory: ~/repo/client
 
@@ -237,9 +268,40 @@ jobs:
           job_type: deployment
           pipeline_number: << pipeline.number >>
 
+  test-promanager-app-build:
+    docker:
+      - image: cimg/node:18.18.2
+
+    working_directory: ~/repo/client
+
+    steps:
+      - checkout:
+          path: ~/repo
+      - run:
+          name: Install Dependencies
+          command: npm i
+
+      - run: npm run build:test:promanager
+
+      - aws-cli/setup:
+          aws_access_key_id: AWS_ACCESS_KEY_ID
+          aws_secret_access_key: AWS_SECRET_ACCESS_KEY
+          region: AWS_REGION
+
+      - aws-s3/sync:
+          from: dist
+          to: "s3://promanager-testing/"
+          arguments: "--exclude '*.map'"
+      - jira/notify:
+          environment: Test (ProManager) - Front End
+          environment_type: testing
+          pipeline_id: << pipeline.id >>
+          job_type: deployment
+          pipeline_number: << pipeline.number >>
+
   test-hasura-migrate:
     docker:
-      - image: cimg/node:22.13.1
+      - image: cimg/node:18.18.2
     parameters:
       secret:
         type: string
@@ -266,7 +328,7 @@ jobs:
 
   imex-test-app-build:
     docker:
-      - image: cimg/node:22.13.1
+      - image: cimg/node:18.18.2
     resource_class: large
     working_directory: ~/repo/client
 
@@ -286,7 +348,7 @@ jobs:
 
   imex-test-app-beta-build:
     docker:
-      - image: cimg/node:22.13.1
+      - image: cimg/node:18.18.2
     resource_class: large
     working_directory: ~/repo/client
 
@@ -396,6 +458,14 @@ workflows:
           filters:
             branches:
               only: test-AIO
+      - test-promanager-app-build:
+          filters:
+            branches:
+              only: test-AIO
+      - promanager-app-build:
+          filters:
+            branches:
+              only: master-AIO
       - test-rome-hasura-migrate:
           secret: ${HASURA_ROME_TEST_SECRET}
           filters:

.gitattributes

@@ -1,80 +1 @@
-# Ensure all text files use LF for line endings
 * text eol=lf
-
-# Binary files should not be modified by Git
-*.png binary
-*.jpg binary
-*.jpeg binary
-*.gif binary
-*.ico binary
-*.webp binary
-*.svg binary
-
-# Fonts
-*.woff binary
-*.woff2 binary
-*.ttf binary
-*.otf binary
-*.eot binary
-
-# Videos
-*.mp4 binary
-*.mov binary
-*.avi binary
-*.mkv binary
-*.webm binary
-
-# Audio
-*.mp3 binary
-*.wav binary
-*.ogg binary
-*.flac binary
-
-# Archives and compressed files
-*.zip binary
-*.gz binary
-*.tar binary
-*.7z binary
-*.rar binary
-
-# PDF and documents
-*.pdf binary
-*.doc binary
-*.docx binary
-*.xls binary
-*.xlsx binary
-*.ppt binary
-*.pptx binary
-
-# Exclude JSON and other data files from text processing, if necessary
-*.json text
-*.xml text
-*.csv text
-
-# Scripts and code files should maintain LF endings
-*.js text eol=lf
-*.jsx text eol=lf
-*.ts text eol=lf
-*.tsx text eol=lf
-*.css text eol=lf
-*.scss text eol=lf
-*.html text eol=lf
-*.yml text eol=lf
-*.yaml text eol=lf
-*.md text eol=lf
-*.sh text eol=lf
-*.py text eol=lf
-*.rb text eol=lf
-*.java text eol=lf
-*.php text eol=lf
-
-# Git configuration files
-.gitattributes text eol=lf
-.gitignore text eol=lf
-*.gitattributes text eol=lf
-
-# Exclude some other potential binary files
-*.db binary
-*.sqlite binary
-*.exe binary
-*.dll binary

.platform/hooks/predeploy/01-install-dd.sh

@@ -1,5 +0,0 @@
-#!/bin/bash
-
-DD_API_KEY=58d91898a70c6fd659f6eea768a57976 DD_SITE="us3.datadoghq.com" bash -c "$(curl -L https://install.datadoghq.com/scripts/install_script_agent7.sh)"
-
-echo "Datadog agent installed."

.vscode/settings.json

@@ -38,6 +38,5 @@
     "smartscheduling",
     "timetickets",
     "touchtime"
-  ],
-  "eslint.workingDirectories": ["./", "./client"]
+  ]
 }

Dockerfile

@@ -3,10 +3,11 @@ FROM amazonlinux:2023
 
 # Install Git and Node.js (Amazon Linux 2023 uses the DNF package manager)
 RUN dnf install -y git \
-    && curl -sL https://rpm.nodesource.com/setup_22.x | bash - \
+    && curl -sL https://rpm.nodesource.com/setup_20.x | bash - \
     && dnf install -y nodejs \
     && dnf clean all
 
+
 # Install dependencies required by node-canvas
 RUN dnf install -y \
     gcc \
@@ -18,22 +19,9 @@ RUN dnf install -y \
     libpng-devel \
     make \
     python3 \
-    fontconfig \
-    freetype \
     python3-pip \
-    wget \
-    unzip \
     && dnf clean all
 
-# Install Montserrat fonts
-RUN cd /tmp \
-    && wget https://images.imex.online/fonts/montserrat.zip -O montserrat.zip \
-    && unzip montserrat.zip -d montserrat \
-    && mv montserrat/montserrat/*.ttf /usr/share/fonts \
-    && fc-cache -fv \
-    && rm -rf /tmp/montserrat /tmp/montserrat.zip \
-    && echo "Montserrat fonts installed and cached successfully."
-
 # Set the working directory
 WORKDIR /app
 

_reference/JSON/BodyshopFeatures.json

@@ -10,8 +10,5 @@
   "courtesycars": "date",
   "media": "date",
   "visualboard": "date",
-  "scoreboard": "date",
-  "checklist": "date",
-  "smartscheduling" :"date",
-  "roguard": "date"
+  "scoreboard": "date"
 }

certs/io-ftp-test.key

@@ -1,12 +0,0 @@
------BEGIN OPENSSH PRIVATE KEY-----
-b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAArAAAABNlY2RzYS
-1zaGEyLW5pc3RwNTIxAAAACG5pc3RwNTIxAAAAhQQBYJnAujo17diR0fM2Ze1d1Ft6XHm5
-U31pXdFEN+rGC4SoYTdZE8q3relxMS5GwwBOvgvVUuayfid2XS8ls/CMDiMBJAYqEK4CRY
-PbbPB7lLnMWsF7muFhvs+SIpPQC+vtDwM2TKlxF0Y8p+iVRpvCADoggsSze7skmJWKmMTt
-8jEdEOcAAAEQIyXsOSMl7DkAAAATZWNkc2Etc2hhMi1uaXN0cDUyMQAAAAhuaXN0cDUyMQ
-AAAIUEAWCZwLo6Ne3YkdHzNmXtXdRbelx5uVN9aV3RRDfqxguEqGE3WRPKt63pcTEuRsMA
-Tr4L1VLmsn4ndl0vJbPwjA4jASQGKhCuAkWD22zwe5S5zFrBe5rhYb7PkiKT0Avr7Q8DNk
-ypcRdGPKfolUabwgA6IILEs3u7JJiVipjE7fIxHRDnAAAAQUO5dO9G7i0bxGTP0zV3eIwv
-5g0NhrQJfW/bMHS6XWwaxdpr+QZ+DbBJVzZPwYC0wLMW4bJAf+kjqUnj4wGocoTeAAAAD2
-lvLWZ0cC10ZXN0LWtleQECAwQ=
------END OPENSSH PRIVATE KEY-----

certs/io-ftp-test.key.pub

@@ -1 +0,0 @@
-ecdsa-sha2-nistp521 AAAAE2VjZHNhLXNoYTItbmlzdHA1MjEAAAAIbmlzdHA1MjEAAACFBAFgmcC6OjXt2JHR8zZl7V3UW3pceblTfWld0UQ36sYLhKhhN1kTyret6XExLkbDAE6+C9VS5rJ+J3ZdLyWz8IwOIwEkBioQrgJFg9ts8HuUucxawXua4WG+z5Iik9AL6+0PAzZMqXEXRjyn6JVGm8IAOiCCxLN7uySYlYqYxO3yMR0Q5w== io-ftp-test-key

certs/io-ftp-test.ppk

@@ -1,12 +0,0 @@
-PuTTY-User-Key-File-3: ecdsa-sha2-nistp521
-Encryption: none
-Comment: io-ftp-test-key
-Public-Lines: 4
-AAAAE2VjZHNhLXNoYTItbmlzdHA1MjEAAAAIbmlzdHA1MjEAAACFBAFgmcC6OjXt
-2JHR8zZl7V3UW3pceblTfWld0UQ36sYLhKhhN1kTyret6XExLkbDAE6+C9VS5rJ+
-J3ZdLyWz8IwOIwEkBioQrgJFg9ts8HuUucxawXua4WG+z5Iik9AL6+0PAzZMqXEX
-Rjyn6JVGm8IAOiCCxLN7uySYlYqYxO3yMR0Q5w==
-Private-Lines: 2
-AAAAQUO5dO9G7i0bxGTP0zV3eIwv5g0NhrQJfW/bMHS6XWwaxdpr+QZ+DbBJVzZP
-wYC0wLMW4bJAf+kjqUnj4wGocoTe
-Private-MAC: d67001d47e13c43dc8bdb9c68a25356a96c1c4a6714f3c5a1836fca646b78b54

client/.env.development.promanager

@@ -0,0 +1,14 @@
+VITE_APP_GRAPHQL_ENDPOINT=https://db.dev.imex.online/v1/graphql
+VITE_APP_GRAPHQL_ENDPOINT_WS=wss://db.dev.imex.online/v1/graphql
+VITE_APP_GA_CODE=231099835
+VITE_APP_FIREBASE_CONFIG={"apiKey":"AIzaSyDPLT8GiDHDR1R4nI66Qi0BY1aYviDPioc","authDomain":"imex-dev.firebaseapp.com","databaseURL":"https://imex-dev.firebaseio.com","projectId":"imex-dev","storageBucket":"imex-dev.appspot.com","messagingSenderId":"759548147434","appId":"1:759548147434:web:e8239868a48ceb36700993","measurementId":"G-K5XRBVVB4S"}
+VITE_APP_CLOUDINARY_ENDPOINT_API=https://api.cloudinary.com/v1_1/io-test
+VITE_APP_CLOUDINARY_ENDPOINT=https://res.cloudinary.com/io-test
+VITE_APP_CLOUDINARY_API_KEY=957865933348715
+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://reports3.test.imex.online
+VITE_APP_SPLIT_API=ts615lqgnmk84thn72uk18uu5pgce6e0l4rc
+VITE_APP_INSTANCE=PROMANAGER

client/.env.production.promanager

@@ -0,0 +1,15 @@
+GENERATE_SOURCEMAP=true
+VITE_APP_GRAPHQL_ENDPOINT=https://db.romeonline.io/v1/graphql
+VITE_APP_GRAPHQL_ENDPOINT_WS=wss://db.romeonline.io/v1/graphql
+VITE_APP_GA_CODE=231103507
+VITE_APP_FIREBASE_CONFIG={  "apiKey": "AIzaSyAuLQR9SV5LsVxjU8wh9hvFLdhcAHU6cxE",  "authDomain": "rome-prod-1.firebaseapp.com",  "projectId": "rome-prod-1",  "storageBucket": "rome-prod-1.appspot.com",  "messagingSenderId": "147786367145",  "appId": "1:147786367145:web:9d4cba68071c3f29a8a9b8",  "measurementId": "G-G8Z9DRHTZS"}
+VITE_APP_CLOUDINARY_ENDPOINT_API=https://api.cloudinary.com/v1_1/bodyshop
+VITE_APP_CLOUDINARY_ENDPOINT=https://res.cloudinary.com/bodyshop
+VITE_APP_CLOUDINARY_API_KEY=473322739956866
+VITE_APP_CLOUDINARY_THUMB_TRANSFORMATIONS=c_fill,h_250,w_250
+VITE_APP_FIREBASE_PUBLIC_VAPID_KEY='BMgZT1NZztW2DsJl8Mg2L04hgY9FzAg6b8fbzgNAfww2VDzH3VE63Ot9EaP_U7KWS2JT-7HPHaw0T_Tw_5vkZc8'
+VITE_APP_STRIPE_PUBLIC_KEY=pk_test_51GqB4TJl3nQjrZ0wCQWAxAhlNF8jKe0tipIa6ExBaxwJGitwvFsIZUEua4dUzaMIAuXp4qwYHXx7lgjyQSwP0Pe900vzm38C7g
+VITE_APP_AXIOS_BASE_API_URL=https://api.romeonline.io/
+VITE_APP_REPORTS_SERVER_URL=https://reports.romeonline.io
+VITE_APP_SPLIT_API=et9pjkik6bn67he5evpmpr1agoo7gactphgk
+VITE_APP_INSTANCE=PROMANAGER

client/.env.test.promanager

@@ -0,0 +1,15 @@
+VITE_APP_GRAPHQL_ENDPOINT=https://db.test.romeonline.io/v1/graphql
+VITE_APP_GRAPHQL_ENDPOINT_WS=wss://db.test.romeonline.io/v1/graphql
+VITE_APP_GA_CODE=231099835
+VITE_APP_FIREBASE_CONFIG={  "apiKey": "AIzaSyAuLQR9SV5LsVxjU8wh9hvFLdhcAHU6cxE",  "authDomain": "rome-prod-1.firebaseapp.com",  "projectId": "rome-prod-1",  "storageBucket": "rome-prod-1.appspot.com",  "messagingSenderId": "147786367145",  "appId": "1:147786367145:web:9d4cba68071c3f29a8a9b8",  "measurementId": "G-G8Z9DRHTZS"}
+VITE_APP_CLOUDINARY_ENDPOINT_API=https://api.cloudinary.com/v1_1/bodyshop
+VITE_APP_CLOUDINARY_ENDPOINT=https://res.cloudinary.com/bodyshop
+VITE_APP_CLOUDINARY_API_KEY=473322739956866
+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.romeonline.io/
+VITE_APP_REPORTS_SERVER_URL=https://reports.test.romeonline.io
+VITE_APP_IS_TEST=true
+VITE_APP_SPLIT_API=ts615lqgnmk84thn72uk18uu5pgce6e0l4rc
+VITE_APP_INSTANCE=PROMANAGER

client/eslint.config.js

@@ -1,21 +0,0 @@
-import globals from "globals";
-import pluginJs from "@eslint/js";
-import pluginReact from "eslint-plugin-react";
-
-/** @type {import('eslint').Linter.Config[]} */
-
-export default [
-  {
-    files: ["**/*.{js,mjs,cjs,jsx}"]
-  },
-  { languageOptions: { globals: globals.browser } },
-  pluginJs.configs.recommended,
-  {
-    ...pluginReact.configs.flat.recommended,
-    rules: {
-      ...pluginReact.configs.flat.recommended.rules,
-      "react/prop-types": 0
-    }
-  },
-  pluginReact.configs.flat["jsx-runtime"]
-];

client/index.html

@@ -1,26 +1,29 @@
-<!doctype html>
+<!DOCTYPE html>
 <html lang="en">
-  <head>
-    <meta charset="utf-8" />
-    <meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate" />
-    <meta http-equiv="Pragma" content="no-cache" />
-    <meta http-equiv="Expires" content="0" />
-    <% if (env.VITE_APP_INSTANCE === 'IMEX') { %>
-    <link rel="icon" href="/favicon.png" />
-    <% } %> <% if (env.VITE_APP_INSTANCE === 'ROME') { %>
-    <link rel="icon" href="/ro-favicon.png" />
-    <% } %>
+<head>
+  <meta charset="utf-8"/>
+  <meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate">
+  <meta http-equiv="Pragma" content="no-cache">
+  <meta http-equiv="Expires" content="0">
+  <% if (env.VITE_APP_INSTANCE === 'IMEX') { %>
+  <link rel="icon" href="/favicon.png"/>
+  <% } %> <% if (env.VITE_APP_INSTANCE === 'ROME') { %>
+  <link rel="icon" href="/ro-favicon.png"/>
+  <% } %> <% if (env.VITE_APP_INSTANCE === 'PROMANAGER') { %>
+  <link rel="icon" href="/pm/pm-favicon.ico"/>
+  <% } %>
 
-    <meta name="viewport" content="width=device-width, initial-scale=1" />
-    <meta name="theme-color" content="#1690ff" />
-    <!-- <link rel="apple-touch-icon" href="logo192.png" /> -->
-    <link rel="apple-touch-icon" href="/logo192.png" />
-    <link rel="mask-icon" href="/mask-icon.svg" color="#FFFFFF" />
-    <!--
+  <meta name="viewport" content="width=device-width, initial-scale=1"/>
+  <meta name="theme-color" content="#1690ff"/>
+  <!-- <link rel="apple-touch-icon" href="logo192.png" /> -->
+  <!-- TODO:AIo Update the individual logos for each.-->
+  <link rel="apple-touch-icon" href="/logo192.png"/>
+  <link rel="mask-icon" href="/mask-icon.svg" color="#FFFFFF">
+  <!--
     manifest.json provides metadata used when your web app is installed on a
     user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
   -->
-    <!--
+  <!--
     Notice the use of %PUBLIC_URL% in the tags above.
     It will be replaced with the URL of the `public` folder during the build.
     Only files inside the `public` folder can be referenced from the HTML.
@@ -29,100 +32,95 @@
     work correctly both with client-side routing and a non-root public URL.
     Learn how to configure a non-root public URL by running `npm run build`.
   -->
-    <% if (env.VITE_APP_INSTANCE === 'IMEX') { %>
-    <meta name="description" content="ImEX Online" />
-    <title>ImEX Online</title>
-    <script type="text/javascript">
-      window.$crisp = [];
-      window.CRISP_WEBSITE_ID = "36724f62-2eb0-4b29-9cdd-9905fb99913e";
-      (function () {
-        d = document;
-        s = d.createElement("script");
-        s.src = "https://client.crisp.chat/l.js";
-        s.async = 1;
-        d.getElementsByTagName("head")[0].appendChild(s);
-      })();
-    </script>
-    <% } %> <% if (env.VITE_APP_INSTANCE === 'ROME') { %>
-    <meta name="description" content="Rome Online" />
-    <title>Rome Online</title>
-    <script type="text/javascript" id="zsiqchat">
-      var $zoho = $zoho || {};
-      $zoho.salesiq = $zoho.salesiq || {
-        widgetcode: "siq01bb8ac617280bdacddfeb528f07734dadc64ef3f05efef9f769c1ec171af666",
-        values: {},
-        ready: function () {}
-      };
-      var d = document;
-      s = d.createElement("script");
-      s.type = "text/javascript";
-      s.id = "zsiqscript";
-      s.defer = true;
-      s.src = "https://salesiq.zohopublic.com/widget";
-      t = d.getElementsByTagName("script")[0];
-      t.parentNode.insertBefore(s, t);
-    </script>
-    <script type="text/javascript">
-      window.$crisp = [];
-      window.CRISP_WEBSITE_ID = "36724f62-2eb0-4b29-9cdd-9905fb99913e";
-      (function () {
-        d = document;
-        s = d.createElement("script");
-        s.src = "https://client.crisp.chat/l.js";
-        s.async = 1;
-        d.getElementsByTagName("head")[0].appendChild(s);
-      })();
-    </script>
-    <% } %>
-    <script>
-      !(function () {
-        "use strict";
-        var e = [
-          "debug",
-          "destroy",
-          "do",
-          "help",
-          "identify",
-          "is",
-          "off",
-          "on",
-          "ready",
-          "render",
-          "reset",
-          "safe",
-          "set"
-        ];
-        if (window.noticeable) console.warn("Noticeable SDK code snippet loaded more than once");
-        else {
-          var n = (window.noticeable = window.noticeable || []);
+  <% if (env.VITE_APP_INSTANCE === 'IMEX') { %>
+  <meta name="description" content="ImEX Online"/>
+  <title>ImEX Online</title>
+  <script type="text/javascript">
+    window.$crisp = [];
+    window.CRISP_WEBSITE_ID = '36724f62-2eb0-4b29-9cdd-9905fb99913e';
+    (function () {
+      d = document;
+      s = d.createElement('script');
+      s.src = 'https://client.crisp.chat/l.js';
+      s.async = 1;
+      d.getElementsByTagName('head')[0].appendChild(s);
+    })();
+  </script>
+  <% } %> <% if (env.VITE_APP_INSTANCE === 'ROME') { %>
+  <meta name="description" content="Rome Online"/>
+  <title>Rome Online</title>
+  <script type="text/javascript" id="zsiqchat">
+    var $zoho = $zoho || {};
+    $zoho.salesiq = $zoho.salesiq || {
+      widgetcode: "siq01bb8ac617280bdacddfeb528f07734dadc64ef3f05efef9f769c1ec171af666",
+      values: {},
+      ready: function () {
+      }
+    };
+    var d = document;
+    s = d.createElement("script");
+    s.type = "text/javascript";
+    s.id = "zsiqscript";
+    s.defer = true;
+    s.src = "https://salesiq.zohopublic.com/widget";
+    t = d.getElementsByTagName("script")[0];
+    t.parentNode.insertBefore(s, t);
+  </script>
 
-          function t(e) {
-            return function () {
-              var t = Array.prototype.slice.call(arguments);
-              return t.unshift(e), n.push(t), n;
-            };
-          }
+  <% } %> <% if (env.VITE_APP_INSTANCE === 'PROMANAGER') { %>
+  <title>ProManager</title>
+  <meta name="description" content="ProManager"/>
 
-          !(function () {
-            for (var o = 0; o < e.length; o++) {
-              var r = e[o];
-              n[r] = t(r);
-            }
-          })(),
-            (function () {
-              var e = document.createElement("script");
-              (e.async = !0), (e.src = "https://sdk.noticeable.io/l.js");
-              var n = document.head;
-              n.insertBefore(e, n.firstChild);
-            })();
+  <% } %>
+  <script>
+    !(function () {
+      'use strict';
+      var e = [
+        'debug',
+        'destroy',
+        'do',
+        'help',
+        'identify',
+        'is',
+        'off',
+        'on',
+        'ready',
+        'render',
+        'reset',
+        'safe',
+        'set',
+      ];
+      if (window.noticeable) console.warn('Noticeable SDK code snippet loaded more than once');
+      else {
+        var n = (window.noticeable = window.noticeable || []);
+
+        function t(e) {
+          return function () {
+            var t = Array.prototype.slice.call(arguments);
+            return t.unshift(e), n.push(t), n;
+          };
         }
-      })();
-    </script>
-  </head>
-  <body>
-    <noscript>You need to enable JavaScript to run this app.</noscript>
-    <div id="root"></div>
 
-    <script type="module" src="src/index.jsx"></script>
-  </body>
+        !(function () {
+          for (var o = 0; o < e.length; o++) {
+            var r = e[o];
+            n[r] = t(r);
+          }
+        })(),
+          (function () {
+            var e = document.createElement('script');
+            (e.async = !0), (e.src = 'https://sdk.noticeable.io/l.js');
+            var n = document.head;
+            n.insertBefore(e, n.firstChild);
+          })();
+      }
+    })();
+  </script>
+</head>
+<body>
+<noscript>You need to enable JavaScript to run this app.</noscript>
+<div id="root"></div>
+
+<script type="module" src="src/index.jsx"></script>
+</body>
 </html>

client/package.json

@@ -8,74 +8,75 @@
   "private": true,
   "proxy": "http://localhost:4000",
   "dependencies": {
-    "@ant-design/pro-layout": "^7.22.0",
-    "@apollo/client": "^3.12.6",
+    "@ant-design/pro-layout": "^7.19.12",
+    "@apollo/client": "^3.11.8",
     "@emotion/is-prop-valid": "^1.3.1",
-    "@fingerprintjs/fingerprintjs": "^4.5.1",
+    "@fingerprintjs/fingerprintjs": "^4.5.0",
     "@jsreport/browser-client": "^3.1.0",
-    "@reduxjs/toolkit": "^2.5.0",
-    "@sentry/cli": "^2.40.0",
+    "@reduxjs/toolkit": "^2.2.7",
+    "@sentry/cli": "^2.36.2",
     "@sentry/react": "^7.114.0",
     "@splitsoftware/splitio-react": "^1.13.0",
-    "@tanem/react-nprogress": "^5.0.53",
-    "@vitejs/plugin-react": "^4.3.4",
-    "antd": "^5.23.1",
+    "@tanem/react-nprogress": "^5.0.51",
+    "@vitejs/plugin-react": "^4.3.1",
+    "antd": "^5.20.1",
     "apollo-link-logger": "^2.0.1",
     "apollo-link-sentry": "^3.3.0",
     "autosize": "^6.0.1",
-    "axios": "^1.7.9",
+    "axios": "^1.7.7",
     "classnames": "^2.5.1",
     "css-box-model": "^1.2.1",
     "dayjs": "^1.11.13",
-    "dayjs-business-days2": "^1.2.3",
+    "dayjs-business-days2": "^1.2.2",
     "dinero.js": "^1.9.1",
-    "dotenv": "^16.4.7",
+    "dotenv": "^16.4.5",
     "env-cmd": "^10.1.0",
     "exifr": "^7.1.3",
     "firebase": "^10.13.2",
-    "graphql": "^16.10.0",
+    "graphql": "^16.9.0",
     "i18next": "^23.15.1",
-    "i18next-browser-languagedetector": "^8.0.2",
+    "i18next-browser-languagedetector": "^8.0.0",
     "immutability-helper": "^3.1.1",
-    "libphonenumber-js": "^1.11.18",
+    "libphonenumber-js": "^1.11.9",
     "logrocket": "^8.1.2",
-    "markerjs2": "^2.32.3",
+    "markerjs2": "^2.32.2",
     "memoize-one": "^6.0.0",
     "normalize-url": "^8.0.1",
     "object-hash": "^3.0.0",
     "prop-types": "^15.8.1",
-    "query-string": "^9.1.1",
+    "query-string": "^9.1.0",
     "raf-schd": "^4.0.3",
     "react": "^18.3.1",
-    "react-big-calendar": "^1.17.1",
+    "react-big-calendar": "^1.14.1",
     "react-color": "^2.19.3",
-    "react-cookie": "^7.2.2",
+    "react-cookie": "^7.2.0",
     "react-dom": "^18.3.1",
     "react-drag-listview": "^2.0.0",
     "react-grid-gallery": "^1.0.1",
     "react-grid-layout": "1.3.4",
     "react-i18next": "^14.1.3",
-    "react-icons": "^5.4.0",
+    "react-icons": "^5.3.0",
     "react-image-lightbox": "^5.1.4",
-    "react-markdown": "^9.0.3",
-    "react-number-format": "^5.4.3",
+    "react-markdown": "^9.0.1",
+    "react-number-format": "^5.4.2",
     "react-popopo": "^2.1.9",
     "react-product-fruits": "^2.2.61",
-    "react-redux": "^9.2.0",
+    "react-redux": "^9.1.2",
     "react-resizable": "^3.0.5",
     "react-router-dom": "^6.26.2",
     "react-sticky": "^6.0.3",
+    "react-virtualized": "^9.22.5",
     "react-virtuoso": "^4.10.4",
-    "recharts": "^2.15.0",
+    "recharts": "^2.12.7",
     "redux": "^5.0.1",
     "redux-actions": "^3.0.3",
     "redux-persist": "^6.0.0",
     "redux-saga": "^1.3.0",
     "redux-state-sync": "^3.1.4",
     "reselect": "^5.1.1",
-    "sass": "^1.83.4",
-    "socket.io-client": "^4.8.1",
-    "styled-components": "^6.1.14",
+    "sass": "^1.79.3",
+    "socket.io-client": "^4.8.0",
+    "styled-components": "^6.1.13",
     "subscriptions-transport-ws": "^0.11.0",
     "use-memo-one": "^1.1.3",
     "userpilot": "^1.3.6",
@@ -89,18 +90,29 @@
     "build": "dotenvx run --env-file=.env.development.imex -- vite build",
     "start:imex": "dotenvx run --env-file=.env.development.imex -- vite",
     "start:rome": "dotenvx run --env-file=.env.development.rome -- vite",
+    "start:promanager": "dotenvx run --env-file=.env.development.promanager -- vite",
     "preview:imex": "dotenvx run --env-file=.env.development.imex -- vite preview",
     "preview:rome": "dotenvx run --env-file=.env.development.rome -- vite preview",
+    "preview:promanager": "dotenvx run --env-file=.env.development.promanager -- vite preview",
     "build:test:imex": "env-cmd -f .env.test.imex npm run build",
     "build:test:rome": "env-cmd -f .env.test.rome npm run build",
+    "build:test:promanager": "env-cmd -f .env.test.promanager npm run build",
     "build:production:imex": "env-cmd -f .env.production.imex npm run build",
     "build:production:rome": "env-cmd -f .env.production.rome npm run build",
+    "build:production:promanager": "env-cmd -f .env.production.promanager npm run build",
     "test": "cypress open",
     "eject": "react-scripts eject",
     "madge": "madge  --image ./madge-graph.svg --extensions js,jsx,ts,tsx --circular .",
     "eulaize": "node src/utils/eulaize.js",
     "sentry:sourcemaps:imex": "sentry-cli sourcemaps inject --org imex --project imexonline ./build && sentry-cli sourcemaps upload --org imex --project imexonline ./build"
   },
+  "eslintConfig": {
+    "extends": [
+      "react-app",
+      "react-app/jest",
+      "plugin:cypress/recommended"
+    ]
+  },
   "browserslist": {
     "production": [
       ">0.2%",
@@ -120,36 +132,32 @@
     "@rollup/rollup-linux-x64-gnu": "4.6.1"
   },
   "devDependencies": {
-    "@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.33.0",
-    "@emotion/babel-plugin": "^11.13.5",
-    "@emotion/react": "^11.14.0",
-    "@eslint/js": "^9.18.0",
+    "@babel/preset-react": "^7.24.7",
+    "@dotenvx/dotenvx": "^1.14.1",
+    "@emotion/babel-plugin": "^11.12.0",
+    "@emotion/react": "^11.13.3",
     "@sentry/webpack-plugin": "^2.22.4",
     "@testing-library/cypress": "^10.0.2",
-    "browserslist": "^4.24.4",
+    "browserslist": "^4.23.3",
     "browserslist-to-esbuild": "^2.1.1",
-    "chalk": "^5.4.1",
+    "chalk": "^5.3.0",
     "cross-env": "^7.0.3",
-    "cypress": "^13.17.0",
-    "eslint": "^8.57.1",
+    "cypress": "^13.14.2",
+    "eslint": "^8.57.0",
     "eslint-config-react-app": "^7.0.1",
     "eslint-plugin-cypress": "^2.15.1",
-    "eslint-plugin-react": "^7.37.4",
-    "globals": "^15.14.0",
-    "memfs": "^4.17.0",
+    "memfs": "^4.12.0",
     "os-browserify": "^0.3.0",
     "react-error-overlay": "6.0.11",
     "redux-logger": "^3.0.6",
     "source-map-explorer": "^2.5.3",
-    "vite": "^6.0.7",
-    "vite-plugin-babel": "^1.3.0",
+    "vite": "^5.4.7",
+    "vite-plugin-babel": "^1.2.0",
     "vite-plugin-eslint": "^1.8.1",
-    "vite-plugin-node-polyfills": "^0.23.0",
-    "vite-plugin-pwa": "^0.21.1",
+    "vite-plugin-node-polyfills": "^0.22.0",
+    "vite-plugin-pwa": "^0.20.5",
     "vite-plugin-style-import": "^2.0.0",
-    "workbox-window": "^7.3.0"
+    "workbox-window": "^7.1.0"
   }
 }

client/public/firebase-messaging-sw.js

@@ -1,6 +1,6 @@
 // Scripts for firebase and firebase messaging
-importScripts("https://www.gstatic.com/firebasejs/10.14.1/firebase-app-compat.js");
-importScripts("https://www.gstatic.com/firebasejs/10.14.1/firebase-messaging-compat.js");
+importScripts("https://www.gstatic.com/firebasejs/8.2.0/firebase-app.js");
+importScripts("https://www.gstatic.com/firebasejs/8.2.0/firebase-messaging.js");
 
 // Initialize the Firebase app in the service worker by passing the generated config
 let firebaseConfig;
@@ -14,7 +14,7 @@ switch (this.location.hostname) {
       storageBucket: "imex-dev.appspot.com",
       messagingSenderId: "759548147434",
       appId: "1:759548147434:web:e8239868a48ceb36700993",
-      measurementId: "G-K5XRBVVB4S"
+      measurementId: "G-K5XRBVVB4S",
     };
     break;
   case "test.imex.online":
@@ -24,7 +24,7 @@ switch (this.location.hostname) {
       projectId: "imex-test",
       storageBucket: "imex-test.appspot.com",
       messagingSenderId: "991923618608",
-      appId: "1:991923618608:web:633437569cdad78299bef5"
+      appId: "1:991923618608:web:633437569cdad78299bef5",
       // measurementId: "${config.measurementId}",
     };
     break;
@@ -38,7 +38,7 @@ switch (this.location.hostname) {
       storageBucket: "imex-prod.appspot.com",
       messagingSenderId: "253497221485",
       appId: "1:253497221485:web:3c81c483b94db84b227a64",
-      measurementId: "G-NTWBKG2L0M"
+      measurementId: "G-NTWBKG2L0M",
     };
 }
 
@@ -49,6 +49,8 @@ const messaging = firebase.messaging();
 
 messaging.onBackgroundMessage(function (payload) {
   // Customize notification here
-  console.log("[firebase-messaging-sw.js] Received background message ", payload);
-  self.registration.showNotification(notificationTitle, notificationOptions);
+  const channel = new BroadcastChannel("imex-sw-messages");
+  channel.postMessage(payload);
+
+  //self.registration.showNotification(notificationTitle, notificationOptions);
 });

client/src/App/App.jsx

@@ -22,7 +22,6 @@ import Eula from "../components/eula/eula.component";
 import InstanceRenderMgr from "../utils/instanceRenderMgr";
 import ProductFruitsWrapper from "./ProductFruitsWrapper.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"));
 const ManagePage = lazy(() => import("../pages/manage/manage.page.container"));
@@ -97,7 +96,8 @@ export function App({ bodyshop, checkUserSession, currentUser, online, setOnline
         LogRocket.init(
           InstanceRenderMgr({
             imex: "gvfvfw/bodyshopapp",
-            rome: "rome-online/rome-online"
+            rome: "rome-online/rome-online",
+            promanager: "" // TODO: AIO Add in log rocket for promanager instances.
           })
         );
       }
@@ -134,7 +134,8 @@ export function App({ bodyshop, checkUserSession, currentUser, online, setOnline
         <LoadingSpinner
           message={InstanceRenderMgr({
             imex: t("titles.imexonline"),
-            rome: t("titles.romeonline")
+            rome: t("titles.romeonline"),
+            promanager: t("titles.promanager")
           })}
         />
       }
@@ -143,88 +144,88 @@ export function App({ bodyshop, checkUserSession, currentUser, online, setOnline
         currentUser={currentUser}
         workspaceCode={InstanceRenderMgr({
           imex: null,
-          rome: "9BkbEseqNqxw8jUH"
+          rome: "9BkbEseqNqxw8jUH",
+          promanager: "aoJoEifvezYI0Z0P"
         })}
       />
-      <NotificationProvider>
-        <Routes>
-          <Route
-            path="*"
-            element={
-              <ErrorBoundary>
-                <LandingPage />
-              </ErrorBoundary>
-            }
-          />
-          <Route
-            path="/signin"
-            element={
-              <ErrorBoundary>
-                <SignInPage />
-              </ErrorBoundary>
-            }
-          />
-          <Route
-            path="/resetpassword"
-            element={
-              <ErrorBoundary>
-                <ResetPassword />
-              </ErrorBoundary>
-            }
-          />
-          <Route
-            path="/csi/:surveyId"
-            element={
-              <ErrorBoundary>
-                <CsiPage />
-              </ErrorBoundary>
-            }
-          />
-          <Route
-            path="/disclaimer"
-            element={
-              <ErrorBoundary>
-                <DisclaimerPage />
-              </ErrorBoundary>
-            }
-          />
-          <Route
-            path="/mp/:paymentIs"
-            element={
-              <ErrorBoundary>
-                <MobilePaymentContainer />
-              </ErrorBoundary>
-            }
-          />
-          <Route
-            path="/manage/*"
-            element={
-              <ErrorBoundary>
-                <SocketProvider bodyshop={bodyshop}>
-                  <PrivateRoute isAuthorized={currentUser.authorized} />
-                </SocketProvider>
-              </ErrorBoundary>
-            }
-          >
-            <Route path="*" element={<ManagePage />} />
-          </Route>
-          <Route
-            path="/tech/*"
-            element={
-              <ErrorBoundary>
-                <SocketProvider bodyshop={bodyshop}>
-                  <PrivateRoute isAuthorized={currentUser.authorized} />
-                </SocketProvider>
-              </ErrorBoundary>
-            }
-          >
-            <Route path="*" element={<TechPageContainer />} />
-          </Route>
-          <Route path="/edit/*" element={<PrivateRoute isAuthorized={currentUser.authorized} />}>
-            <Route path="*" element={<DocumentEditorContainer />} />
-          </Route>
-        </Routes>
-      </NotificationProvider>
+
+      <Routes>
+        <Route
+          path="*"
+          element={
+            <ErrorBoundary>
+              <LandingPage />
+            </ErrorBoundary>
+          }
+        />
+        <Route
+          path="/signin"
+          element={
+            <ErrorBoundary>
+              <SignInPage />
+            </ErrorBoundary>
+          }
+        />
+        <Route
+          path="/resetpassword"
+          element={
+            <ErrorBoundary>
+              <ResetPassword />
+            </ErrorBoundary>
+          }
+        />
+        <Route
+          path="/csi/:surveyId"
+          element={
+            <ErrorBoundary>
+              <CsiPage />
+            </ErrorBoundary>
+          }
+        />
+        <Route
+          path="/disclaimer"
+          element={
+            <ErrorBoundary>
+              <DisclaimerPage />
+            </ErrorBoundary>
+          }
+        />
+        <Route
+          path="/mp/:paymentIs"
+          element={
+            <ErrorBoundary>
+              <MobilePaymentContainer />
+            </ErrorBoundary>
+          }
+        />
+        <Route
+          path="/manage/*"
+          element={
+            <ErrorBoundary>
+              <SocketProvider bodyshop={bodyshop}>
+                <PrivateRoute isAuthorized={currentUser.authorized} />
+              </SocketProvider>
+            </ErrorBoundary>
+          }
+        >
+          <Route path="*" element={<ManagePage />} />
+        </Route>
+        <Route
+          path="/tech/*"
+          element={
+            <ErrorBoundary>
+              <SocketProvider bodyshop={bodyshop}>
+                <PrivateRoute isAuthorized={currentUser.authorized} />
+              </SocketProvider>
+            </ErrorBoundary>
+          }
+        >
+          <Route path="*" element={<TechPageContainer />} />
+        </Route>
+        <Route path="/edit/*" element={<PrivateRoute isAuthorized={currentUser.authorized} />}>
+          <Route path="*" element={<DocumentEditorContainer />} />
+        </Route>
+      </Routes>
     </Suspense>
   );
 }

client/src/App/App.styles.scss

@@ -5,13 +5,6 @@
   border-bottom: 1px solid #74695c !important;
 }
 
-// TODO: This was added because the newest release of ant was making the text color and the background color the same on a selected header
-// Tried all available tokens (https://ant.design/components/menu?locale=en-US) and even reverted all our custom styles, to no avail
-// This should be kept an eye on, especially if implementing DARK MODE
-.ant-menu-submenu-title {
-  color: rgba(255, 255, 255, 0.65) !important;
-}
-
 .imex-table-header {
   display: flex;
   flex-wrap: wrap;

client/src/App/themeProvider.js

@@ -26,11 +26,13 @@ const defaultTheme = {
   token: {
     colorPrimary: InstanceRenderMgr({
       imex: "#1890ff",
-      rome: "#326ade"
+      rome: "#326ade",
+      promanager: "#1d69a6"
     }),
     colorInfo: InstanceRenderMgr({
       imex: "#1890ff",
-      rome: "#326ade"
+      rome: "#326ade",
+      promanager: "#1d69a6"
     })
   }
 };

client/src/components/accounting-payments-table/accounting-payments-table.component.jsx

@@ -85,17 +85,6 @@ export function AccountingPayablesTableComponent({ bodyshop, loading, payments,
       sortOrder: state.sortedInfo.columnKey === "amount" && state.sortedInfo.order,
       render: (text, record) => <CurrencyFormatter>{record.amount}</CurrencyFormatter>
     },
-    {
-      title: t("payments.fields.type"),
-      dataIndex: "type",
-      key: "type",
-      sorter: (a, b) => a.type.localeCompare(b.type),
-      sortOrder: state.sortedInfo.columnKey === "type" && state.sortedInfo.order,
-      filters: bodyshop.md_payment_types.map((s) => {
-        return { text: s, value: [s] };
-      }),
-      onFilter: (value, record) => value.includes(record.type)
-    },
     {
       title: t("payments.fields.memo"),
       dataIndex: "memo",

client/src/components/allocations-assignment/allocations-assignment.container.jsx

@@ -3,7 +3,7 @@ import AllocationsAssignmentComponent from "./allocations-assignment.component";
 import { useMutation } from "@apollo/client";
 import { INSERT_ALLOCATION } from "../../graphql/allocations.queries";
 import { useTranslation } from "react-i18next";
-import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
+import { notification } from "antd";
 
 export default function AllocationsAssignmentContainer({ jobLineId, hours, refetch }) {
   const visibilityState = useState(false);
@@ -14,7 +14,6 @@ export default function AllocationsAssignmentContainer({ jobLineId, hours, refet
     employeeid: null
   });
   const [insertAllocation] = useMutation(INSERT_ALLOCATION);
-  const notification = useNotification();
 
   const handleAssignment = () => {
     insertAllocation({ variables: { alloc: { ...assignment } } })

client/src/components/allocations-bulk-assignment/allocations-bulk-assignment.container.jsx

@@ -3,7 +3,7 @@ import AllocationsBulkAssignment from "./allocations-bulk-assignment.component";
 import { useMutation } from "@apollo/client";
 import { INSERT_ALLOCATION } from "../../graphql/allocations.queries";
 import { useTranslation } from "react-i18next";
-import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
+import { notification } from "antd";
 
 export default function AllocationsBulkAssignmentContainer({ jobLines, refetch }) {
   const visibilityState = useState(false);
@@ -12,7 +12,6 @@ export default function AllocationsBulkAssignmentContainer({ jobLines, refetch }
     employeeid: null
   });
   const [insertAllocation] = useMutation(INSERT_ALLOCATION);
-  const notification = useNotification();
 
   const handleAssignment = () => {
     const allocs = jobLines.reduce((acc, value) => {

client/src/components/allocations-employee-label/allocations-employee-label.container.jsx

@@ -2,13 +2,12 @@ import React from "react";
 import { useMutation } from "@apollo/client";
 import { DELETE_ALLOCATION } from "../../graphql/allocations.queries";
 import AllocationsLabelComponent from "./allocations-employee-label.component";
+import { notification } from "antd";
 import { useTranslation } from "react-i18next";
-import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
 
 export default function AllocationsLabelContainer({ allocation, refetch }) {
   const [deleteAllocation] = useMutation(DELETE_ALLOCATION);
   const { t } = useTranslation();
-  const notification = useNotification();
 
   const handleClick = (e) => {
     e.preventDefault();

client/src/components/bill-delete-button/bill-delete-button.component.jsx

@@ -1,6 +1,6 @@
 import { DeleteFilled } from "@ant-design/icons";
 import { useMutation } from "@apollo/client";
-import { Button, Popconfirm } from "antd";
+import { Button, notification, Popconfirm } from "antd";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { DELETE_BILL } from "../../graphql/bills.queries";
@@ -9,7 +9,6 @@ import { insertAuditTrail } from "../../redux/application/application.actions";
 import AuditTrailMapping from "../../utils/AuditTrailMappings";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
-import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
 
 const mapStateToProps = createStructuredSelector({});
 const mapDispatchToProps = (dispatch) => ({
@@ -22,7 +21,6 @@ export function BillDeleteButton({ bill, jobid, callback, insertAuditTrail }) {
   const [loading, setLoading] = useState(false);
   const { t } = useTranslation();
   const [deleteBill] = useMutation(DELETE_BILL);
-  const notification = useNotification();
 
   const handleDelete = async () => {
     setLoading(true);

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

@@ -1,6 +1,6 @@
 import { useApolloClient, useMutation } from "@apollo/client";
 import { useSplitTreatments } from "@splitsoftware/splitio-react";
-import { Button, Checkbox, Form, Modal, Space } from "antd";
+import { Button, Checkbox, Form, Modal, notification, Space } from "antd";
 import _ from "lodash";
 import React, { useEffect, useMemo, useState } from "react";
 import { useTranslation } from "react-i18next";
@@ -24,7 +24,6 @@ import BillFormContainer from "../bill-form/bill-form.container";
 import { CalculateBillTotal } from "../bill-form/bill-form.totals.utility";
 import { handleUpload as handleLocalUpload } from "../documents-local-upload/documents-local-upload.utility";
 import { handleUpload } from "../documents-upload/documents-upload.utility";
-import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
 
 const mapStateToProps = createStructuredSelector({
   billEnterModal: selectBillEnterModal,
@@ -50,7 +49,6 @@ function BillEnterModalContainer({ billEnterModal, toggleModalVisible, bodyshop,
   const [loading, setLoading] = useState(false);
   const client = useApolloClient();
   const [generateLabel, setGenerateLabel] = useLocalStorage("enter_bill_generate_label", false);
-  const notification = useNotification();
 
   const {
     treatments: { Enhanced_Payroll }
@@ -293,8 +291,7 @@ function BillEnterModalContainer({ billEnterModal, toggleModalVisible, bodyshop,
               jobid: values.jobid,
               invoice_number: remainingValues.invoice_number,
               vendorid: remainingValues.vendorid
-            },
-            notification
+            }
           });
         });
       } else {
@@ -308,8 +305,7 @@ function BillEnterModalContainer({ billEnterModal, toggleModalVisible, bodyshop,
               billId: billId,
               tagsArray: null,
               callback: null
-            },
-            notification
+            }
           );
         });
       }
@@ -329,9 +325,7 @@ function BillEnterModalContainer({ billEnterModal, toggleModalVisible, bodyshop,
           }
         },
         {},
-        "p",
-        null,
-        notification
+        "p"
       );
     }
 

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

@@ -228,6 +228,7 @@ export function BillEnterModalLinesComponent({
                 }}
               </Form.Item>
             )
+            //Do not need to set for promanager as it will default to Rome.
           })
       },
       {
@@ -461,6 +462,7 @@ export function BillEnterModalLinesComponent({
 
       ...InstanceRenderManager({
         rome: [],
+        promanager: [],
         imex: [
           {
             title: t("billlines.fields.federal_tax_applicable"),
@@ -473,7 +475,8 @@ export function BillEnterModalLinesComponent({
                 valuePropName: "checked",
                 initialValue: InstanceRenderManager({
                   imex: true,
-                  rome: false
+                  rome: false,
+                  promanager: false
                 }),
                 name: [field.name, "applicable_taxes", "federal"]
               };
@@ -500,6 +503,7 @@ export function BillEnterModalLinesComponent({
 
       ...InstanceRenderManager({
         rome: [],
+        promanager: [],
         imex: [
           {
             title: t("billlines.fields.local_tax_applicable"),
@@ -625,15 +629,11 @@ const EditableCell = ({
   wrapper,
   ...restProps
 }) => {
-  const propsFinal = formItemProps && formItemProps(record);
-  if (propsFinal && "key" in propsFinal) {
-    delete propsFinal.key;
-  }
   if (additional)
     return (
       <td {...restProps}>
         <div size="small">
-          <Form.Item name={dataIndex} labelCol={{ span: 0 }} {...propsFinal}>
+          <Form.Item name={dataIndex} labelCol={{ span: 0 }} {...(formItemProps && formItemProps(record))}>
             {(formInput && formInput(record, record.name)) || children}
           </Form.Item>
           {additional && additional(record, record.name)}
@@ -644,7 +644,7 @@ const EditableCell = ({
     return (
       <wrapper>
         <td {...restProps}>
-          <Form.Item labelCol={{ span: 0 }} name={dataIndex} {...propsFinal}>
+          <Form.Item labelCol={{ span: 0 }} name={dataIndex} {...(formItemProps && formItemProps(record))}>
             {(formInput && formInput(record, record.name)) || children}
           </Form.Item>
         </td>
@@ -652,7 +652,7 @@ const EditableCell = ({
     );
   return (
     <td {...restProps}>
-      <Form.Item labelCol={{ span: 0 }} name={dataIndex} {...propsFinal}>
+      <Form.Item labelCol={{ span: 0 }} name={dataIndex} {...(formItemProps && formItemProps(record))}>
         {(formInput && formInput(record, record.name)) || children}
       </Form.Item>
     </td>

client/src/components/bill-mark-exported-button/bill-mark-exported-button.component.jsx

@@ -1,5 +1,5 @@
 import { gql, useMutation } from "@apollo/client";
-import { Button } from "antd";
+import { Button, notification } from "antd";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 
@@ -8,7 +8,6 @@ import { createStructuredSelector } from "reselect";
 import { selectAuthLevel, selectBodyshop, selectCurrentUser } from "../../redux/user/user.selectors";
 import { HasRbacAccess } from "../rbac-wrapper/rbac-wrapper.component";
 import { INSERT_EXPORT_LOG } from "../../graphql/accounting.queries";
-import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -25,7 +24,6 @@ export function BillMarkExportedButton({ currentUser, bodyshop, authLevel, bill
   const { t } = useTranslation();
   const [loading, setLoading] = useState(false);
   const [insertExportLog] = useMutation(INSERT_EXPORT_LOG);
-  const notification = useNotification();
 
   const [updateBill] = useMutation(gql`
     mutation UPDATE_BILL($billId: uuid!) {

client/src/components/bill-print-button/bill-print-button.component.jsx

@@ -3,13 +3,11 @@ import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { GenerateDocument } from "../../utils/RenderTemplate";
 import { TemplateList } from "../../utils/TemplateConstants";
-import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
 
 export default function BillPrintButton({ billid }) {
   const { t } = useTranslation();
   const [loading, setLoading] = useState(false);
   const Templates = TemplateList("job_special");
-  const notification = useNotification();
 
   const submitHandler = async () => {
     setLoading(true);
@@ -22,9 +20,7 @@ export default function BillPrintButton({ billid }) {
           }
         },
         {},
-        "p",
-        null,
-        notification
+        "p"
       );
     } catch (e) {
       console.warn("Warning: Error generating a document.");

client/src/components/bill-reexport-button/bill-reexport-button.component.jsx

@@ -1,5 +1,5 @@
 import { gql, useMutation } from "@apollo/client";
-import { Button } from "antd";
+import { Button, notification } from "antd";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 
@@ -7,7 +7,6 @@ import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { selectAuthLevel, selectBodyshop } from "../../redux/user/user.selectors";
 import { HasRbacAccess } from "../rbac-wrapper/rbac-wrapper.component";
-import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -22,7 +21,6 @@ export default connect(mapStateToProps, mapDispatchToProps)(BillMarkForReexportB
 export function BillMarkForReexportButton({ bodyshop, authLevel, bill }) {
   const { t } = useTranslation();
   const [loading, setLoading] = useState(false);
-  const notification = useNotification();
 
   const [updateBill] = useMutation(gql`
     mutation UPDATE_BILL($billId: uuid!) {

client/src/components/billline-add-inventory/billline-add-inventory.component.jsx

@@ -1,6 +1,6 @@
 import { FileAddFilled } from "@ant-design/icons";
 import { useMutation } from "@apollo/client";
-import { Button, Tooltip } from "antd";
+import { Button, notification, Tooltip } from "antd";
 import { t } from "i18next";
 import dayjs from "./../../utils/day";
 import React, { useState } from "react";
@@ -11,7 +11,6 @@ import { selectBodyshop, selectCurrentUser } from "../../redux/user/user.selecto
 import { CalculateBillTotal } from "../bill-form/bill-form.totals.utility";
 import queryString from "query-string";
 import { useLocation } from "react-router-dom";
-import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -26,7 +25,6 @@ export function BilllineAddInventory({ currentUser, bodyshop, billline, disabled
   const [loading, setLoading] = useState(false);
   const { billid } = queryString.parse(useLocation().search);
   const [insertInventoryLine] = useMutation(INSERT_INVENTORY_AND_CREDIT);
-  const notification = useNotification();
 
   const addToInventory = async () => {
     setLoading(true);

client/src/components/bills-list-table/bills-list-table.component.jsx

@@ -2,7 +2,6 @@ import { EditFilled, SyncOutlined } from "@ant-design/icons";
 import { Button, Card, Checkbox, Input, Space, Table } from "antd";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
-import { FaTasks } from "react-icons/fa";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { selectJobReadOnly } from "../../redux/application/application.selectors";
@@ -14,10 +13,8 @@ import { alphaSort, dateSort } from "../../utils/sorters";
 import { TemplateList } from "../../utils/TemplateConstants";
 import BillDeleteButton from "../bill-delete-button/bill-delete-button.component";
 import BillDetailEditReturnComponent from "../bill-detail-edit/bill-detail-edit-return.component";
-import { HasFeatureAccess } from "../feature-wrapper/feature-wrapper.component";
-import LockerWrapperComponent from "../lock-wrapper/lock-wrapper.component";
 import PrintWrapperComponent from "../print-wrapper/print-wrapper.component";
-import UpsellComponent, { upsellEnum } from "../upsell/upsell.component";
+import { FaTasks } from "react-icons/fa";
 
 const mapStateToProps = createStructuredSelector({
   jobRO: selectJobReadOnly,
@@ -173,8 +170,6 @@ export function BillsListTableComponent({
         )
     : [];
 
-  const hasBillsAccess = HasFeatureAccess({ bodyshop, featureName: "bills" });
-
   return (
     <Card
       title={t("bills.labels.bills")}
@@ -186,7 +181,6 @@ export function BillsListTableComponent({
           {job && job.converted ? (
             <>
               <Button
-                disabled={!hasBillsAccess}
                 onClick={() => {
                   setBillEnterContext({
                     actions: { refetch: billsQuery.refetch },
@@ -196,10 +190,9 @@ export function BillsListTableComponent({
                   });
                 }}
               >
-                <LockerWrapperComponent featureName="bills">{t("jobs.actions.postbills")}</LockerWrapperComponent>
+                {t("jobs.actions.postbills")}
               </Button>
               <Button
-                disabled={!hasBillsAccess}
                 onClick={() => {
                   setReconciliationContext({
                     actions: { refetch: billsQuery.refetch },
@@ -210,7 +203,7 @@ export function BillsListTableComponent({
                   });
                 }}
               >
-                <LockerWrapperComponent featureName="bills"> {t("jobs.actions.reconcile")}</LockerWrapperComponent>
+                {t("jobs.actions.reconcile")}
               </Button>
             </>
           ) : null}
@@ -218,7 +211,6 @@ export function BillsListTableComponent({
           <Input.Search
             placeholder={t("general.labels.search")}
             value={searchText}
-            disabled={!hasBillsAccess}
             onChange={(e) => {
               e.preventDefault();
               setSearchText(e.target.value);
@@ -234,13 +226,8 @@ export function BillsListTableComponent({
         }}
         columns={columns}
         rowKey="id"
-        dataSource={hasBillsAccess ? filteredBills : []}
+        dataSource={filteredBills}
         onChange={handleTableChange}
-        locale={{
-          ...(!hasBillsAccess && {
-            emptyText: <UpsellComponent upsell={upsellEnum().bills.general} />
-          })
-        }}
       />
     </Card>
   );

client/src/components/ca-bc-etf-table-modal/ca-bc-etf-table-modal.container.jsx

@@ -9,7 +9,6 @@ import { selectCaBcEtfTableConvert } from "../../redux/modals/modals.selectors";
 import { GenerateDocument } from "../../utils/RenderTemplate";
 import { TemplateList } from "../../utils/TemplateConstants";
 import CaBcEtfTableModalComponent from "./ca-bc-etf-table.modal.component";
-import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
 
 const mapStateToProps = createStructuredSelector({
   caBcEtfTableModal: selectCaBcEtfTableConvert
@@ -26,7 +25,6 @@ export function ContractsFindModalContainer({ caBcEtfTableModal, toggleModalVisi
   const [loading, setLoading] = useState(false);
   const [form] = Form.useForm();
   const EtfTemplate = TemplateList("special").ca_bc_etf_table;
-  const notification = useNotification();
 
   const handleFinish = async (values) => {
     logImEXEvent("ca_bc_etf_table_parse");
@@ -55,9 +53,7 @@ export function ContractsFindModalContainer({ caBcEtfTableModal, toggleModalVisi
         }
       },
       {},
-      values.sendby === "email" ? "e" : "p",
-      null,
-      notification
+      values.sendby === "email" ? "e" : "p"
     );
     setLoading(false);
   };

client/src/components/card-payment-modal/card-payment-modal.component..jsx

@@ -1,6 +1,6 @@
-import { CopyFilled, DeleteFilled } from "@ant-design/icons";
+import { DeleteFilled, CopyFilled } from "@ant-design/icons";
 import { useLazyQuery, useMutation } from "@apollo/client";
-import { Button, Card, Col, Form, Input, message, Row, Space, Spin, Statistic } from "antd";
+import { Button, Card, Col, Form, Input, Row, Space, Spin, Statistic, message, notification } from "antd";
 import axios from "axios";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
@@ -15,7 +15,6 @@ import AuditTrailMapping from "../../utils/AuditTrailMappings";
 import CurrencyFormItemComponent from "../form-items-formatted/currency-form-item.component";
 import JobSearchSelectComponent from "../job-search-select/job-search-select.component";
 import { getCurrentUser } from "../../firebase/firebase.utils";
-import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
 
 const mapStateToProps = createStructuredSelector({
   cardPaymentModal: selectCardPayment,
@@ -24,14 +23,7 @@ const mapStateToProps = createStructuredSelector({
 });
 
 const mapDispatchToProps = (dispatch) => ({
-  insertAuditTrail: ({ jobid, operation, type }) =>
-    dispatch(
-      insertAuditTrail({
-        jobid,
-        operation,
-        type
-      })
-    ),
+  insertAuditTrail: ({ jobid, operation, type }) => dispatch(insertAuditTrail({ jobid, operation, type })),
   toggleModalVisible: () => dispatch(toggleModalVisible("cardPayment"))
 });
 
@@ -47,42 +39,33 @@ const CardPaymentModalComponent = ({
   const [form] = Form.useForm();
   const [paymentLink, setPaymentLink] = useState();
   const [loading, setLoading] = useState(false);
+  // const [insertPayment] = useMutation(INSERT_NEW_PAYMENT);
   const [insertPaymentResponse] = useMutation(INSERT_PAYMENT_RESPONSE);
   const { t } = useTranslation();
-  const notification = useNotification();
 
   const [, { data, refetch, queryLoading }] = useLazyQuery(QUERY_RO_AND_OWNER_BY_JOB_PKS, {
     variables: { jobids: [context.jobid] },
     skip: !context?.jobid
   });
 
-  const collectIPayFields = () => {
-    const iPayFields = document.querySelectorAll(".ipayfield");
-    const iPayData = {};
-    iPayFields.forEach((field) => {
-      iPayData[field.dataset.ipayname] = field.value;
-    });
-    return iPayData;
-  };
-
+  //Initialize the intellipay window.
   const SetIntellipayCallbackFunctions = () => {
     console.log("*** Set IntelliPay callback functions.");
-
     window.intellipay.runOnClose(() => {
       //window.intellipay.initialize();
     });
 
-    window.intellipay.runOnApproval(() => {
+    window.intellipay.runOnApproval(async function (response) {
       //2024-04-25: Nothing is going to happen here anymore. We'll completely rely on the callback.
       //Add a slight delay to allow the refetch to properly get the data.
       setTimeout(() => {
-        if (actions?.refetch) actions.refetch();
+        if (actions && actions.refetch && typeof actions.refetch === "function") actions.refetch();
         setLoading(false);
         toggleModalVisible();
       }, 750);
     });
 
-    window.intellipay.runOnNonApproval(async (response) => {
+    window.intellipay.runOnNonApproval(async function (response) {
       // Mutate unsuccessful payment
 
       const { payments } = form.getFieldsValue();
@@ -115,39 +98,30 @@ const CardPaymentModalComponent = ({
     //Validate
     try {
       await form.validateFields();
-    } catch {
+    } catch (error) {
       setLoading(false);
       return;
     }
 
-    const iPayData = collectIPayFields();
-    const { payments } = form.getFieldsValue();
-
     try {
       const response = await axios.post("/intellipay/lightbox_credentials", {
         bodyshop,
         refresh: !!window.intellipay,
-        paymentSplitMeta: form.getFieldsValue(),
-        iPayData: iPayData,
-        comment: btoa(JSON.stringify({ payments, userEmail: currentUser.email }))
+        paymentSplitMeta: form.getFieldsValue()
       });
 
       if (window.intellipay) {
         // eslint-disable-next-line no-eval
         eval(response.data);
-        pollForIntelliPay(() => {
-          SetIntellipayCallbackFunctions();
-          window.intellipay.autoOpen();
-        });
+        SetIntellipayCallbackFunctions();
+        window.intellipay.autoOpen();
       } else {
-        const rg = document.createRange();
-        const node = rg.createContextualFragment(response.data);
+        var rg = document.createRange();
+        let node = rg.createContextualFragment(response.data);
         document.documentElement.appendChild(node);
-        pollForIntelliPay(() => {
-          SetIntellipayCallbackFunctions();
-          window.intellipay.isAutoOpen = true;
-          window.intellipay.initialize();
-        });
+        SetIntellipayCallbackFunctions();
+        window.intellipay.isAutoOpen = true;
+        window.intellipay.initialize();
       }
     } catch (error) {
       notification.open({
@@ -163,27 +137,25 @@ const CardPaymentModalComponent = ({
     //Validate
     try {
       await form.validateFields();
-    } catch {
+    } catch (error) {
       setLoading(false);
       return;
     }
 
-    const iPayData = collectIPayFields();
-
     try {
       const { payments } = form.getFieldsValue();
       const response = await axios.post("/intellipay/generate_payment_url", {
         bodyshop,
-        amount: payments.reduce((acc, val) => acc + (val?.amount || 0), 0),
-        account: payments && data?.jobs?.length > 0 ? data.jobs.map((j) => j.ro_number).join(", ") : null,
+        amount: payments?.reduce((acc, val) => {
+          return acc + (val?.amount || 0);
+        }, 0),
+        account: payments && data && data.jobs.length > 0 ? data.jobs.map((j) => j.ro_number).join(", ") : null,
         comment: btoa(JSON.stringify({ payments, userEmail: currentUser.email })),
-        paymentSplitMeta: form.getFieldsValue(),
-        iPayData: iPayData
+        paymentSplitMeta: form.getFieldsValue()
       });
-
-      if (response?.data?.shorUrl) {
-        setPaymentLink(response.data.shorUrl);
-        await navigator.clipboard.writeText(response.data.shorUrl);
+      if (response.data) {
+        setPaymentLink(response.data?.shorUrl);
+        navigator.clipboard.writeText(response.data?.shorUrl);
         message.success(t("general.actions.copied"));
       }
       setLoading(false);
@@ -207,44 +179,67 @@ const CardPaymentModalComponent = ({
           }}
         >
           <Form.List name={["payments"]}>
-            {(fields, { add, remove }) => (
-              <div>
-                {fields.map((field, index) => (
-                  <Form.Item key={field.key}>
-                    <Row gutter={[16, 16]}>
-                      <Col span={16}>
-                        <Form.Item
-                          key={`${index}jobid`}
-                          label={t("jobs.fields.ro_number")}
-                          name={[field.name, "jobid"]}
-                          rules={[{ required: true }]}
-                        >
-                          <JobSearchSelectComponent notExported={false} clm_no />
-                        </Form.Item>
-                      </Col>
-                      <Col span={6}>
-                        <Form.Item
-                          key={`${index}amount`}
-                          label={t("payments.fields.amount")}
-                          name={[field.name, "amount"]}
-                          rules={[{ required: true }]}
-                        >
-                          <CurrencyFormItemComponent />
-                        </Form.Item>
-                      </Col>
-                      <Col span={2}>
-                        <DeleteFilled style={{ margin: "1rem" }} onClick={() => remove(field.name)} />
-                      </Col>
-                    </Row>
+            {(fields, { add, remove, move }) => {
+              return (
+                <div>
+                  {fields.map((field, index) => (
+                    <Form.Item key={field.key}>
+                      <Row gutter={[16, 16]}>
+                        <Col span={16}>
+                          <Form.Item
+                            key={`${index}jobid`}
+                            label={t("jobs.fields.ro_number")}
+                            name={[field.name, "jobid"]}
+                            rules={[
+                              {
+                                required: true
+                                //message: t("general.validation.required"),
+                              }
+                            ]}
+                          >
+                            <JobSearchSelectComponent notExported={false} clm_no />
+                          </Form.Item>
+                        </Col>
+                        <Col span={6}>
+                          <Form.Item
+                            key={`${index}amount`}
+                            label={t("payments.fields.amount")}
+                            name={[field.name, "amount"]}
+                            rules={[
+                              {
+                                required: true
+                                //message: t("general.validation.required"),
+                              }
+                            ]}
+                          >
+                            <CurrencyFormItemComponent />
+                          </Form.Item>
+                        </Col>
+                        <Col span={2}>
+                          <DeleteFilled
+                            style={{ margin: "1rem" }}
+                            onClick={() => {
+                              remove(field.name);
+                            }}
+                          />
+                        </Col>
+                      </Row>
+                    </Form.Item>
+                  ))}
+                  <Form.Item>
+                    <Button
+                      type="dashed"
+                      onClick={() => {
+                        add();
+                      }}
+                      style={{ width: "100%" }}
+                    >
+                      {t("general.actions.add")}
+                    </Button>
                   </Form.Item>
-                ))}
-                <Form.Item>
-                  <Button type="dashed" onClick={() => add()} style={{ width: "100%" }}>
-                    {t("general.actions.add")}
-                  </Button>
-                </Form.Item>
-              </div>
-            )}
+                </div>
+              );
+            }}
           </Form.List>
 
           <Form.Item
@@ -288,7 +283,9 @@ const CardPaymentModalComponent = ({
           >
             {() => {
               const { payments } = form.getFieldsValue();
-              const totalAmountToCharge = payments?.reduce((acc, val) => acc + (val?.amount || 0), 0);
+              const totalAmountToCharge = payments?.reduce((acc, val) => {
+                return acc + (val?.amount || 0);
+              }, 0);
               return (
                 <Space style={{ float: "right" }}>
                   <Statistic title="Amount To Charge" value={totalAmountToCharge} precision={2} />
@@ -351,27 +348,3 @@ const CardPaymentModalComponent = ({
 };
 
 export default connect(mapStateToProps, mapDispatchToProps)(CardPaymentModalComponent);
-
-//Poll for window.IntelliPay.fixAmount for 5 seconds. If it doesn't come up, just try anyways to force the possible error.
-function pollForIntelliPay(callbackFunction) {
-  const timeout = 5000;
-  const interval = 150; // Poll every 100 milliseconds
-  const startTime = Date.now();
-
-  function checkFixAmount() {
-    if (window.intellipay && window.intellipay.fixAmount !== undefined) {
-      callbackFunction();
-      return;
-    }
-
-    if (Date.now() - startTime >= timeout) {
-      console.log("Stopped polling IntelliPay after 10 seconds. Attemping to set functions anyways.");
-      callbackFunction();
-      return;
-    }
-
-    setTimeout(checkFixAmount, interval);
-  }
-
-  checkFixAmount();
-}

client/src/components/card-payment-modal/card-payment-modal.container..jsx

@@ -6,7 +6,7 @@ import { createStructuredSelector } from "reselect";
 import { toggleModalVisible } from "../../redux/modals/modals.actions";
 import { selectCardPayment } from "../../redux/modals/modals.selectors";
 import { selectBodyshop } from "../../redux/user/user.selectors";
-import CardPaymentModalComponent from "./card-payment-modal.component";
+import CardPaymentModalComponent from "./card-payment-modal.component.";
 
 const mapStateToProps = createStructuredSelector({
   cardPaymentModal: selectCardPayment,

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

@@ -1,50 +1,89 @@
 import { useApolloClient } from "@apollo/client";
-import { getToken } from "@firebase/messaging";
+import { getToken, onMessage } from "@firebase/messaging";
+import { Button, notification, Space } from "antd";
 import axios from "axios";
-import React, { useContext, useEffect } from "react";
+import React, { useEffect } from "react";
 import { useTranslation } from "react-i18next";
-import SocketContext from "../../contexts/SocketIO/socketContext";
 import { messaging, requestForToken } from "../../firebase/firebase.utils";
+import FcmHandler from "../../utils/fcm-handler";
 import ChatPopupComponent from "../chat-popup/chat-popup.component";
 import "./chat-affix.styles.scss";
-import { registerMessagingHandlers, unregisterMessagingHandlers } from "./registerMessagingSocketHandlers";
 
 export function ChatAffixContainer({ bodyshop, chatVisible }) {
   const { t } = useTranslation();
   const client = useApolloClient();
-  const { socket } = useContext(SocketContext);
 
   useEffect(() => {
     if (!bodyshop || !bodyshop.messagingservicesid) return;
 
-    async function SubscribeToTopicForFCMNotification() {
+    async function SubscribeToTopic() {
       try {
-        await requestForToken();
-        await axios.post("/notifications/subscribe", {
+        const r = await axios.post("/notifications/subscribe", {
           fcm_tokens: await getToken(messaging, {
             vapidKey: import.meta.env.VITE_APP_FIREBASE_PUBLIC_VAPID_KEY
           }),
           type: "messaging",
           imexshopid: bodyshop.imexshopid
         });
+        console.log("FCM Topic Subscription", r.data);
       } catch (error) {
         console.log("Error attempting to subscribe to messaging topic: ", error);
+        notification.open({
+          key: "fcm",
+          type: "warning",
+          message: t("general.errors.fcm"),
+          btn: (
+            <Space>
+              <Button
+                onClick={async () => {
+                  await requestForToken();
+                  SubscribeToTopic();
+                }}
+              >
+                {t("general.actions.tryagain")}
+              </Button>
+              <Button
+                onClick={() => {
+                  const win = window.open(
+                    "https://help.imex.online/en/article/enabling-notifications-o978xi/",
+                    "_blank"
+                  );
+                  win.focus();
+                }}
+              >
+                {t("general.labels.help")}
+              </Button>
+            </Space>
+          )
+        });
       }
     }
 
-    SubscribeToTopicForFCMNotification();
+    SubscribeToTopic();
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [bodyshop]);
 
-    //Register WS handlers
-    if (socket && socket.connected) {
-      registerMessagingHandlers({ socket, client });
+  useEffect(() => {
+    function handleMessage(payload) {
+      FcmHandler({
+        client,
+        payload: (payload && payload.data && payload.data.data) || payload.data
+      });
     }
 
+    let stopMessageListener, channel;
+    try {
+      stopMessageListener = onMessage(messaging, handleMessage);
+      channel = new BroadcastChannel("imex-sw-messages");
+      channel.addEventListener("message", handleMessage);
+    } catch (error) {
+      console.log("Unable to set event listeners.");
+    }
     return () => {
-      if (socket && socket.connected) {
-        unregisterMessagingHandlers({ socket });
-      }
+      stopMessageListener && stopMessageListener();
+      channel && channel.removeEventListener("message", handleMessage);
     };
-  }, [bodyshop, socket, t, client]);
+  }, [client]);
 
   if (!bodyshop || !bodyshop.messagingservicesid) return <></>;
 

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

@@ -1,434 +0,0 @@
-import { CONVERSATION_LIST_QUERY, GET_CONVERSATION_DETAILS } from "../../graphql/conversations.queries";
-import { gql } from "@apollo/client";
-
-const logLocal = (message, ...args) => {
-  if (import.meta.env.VITE_APP_IS_TEST || !import.meta.env.PROD) {
-    console.log(`==================== ${message} ====================`);
-    console.dir({ ...args });
-  }
-};
-
-// Utility function to enrich conversation data
-const enrichConversation = (conversation, isOutbound) => ({
-  ...conversation,
-  updated_at: conversation.updated_at || new Date().toISOString(),
-  unreadcnt: conversation.unreadcnt || 0,
-  archived: conversation.archived || false,
-  label: conversation.label || null,
-  job_conversations: conversation.job_conversations || [],
-  messages_aggregate: conversation.messages_aggregate || {
-    __typename: "messages_aggregate",
-    aggregate: {
-      __typename: "messages_aggregate_fields",
-      count: isOutbound ? 0 : 1
-    }
-  },
-  __typename: "conversations"
-});
-
-export const registerMessagingHandlers = ({ socket, client }) => {
-  if (!(socket && client)) return;
-
-  const handleNewMessageSummary = async (message) => {
-    const { conversationId, newConversation, existingConversation, isoutbound } = message;
-
-    logLocal("handleNewMessageSummary - Start", { message, isNew: !existingConversation });
-
-    const queryVariables = { offset: 0 };
-
-    if (!existingConversation && conversationId) {
-      // Attempt to read from the cache to determine if this is actually a new conversation
-      try {
-        const cachedConversation = client.cache.readFragment({
-          id: client.cache.identify({ __typename: "conversations", id: conversationId }),
-          fragment: gql`
-            fragment ExistingConversationCheck on conversations {
-              id
-            }
-          `
-        });
-
-        if (cachedConversation) {
-          logLocal("handleNewMessageSummary - Existing Conversation inferred from cache", {
-            conversationId
-          });
-          return handleNewMessageSummary({
-            ...message,
-            existingConversation: true
-          });
-        }
-      } catch (error) {
-        logLocal("handleNewMessageSummary - Cache miss", { conversationId });
-      }
-    }
-
-    // Handle new conversation
-    if (!existingConversation && newConversation?.phone_num) {
-      logLocal("handleNewMessageSummary - New Conversation", newConversation);
-
-      try {
-        const queryResults = client.cache.readQuery({
-          query: CONVERSATION_LIST_QUERY,
-          variables: queryVariables
-        });
-
-        const existingConversations = queryResults?.conversations || [];
-        const enrichedConversation = enrichConversation(newConversation, isoutbound);
-
-        if (!existingConversations.some((conv) => conv.id === enrichedConversation.id)) {
-          client.cache.modify({
-            id: "ROOT_QUERY",
-            fields: {
-              conversations(existingConversations = []) {
-                return [enrichedConversation, ...existingConversations];
-              }
-            }
-          });
-        }
-      } catch (error) {
-        console.error("Error updating cache for new conversation:", error);
-      }
-      return;
-    }
-
-    // Handle existing conversation
-    if (existingConversation) {
-      try {
-        client.cache.modify({
-          id: client.cache.identify({ __typename: "conversations", id: conversationId }),
-          fields: {
-            updated_at: () => new Date().toISOString(),
-            archived: () => false,
-            messages_aggregate(cached = { aggregate: { count: 0 } }) {
-              const currentCount = cached.aggregate?.count || 0;
-              if (!isoutbound) {
-                return {
-                  __typename: "messages_aggregate",
-                  aggregate: {
-                    __typename: "messages_aggregate_fields",
-                    count: currentCount + 1
-                  }
-                };
-              }
-              return cached;
-            }
-          }
-        });
-      } catch (error) {
-        console.error("Error updating cache for existing conversation:", error);
-      }
-
-      return;
-    }
-
-    logLocal("New Conversation Summary finished without work", { message });
-  };
-
-  const handleNewMessageDetailed = (message) => {
-    const { conversationId, newMessage } = message;
-
-    logLocal("handleNewMessageDetailed - Start", message);
-
-    try {
-      // Check if the conversation exists in the cache
-      const queryResults = client.cache.readQuery({
-        query: GET_CONVERSATION_DETAILS,
-        variables: { conversationId }
-      });
-
-      if (!queryResults?.conversations_by_pk) {
-        console.warn("Conversation not found in cache:", { conversationId });
-        return;
-      }
-
-      // Append the new message to the conversation's message list using cache.modify
-      client.cache.modify({
-        id: client.cache.identify({ __typename: "conversations", id: conversationId }),
-        fields: {
-          messages(existingMessages = []) {
-            return [...existingMessages, newMessage];
-          }
-        }
-      });
-
-      logLocal("handleNewMessageDetailed - Message appended successfully", {
-        conversationId,
-        newMessage
-      });
-    } catch (error) {
-      console.error("Error updating conversation messages in cache:", error);
-    }
-  };
-
-  const handleMessageChanged = (message) => {
-    if (!message) {
-      logLocal("handleMessageChanged - No message provided", message);
-      return;
-    }
-
-    logLocal("handleMessageChanged - Start", message);
-
-    try {
-      client.cache.modify({
-        id: client.cache.identify({ __typename: "conversations", id: message.conversationid }),
-        fields: {
-          messages(existingMessages = [], { readField }) {
-            return existingMessages.map((messageRef) => {
-              // Check if this is the message to update
-              if (readField("id", messageRef) === message.id) {
-                const currentStatus = readField("status", messageRef);
-
-                // Handle known types of message changes
-                switch (message.type) {
-                  case "status-changed":
-                    // Prevent overwriting if the current status is already "delivered"
-                    if (currentStatus === "delivered") {
-                      logLocal("handleMessageChanged - Status already delivered, skipping update", {
-                        messageId: message.id
-                      });
-                      return messageRef;
-                    }
-
-                    // Update the status field
-                    return {
-                      ...messageRef,
-                      status: message.status
-                    };
-
-                  case "text-updated":
-                    // Handle changes to the message text
-                    return {
-                      ...messageRef,
-                      text: message.text
-                    };
-
-                  // Add cases for other known message types as needed
-
-                  default:
-                    // Log a warning for unhandled message types
-                    logLocal("handleMessageChanged - Unhandled message type", { type: message.type });
-                    return messageRef;
-                }
-              }
-
-              return messageRef; // Keep other messages unchanged
-            });
-          }
-        }
-      });
-
-      logLocal("handleMessageChanged - Message updated successfully", {
-        messageId: message.id,
-        type: message.type
-      });
-    } catch (error) {
-      console.error("handleMessageChanged - Error modifying cache:", error);
-    }
-  };
-
-  const handleConversationChanged = async (data) => {
-    if (!data) {
-      logLocal("handleConversationChanged - No data provided", data);
-      return;
-    }
-
-    const { conversationId, type, job_conversations, messageIds, ...fields } = data;
-    logLocal("handleConversationChanged - Start", data);
-
-    const updatedAt = new Date().toISOString();
-
-    const updateConversationList = (newConversation) => {
-      try {
-        const existingList = client.cache.readQuery({
-          query: CONVERSATION_LIST_QUERY,
-          variables: { offset: 0 }
-        });
-
-        const updatedList = existingList?.conversations
-          ? [
-              newConversation,
-              ...existingList.conversations.filter((conv) => conv.id !== newConversation.id) // Prevent duplicates
-            ]
-          : [newConversation];
-
-        client.cache.writeQuery({
-          query: CONVERSATION_LIST_QUERY,
-          variables: { offset: 0 },
-          data: {
-            conversations: updatedList
-          }
-        });
-
-        logLocal("handleConversationChanged - Conversation list updated successfully", newConversation);
-      } catch (error) {
-        console.error("Error updating conversation list in the cache:", error);
-      }
-    };
-
-    // Handle specific types
-    try {
-      switch (type) {
-        case "conversation-marked-read":
-          if (conversationId && messageIds?.length > 0) {
-            client.cache.modify({
-              id: client.cache.identify({ __typename: "conversations", id: conversationId }),
-              fields: {
-                messages(existingMessages = [], { readField }) {
-                  return existingMessages.map((message) => {
-                    if (messageIds.includes(readField("id", message))) {
-                      return { ...message, read: true };
-                    }
-                    return message;
-                  });
-                },
-                messages_aggregate: () => ({
-                  __typename: "messages_aggregate",
-                  aggregate: { __typename: "messages_aggregate_fields", count: 0 }
-                })
-              }
-            });
-          }
-          break;
-
-        case "conversation-created":
-          updateConversationList({ ...fields, job_conversations, updated_at: updatedAt });
-          break;
-
-        case "conversation-unarchived":
-        case "conversation-archived":
-          // Would like to someday figure out how to get this working without refetch queries,
-          // But I have but a solid 4 hours into it, and there are just too many weird occurrences
-          try {
-            const listQueryVariables = { offset: 0 };
-            const detailsQueryVariables = { conversationId };
-
-            // Check if conversation details exist in the cache
-            const detailsExist = !!client.cache.readQuery({
-              query: GET_CONVERSATION_DETAILS,
-              variables: detailsQueryVariables
-            });
-
-            // Refetch conversation list
-            await client.refetchQueries({
-              include: [CONVERSATION_LIST_QUERY, ...(detailsExist ? [GET_CONVERSATION_DETAILS] : [])],
-              variables: [
-                { query: CONVERSATION_LIST_QUERY, variables: listQueryVariables },
-                ...(detailsExist
-                  ? [
-                      {
-                        query: GET_CONVERSATION_DETAILS,
-                        variables: detailsQueryVariables
-                      }
-                    ]
-                  : [])
-              ]
-            });
-
-            logLocal("handleConversationChanged - Refetched queries after state change", {
-              conversationId,
-              type
-            });
-          } catch (error) {
-            console.error("Error refetching queries after conversation state change:", error);
-          }
-          break;
-
-        case "tag-added":
-          // Ensure `job_conversations` is properly formatted
-          const formattedJobConversations = job_conversations.map((jc) => ({
-            __typename: "job_conversations",
-            jobid: jc.jobid || jc.job?.id,
-            conversationid: conversationId,
-            job: jc.job || {
-              __typename: "jobs",
-              id: data.selectedJob.id,
-              ro_number: data.selectedJob.ro_number,
-              ownr_co_nm: data.selectedJob.ownr_co_nm,
-              ownr_fn: data.selectedJob.ownr_fn,
-              ownr_ln: data.selectedJob.ownr_ln
-            }
-          }));
-
-          client.cache.modify({
-            id: client.cache.identify({ __typename: "conversations", id: conversationId }),
-            fields: {
-              job_conversations: (existing = []) => {
-                // Ensure no duplicates based on both `conversationid` and `jobid`
-                const existingLinks = new Set(
-                  existing.map((jc) => {
-                    const jobId = client.cache.readFragment({
-                      id: client.cache.identify(jc),
-                      fragment: gql`
-                        fragment JobConversationLinkAdded on job_conversations {
-                          jobid
-                          conversationid
-                        }
-                      `
-                    })?.jobid;
-                    return `${jobId}:${conversationId}`; // Unique identifier for a job-conversation link
-                  })
-                );
-
-                const newItems = formattedJobConversations.filter((jc) => {
-                  const uniqueLink = `${jc.jobid}:${jc.conversationid}`;
-                  return !existingLinks.has(uniqueLink);
-                });
-
-                return [...existing, ...newItems];
-              }
-            }
-          });
-
-          break;
-
-        case "tag-removed":
-          try {
-            const conversationCacheId = client.cache.identify({ __typename: "conversations", id: conversationId });
-
-            // Evict the specific cache entry for job_conversations
-            client.cache.evict({
-              id: conversationCacheId,
-              fieldName: "job_conversations"
-            });
-
-            // Garbage collect evicted entries
-            client.cache.gc();
-
-            logLocal("handleConversationChanged - tag removed - Refetched conversation list after state change", {
-              conversationId,
-              type
-            });
-          } catch (error) {
-            console.error("Error refetching queries after conversation state change: (Tag Removed)", error);
-          }
-
-          break;
-        default:
-          logLocal("handleConversationChanged - Unhandled type", { type });
-          client.cache.modify({
-            id: client.cache.identify({ __typename: "conversations", id: conversationId }),
-            fields: {
-              ...Object.fromEntries(
-                Object.entries(fields).map(([key, value]) => [key, (cached) => (value !== undefined ? value : cached)])
-              )
-            }
-          });
-      }
-    } catch (error) {
-      console.error("Error handling conversation changes:", { type, error });
-    }
-  };
-
-  socket.on("new-message-summary", handleNewMessageSummary);
-  socket.on("new-message-detailed", handleNewMessageDetailed);
-  socket.on("message-changed", handleMessageChanged);
-  socket.on("conversation-changed", handleConversationChanged);
-};
-
-export const unregisterMessagingHandlers = ({ socket }) => {
-  if (!socket) return;
-  socket.off("new-message-summary");
-  socket.off("new-message-detailed");
-  socket.off("message-changed");
-  socket.off("conversation-changed");
-};

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

@@ -1,49 +1,27 @@
 import { useMutation } from "@apollo/client";
 import { Button } from "antd";
-import React, { useContext, useState } from "react";
+import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { TOGGLE_CONVERSATION_ARCHIVE } from "../../graphql/conversations.queries";
-import SocketContext from "../../contexts/SocketIO/socketContext.jsx";
-import { createStructuredSelector } from "reselect";
-import { selectBodyshop } from "../../redux/user/user.selectors.js";
-import { connect } from "react-redux";
 
-const mapStateToProps = createStructuredSelector({
-  bodyshop: selectBodyshop
-});
-
-const mapDispatchToProps = () => ({});
-
-export function ChatArchiveButton({ conversation, bodyshop }) {
+export default function ChatArchiveButton({ conversation }) {
   const [loading, setLoading] = useState(false);
   const { t } = useTranslation();
   const [updateConversation] = useMutation(TOGGLE_CONVERSATION_ARCHIVE);
-  const { socket } = useContext(SocketContext);
-
   const handleToggleArchive = async () => {
     setLoading(true);
 
-    const updatedConversation = await updateConversation({
-      variables: { id: conversation.id, archived: !conversation.archived }
+    await updateConversation({
+      variables: { id: conversation.id, archived: !conversation.archived },
+      refetchQueries: ["CONVERSATION_LIST_QUERY"]
     });
 
-    if (socket) {
-      socket.emit("conversation-modified", {
-        type: "conversation-archived",
-        conversationId: conversation.id,
-        bodyshopId: bodyshop.id,
-        archived: updatedConversation.data.update_conversations_by_pk.archived
-      });
-    }
-
     setLoading(false);
   };
 
   return (
-    <Button onClick={handleToggleArchive} loading={loading} className="archive-button" type="primary">
+    <Button onClick={handleToggleArchive} loading={loading} type="primary">
       {conversation.archived ? t("messaging.labels.unarchive") : t("messaging.labels.archive")}
     </Button>
   );
 }
-
-export default connect(mapStateToProps, mapDispatchToProps)(ChatArchiveButton);

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

@@ -1,5 +1,5 @@
 import { Badge, Card, List, Space, Tag } from "antd";
-import React, { useEffect, useState } from "react";
+import React from "react";
 import { connect } from "react-redux";
 import { Virtuoso } from "react-virtuoso";
 import { createStructuredSelector } from "reselect";
@@ -19,26 +19,14 @@ const mapDispatchToProps = (dispatch) => ({
   setSelectedConversation: (conversationId) => dispatch(setSelectedConversation(conversationId))
 });
 
-function ChatConversationListComponent({ conversationList, selectedConversation, setSelectedConversation }) {
-  // That comma is there for a reason, do not remove it
-  const [, forceUpdate] = useState(false);
-
-  // Re-render every minute
-  useEffect(() => {
-    const interval = setInterval(() => {
-      forceUpdate((prev) => !prev); // Toggle state to trigger re-render
-    }, 60000); // 1 minute in milliseconds
-
-    return () => clearInterval(interval); // Cleanup on unmount
-  }, []);
-
-  // Memoize the sorted conversation list
-  const sortedConversationList = React.useMemo(() => {
-    return _.orderBy(conversationList, ["updated_at"], ["desc"]);
-  }, [conversationList]);
-
+function ChatConversationListComponent({
+  conversationList,
+  selectedConversation,
+  setSelectedConversation,
+  loadMoreConversations
+}) {
   const renderConversation = (index) => {
-    const item = sortedConversationList[index];
+    const item = conversationList[index];
     const cardContentRight = <TimeAgoFormatter>{item.updated_at}</TimeAgoFormatter>;
     const cardContentLeft =
       item.job_conversations.length > 0
@@ -60,7 +48,7 @@ function ChatConversationListComponent({ conversationList, selectedConversation,
       </>
     );
 
-    const cardExtra = <Badge count={item.messages_aggregate.aggregate.count} />;
+    const cardExtra = <Badge count={item.messages_aggregate.aggregate.count || 0} />;
 
     const getCardStyle = () =>
       item.id === selectedConversation
@@ -84,9 +72,10 @@ function ChatConversationListComponent({ conversationList, selectedConversation,
   return (
     <div className="chat-list-container">
       <Virtuoso
-        data={sortedConversationList}
+        data={conversationList}
         itemContent={(index) => renderConversation(index)}
         style={{ height: "100%", width: "100%" }}
+        endReached={loadMoreConversations} // Calls loadMoreConversations when scrolled to the bottom
       />
     </div>
   );

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

@@ -1,29 +1,18 @@
 import { useMutation } from "@apollo/client";
 import { Tag } from "antd";
-import React, { useContext } from "react";
+import React 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 SocketContext from "../../contexts/SocketIO/socketContext.jsx";
-import { createStructuredSelector } from "reselect";
-import { selectBodyshop } from "../../redux/user/user.selectors.js";
-import { connect } from "react-redux";
 
-const mapStateToProps = createStructuredSelector({
-  bodyshop: selectBodyshop
-});
-
-const mapDispatchToProps = () => ({});
-
-export function ChatConversationTitleTags({ jobConversations, bodyshop }) {
+export default function ChatConversationTitleTags({ jobConversations }) {
   const [removeJobConversation] = useMutation(REMOVE_CONVERSATION_TAG);
-  const { socket } = useContext(SocketContext);
 
-  const handleRemoveTag = async (jobId) => {
+  const handleRemoveTag = (jobId) => {
     const convId = jobConversations[0].conversationid;
     if (!!convId) {
-      await removeJobConversation({
+      removeJobConversation({
         variables: {
           conversationId: convId,
           jobId: jobId
@@ -39,17 +28,6 @@ export function ChatConversationTitleTags({ jobConversations, bodyshop }) {
           });
         }
       });
-
-      if (socket) {
-        // Emit the `conversation-modified` event
-        socket.emit("conversation-modified", {
-          bodyshopId: bodyshop.id,
-          conversationId: convId,
-          type: "tag-removed",
-          jobId: jobId
-        });
-      }
-
       logImEXEvent("messaging_remove_job_tag", {
         conversationId: convId,
         jobId: jobId
@@ -76,5 +54,3 @@ export function ChatConversationTitleTags({ jobConversations, bodyshop }) {
     </div>
   );
 }
-
-export default connect(mapStateToProps, mapDispatchToProps)(ChatConversationTitleTags);

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

@@ -6,16 +6,10 @@ import ChatConversationTitleTags from "../chat-conversation-title-tags/chat-conv
 import ChatLabelComponent from "../chat-label/chat-label.component";
 import ChatPrintButton from "../chat-print-button/chat-print-button.component";
 import ChatTagRoContainer from "../chat-tag-ro/chat-tag-ro.container";
-import { createStructuredSelector } from "reselect";
-import { connect } from "react-redux";
 
-const mapStateToProps = createStructuredSelector({});
-
-const mapDispatchToProps = () => ({});
-
-export function ChatConversationTitle({ conversation }) {
+export default function ChatConversationTitle({ conversation }) {
   return (
-    <Space className="chat-title" wrap>
+    <Space wrap>
       <PhoneNumberFormatter>{conversation && conversation.phone_num}</PhoneNumberFormatter>
       <ChatLabelComponent conversation={conversation} />
       <ChatPrintButton conversation={conversation} />
@@ -25,5 +19,3 @@ export function ChatConversationTitle({ conversation }) {
     </Space>
   );
 }
-
-export default connect(mapStateToProps, mapDispatchToProps)(ChatConversationTitle);

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

@@ -5,26 +5,10 @@ import ChatMessageListComponent from "../chat-messages-list/chat-message-list.co
 import ChatSendMessage from "../chat-send-message/chat-send-message.component";
 import LoadingSkeleton from "../loading-skeleton/loading-skeleton.component.jsx";
 import "./chat-conversation.styles.scss";
-import { createStructuredSelector } from "reselect";
-import { selectBodyshop } from "../../redux/user/user.selectors.js";
-import { connect } from "react-redux";
 
-const mapStateToProps = createStructuredSelector({
-  bodyshop: selectBodyshop
-});
-
-const mapDispatchToProps = () => ({});
-
-export function ChatConversationComponent({
-  subState,
-  conversation,
-  messages,
-  handleMarkConversationAsRead,
-  bodyshop
-}) {
+export default function ChatConversationComponent({ subState, conversation, messages, handleMarkConversationAsRead }) {
   const [loading, error] = subState;
 
-  if (conversation?.archived) return null;
   if (loading) return <LoadingSkeleton />;
   if (error) return <AlertComponent message={error.message} type="error" />;
 
@@ -34,11 +18,9 @@ export function ChatConversationComponent({
       onMouseDown={handleMarkConversationAsRead}
       onKeyDown={handleMarkConversationAsRead}
     >
-      <ChatConversationTitle conversation={conversation} bodyshop={bodyshop} />
+      <ChatConversationTitle conversation={conversation} />
       <ChatMessageListComponent messages={messages} />
       <ChatSendMessage conversation={conversation} />
     </div>
   );
 }
-
-export default connect(mapStateToProps, mapDispatchToProps)(ChatConversationComponent);

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

@@ -1,174 +1,83 @@
-import { gql, useApolloClient, useQuery, useSubscription } from "@apollo/client";
-import axios from "axios";
-import React, { useCallback, useContext, useEffect, useState } from "react";
+import React, { useContext, useEffect, useState } from "react";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
-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";
+import SocketContext from "../../contexts/SocketIO/socketContext.jsx";
 
 const mapStateToProps = createStructuredSelector({
   selectedConversation: selectSelectedConversation,
   bodyshop: selectBodyshop
 });
 
-function ChatConversationContainer({ bodyshop, selectedConversation }) {
-  const client = useApolloClient();
+const mapDispatchToProps = (dispatch) => ({});
+
+export function ChatConversationContainer({ bodyshop, selectedConversation }) {
   const { socket } = useContext(SocketContext);
+  const [conversationDetails, setConversationDetails] = useState({});
+  const [messages, setMessages] = useState([]);
   const [markingAsReadInProgress, setMarkingAsReadInProgress] = useState(false);
+  const [loading, setLoading] = useState(false);
+  const [error] = useState(null);
 
-  // Fetch conversation details
-  const {
-    loading: convoLoading,
-    error: convoError,
-    data: convoData
-  } = useQuery(GET_CONVERSATION_DETAILS, {
-    variables: { conversationId: selectedConversation },
-    fetchPolicy: "network-only",
-    nextFetchPolicy: "network-only"
-  });
+  // Fetch conversation details and messages when a conversation is selected
+  useEffect(() => {
+    if (socket && selectedConversation) {
+      setLoading(true);
+      socket.emit("join-conversation", selectedConversation);
 
-  // Subscription for conversation updates
-  useSubscription(CONVERSATION_SUBSCRIPTION_BY_PK, {
-    skip: socket?.connected,
-    variables: { conversationId: selectedConversation },
-    onData: ({ data: subscriptionResult, client }) => {
-      // Extract the messages array from the result
-      const messages = subscriptionResult?.data?.messages;
-      if (!messages || messages.length === 0) {
-        console.warn("No messages found in subscription result.");
-        return;
-      }
-
-      messages.forEach((message) => {
-        const messageRef = client.cache.identify(message);
-        // Write the new message to the cache
-        client.cache.writeFragment({
-          id: messageRef,
-          fragment: gql`
-            fragment NewMessage on messages {
-              id
-              status
-              text
-              isoutbound
-              image
-              image_path
-              userid
-              created_at
-              read
-            }
-          `,
-          data: message
-        });
-
-        // Update the conversation cache to include the new message
-        client.cache.modify({
-          id: client.cache.identify({ __typename: "conversations", id: selectedConversation }),
-          fields: {
-            messages(existingMessages = []) {
-              const alreadyExists = existingMessages.some((msg) => msg.__ref === messageRef);
-              if (alreadyExists) return existingMessages;
-              return [...existingMessages, { __ref: messageRef }];
-            },
-            updated_at() {
-              return message.created_at;
-            }
-          }
-        });
+      socket.on("conversation-details", (data) => {
+        setConversationDetails(data.conversation);
+        setMessages(data.messages);
+        setLoading(false);
       });
+
+      socket.on("new-message", (message) => {
+        setMessages((prevMessages) => [...prevMessages, message]);
+      });
+
+      socket.on("conversation-list-updated", (data) => {
+        setConversationDetails(data.conversation);
+        setMessages(data.messages);
+      });
+
+      return () => {
+        socket.emit("leave-conversation", selectedConversation);
+        socket.off("conversation-details");
+        socket.off("new-message");
+        socket.off("conversation-list-updated");
+      };
     }
-  });
+  }, [socket, selectedConversation]);
 
-  const updateCacheWithReadMessages = useCallback(
-    (conversationId, messageIds) => {
-      if (!conversationId || !messageIds?.length) return;
-
-      messageIds.forEach((messageId) => {
-        client.cache.modify({
-          id: client.cache.identify({ __typename: "messages", id: messageId }),
-          fields: {
-            read: () => true
-          }
-        });
-      });
-    },
-    [client.cache]
-  );
-
-  // WebSocket event handlers
-  useEffect(() => {
-    if (!socket?.connected) return;
-
-    const handleConversationChange = (data) => {
-      if (data.type === "conversation-marked-read") {
-        const { conversationId, messageIds } = data;
-        updateCacheWithReadMessages(conversationId, messageIds);
-      }
-    };
-
-    socket.on("conversation-changed", handleConversationChange);
-
-    return () => {
-      socket.off("conversation-changed", handleConversationChange);
-    };
-  }, [socket, updateCacheWithReadMessages]);
-
-  // Join and leave conversation via WebSocket
-  useEffect(() => {
-    if (!socket?.connected || !selectedConversation || !bodyshop?.id) return;
-
-    socket.emit("join-bodyshop-conversation", {
-      bodyshopId: bodyshop.id,
-      conversationId: selectedConversation
-    });
-
-    return () => {
-      socket.emit("leave-bodyshop-conversation", {
-        bodyshopId: bodyshop.id,
-        conversationId: selectedConversation
-      });
-    };
-  }, [socket, bodyshop, selectedConversation]);
-
-  // Mark conversation as read
+  // Mark messages as read
   const handleMarkConversationAsRead = async () => {
-    if (!convoData || markingAsReadInProgress) return;
-
-    const conversation = convoData.conversations_by_pk;
-    if (!conversation) return;
-
-    const unreadMessageIds = conversation.messages
-      ?.filter((message) => !message.read && !message.isoutbound)
-      .map((message) => message.id);
-
-    if (unreadMessageIds?.length > 0) {
+    if (messages.some((msg) => !msg.read) && !markingAsReadInProgress) {
       setMarkingAsReadInProgress(true);
-      try {
-        await axios.post("/sms/markConversationRead", {
-          conversation,
-          imexshopid: bodyshop?.imexshopid,
-          bodyshopid: bodyshop?.id
-        });
+      // Emit a WebSocket event to mark messages as read
+      socket.emit("mark-as-read", {
+        conversationId: selectedConversation,
+        imexshopid: bodyshop.imexshopid,
+        bodyshopId: bodyshop.id
+      });
 
-        updateCacheWithReadMessages(selectedConversation, unreadMessageIds);
-      } catch (error) {
-        console.error("Error marking conversation as read:", error.message);
-      } finally {
-        setMarkingAsReadInProgress(false);
-      }
+      setMarkingAsReadInProgress(false);
     }
   };
 
+  if (!messages || !conversationDetails || !messages.length) {
+    return null;
+  }
+
   return (
     <ChatConversationComponent
-      subState={[convoLoading, convoError]}
-      conversation={convoData?.conversations_by_pk || {}}
-      messages={convoData?.conversations_by_pk?.messages || []}
+      subState={[loading, error]}
+      conversation={conversationDetails}
+      messages={messages}
       handleMarkConversationAsRead={handleMarkConversationAsRead}
     />
   );
 }
 
-export default connect(mapStateToProps)(ChatConversationContainer);
+export default connect(mapStateToProps, mapDispatchToProps)(ChatConversationContainer);

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

@@ -1,27 +1,14 @@
 import { PlusOutlined } from "@ant-design/icons";
 import { useMutation } from "@apollo/client";
-import { Input, Spin, Tag, Tooltip } from "antd";
-import React, { useContext, useState } from "react";
+import { Input, notification, Spin, Tag, Tooltip } from "antd";
+import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { UPDATE_CONVERSATION_LABEL } from "../../graphql/conversations.queries";
-import SocketContext from "../../contexts/SocketIO/socketContext.jsx";
-import { createStructuredSelector } from "reselect";
-import { selectBodyshop } from "../../redux/user/user.selectors.js";
-import { connect } from "react-redux";
-import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
 
-const mapStateToProps = createStructuredSelector({
-  bodyshop: selectBodyshop
-});
-
-const mapDispatchToProps = (dispatch) => ({});
-
-export function ChatLabel({ conversation, bodyshop }) {
+export default function ChatLabel({ conversation }) {
   const [loading, setLoading] = useState(false);
   const [editing, setEditing] = useState(false);
   const [value, setValue] = useState(conversation.label);
-  const { socket } = useContext(SocketContext);
-  const notification = useNotification();
 
   const { t } = useTranslation();
   const [updateLabel] = useMutation(UPDATE_CONVERSATION_LABEL);
@@ -39,14 +26,6 @@ export function ChatLabel({ conversation, bodyshop }) {
           })
         });
       } else {
-        if (socket) {
-          socket.emit("conversation-modified", {
-            type: "label-updated",
-            conversationId: conversation.id,
-            bodyshopId: bodyshop.id,
-            label: value
-          });
-        }
         setEditing(false);
       }
     } catch (error) {
@@ -78,5 +57,3 @@ export function ChatLabel({ conversation, bodyshop }) {
     );
   }
 }
-
-export default connect(mapStateToProps, mapDispatchToProps)(ChatLabel);

client/src/components/chat-messages-list/chat-message-list.component.jsx

@@ -1,85 +1,89 @@
-import React, { useCallback, useEffect, useRef, useState } from "react";
+import Icon from "@ant-design/icons";
+import { Tooltip } from "antd";
+import i18n from "i18next";
+import dayjs from "../../utils/day";
+import React, { useRef, useEffect } from "react";
+import { MdDone, MdDoneAll } from "react-icons/md";
 import { Virtuoso } from "react-virtuoso";
-import { renderMessage } from "./renderMessage";
+import { DateTimeFormatter } from "../../utils/DateFormatter";
 import "./chat-message-list.styles.scss";
 
 export default function ChatMessageListComponent({ messages }) {
   const virtuosoRef = useRef(null);
-  const [atBottom, setAtBottom] = useState(true);
-  const loadedImagesRef = useRef(0);
 
-  const handleScrollStateChange = (isAtBottom) => {
-    setAtBottom(isAtBottom);
-  };
+  // Scroll to the bottom after a short delay when the component mounts
+  useEffect(() => {
+    const timer = setTimeout(() => {
+      if (virtuosoRef.current) {
+        virtuosoRef.current.scrollToIndex({
+          index: messages.length - 1,
+          behavior: "auto" // Instantly scroll to the bottom
+        });
+      }
+    }, 100); // Delay of 100ms to allow rendering
+    return () => clearTimeout(timer); // Cleanup the timer on unmount
+  }, [messages.length]); // Run only once on component mount
 
-  const resetImageLoadState = () => {
-    loadedImagesRef.current = 0;
-  };
-
-  const preloadImages = useCallback((imagePaths, onComplete) => {
-    resetImageLoadState();
-
-    if (imagePaths.length === 0) {
-      onComplete();
-      return;
+  // Scroll to the bottom after the new messages are rendered
+  useEffect(() => {
+    if (virtuosoRef.current) {
+      // Allow the DOM and Virtuoso to fully render the new data
+      setTimeout(() => {
+        virtuosoRef.current.scrollToIndex({
+          index: messages.length - 1,
+          align: "end", // Ensure the last message is fully visible
+          behavior: "smooth" // Smooth scrolling
+        });
+      }, 50); // Slight delay to ensure layout recalculates
     }
+  }, [messages]); // Triggered when new messages are added
 
-    imagePaths.forEach((url) => {
-      const img = new Image();
-      img.src = url;
-      img.onload = img.onerror = () => {
-        loadedImagesRef.current += 1;
-        if (loadedImagesRef.current === imagePaths.length) {
-          onComplete();
-        }
-      };
-    });
-  }, []);
-
-  // Ensure all images are loaded on initial render
-  useEffect(() => {
-    const imagePaths = messages
-      .filter((message) => message.image && message.image_path?.length > 0)
-      .flatMap((message) => message.image_path);
-
-    preloadImages(imagePaths, () => {
-      if (virtuosoRef.current) {
-        virtuosoRef.current.scrollToIndex({
-          index: messages.length - 1,
-          align: "end",
-          behavior: "auto"
-        });
-      }
-    });
-  }, [messages, preloadImages]);
-
-  // Handle scrolling when new messages are added
-  useEffect(() => {
-    if (!atBottom) return;
-
-    const latestMessage = messages[messages.length - 1];
-    const imagePaths = latestMessage?.image_path || [];
-
-    preloadImages(imagePaths, () => {
-      if (virtuosoRef.current) {
-        virtuosoRef.current.scrollToIndex({
-          index: messages.length - 1,
-          align: "end",
-          behavior: "smooth"
-        });
-      }
-    });
-  }, [messages, atBottom, preloadImages]);
+  const renderMessage = (index) => {
+    const message = messages[index];
+    return (
+      <div key={index} className={`${message.isoutbound ? "mine messages" : "yours messages"}`}>
+        <div className="message msgmargin">
+          <Tooltip title={DateTimeFormatter({ children: message.created_at })}>
+            <div>
+              {message.image_path &&
+                message.image_path.map((i, idx) => (
+                  <div key={idx} style={{ display: "flex", justifyContent: "center" }}>
+                    <a href={i} target="__blank" rel="noopener noreferrer">
+                      <img alt="Received" className="message-img" src={i} />
+                    </a>
+                  </div>
+                ))}
+              <div>{message.text}</div>
+            </div>
+          </Tooltip>
+          {message.status && (
+            <div className="message-status">
+              <Icon
+                component={message.status === "sent" ? MdDone : message.status === "delivered" ? MdDoneAll : null}
+                className="message-icon"
+              />
+            </div>
+          )}
+        </div>
+        {message.isoutbound && (
+          <div style={{ fontSize: 10 }}>
+            {i18n.t("messaging.labels.sentby", {
+              by: message.userid,
+              time: dayjs(message.created_at).format("MM/DD/YYYY @ hh:mm a")
+            })}
+          </div>
+        )}
+      </div>
+    );
+  };
 
   return (
     <div className="chat">
       <Virtuoso
         ref={virtuosoRef}
         data={messages}
-        overscan={!!messages.reduce((acc, message) => acc + (message.image_path?.length || 0), 0) ? messages.length : 0}
-        itemContent={(index) => renderMessage(messages, index)}
-        followOutput={(isAtBottom) => handleScrollStateChange(isAtBottom)}
-        initialTopMostItemIndex={messages.length - 1}
+        itemContent={(index) => renderMessage(index)}
+        followOutput="smooth" // Ensure smooth scrolling when new data is appended
         style={{ height: "100%", width: "100%" }}
       />
     </div>

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

@@ -1,131 +1,110 @@
+.message-icon {
+  color: whitesmoke;
+  border: #000000;
+  position: absolute;
+  margin: 0 0.1rem;
+  bottom: 0.1rem;
+  right: 0.3rem;
+  z-index: 5;
+}
+
 .chat {
+  flex: 1;
   display: flex;
   flex-direction: column;
-  height: 100%;
-  width: 100%;
-}
-.archive-button {
-  height: 20px;
-  border-radius: 4px;
-}
-.chat-title {
-  margin-bottom: 5px;
+  margin: 0.8rem 0rem;
+  overflow: hidden; // Ensure the content scrolls correctly
 }
+
 .messages {
   display: flex;
   flex-direction: column;
-  padding: 0.5rem; // Prevent edge clipping
+  padding: 0.5rem; // Add padding to avoid edge clipping
 }
 
 .message {
-  position: relative;
   border-radius: 20px;
   padding: 0.25rem 0.8rem;
-  word-wrap: break-word;
 
-  &-img {
+  .message-img {
     max-width: 10rem;
     max-height: 10rem;
     object-fit: contain;
     margin: 0.2rem;
-    border-radius: 4px;
   }
+}
 
-  &-images {
-    display: flex;
-    flex-wrap: wrap;
-    gap: 8px;
-  }
-}
-.chat-send-message-button{
-  margin: 0.3rem;
-  padding-left: 0.5rem;
-  
-}
-.message-icon {
-  position: absolute;
-  bottom: 0.1rem;
-  right: 0.3rem;
-  margin: 0 0.1rem;
-  color: whitesmoke;
-  z-index: 5;
+.yours {
+  align-items: flex-start;
 }
 
 .msgmargin {
-  margin: 0.1rem 0;
+  margin-top: 0.1rem;
+  margin-bottom: 0.1rem;
 }
 
-.yours,
-.mine {
-  display: flex;
-  flex-direction: column;
-
-  .message {
-    position: relative;
-
-    &:last-child:before,
-    &:last-child:after {
-      content: "";
-      position: absolute;
-      bottom: 0;
-      height: 20px;
-      width: 20px;
-      z-index: 0;
-    }
-
-    &:last-child:after {
-      width: 10px;
-      background: white;
-      z-index: 1;
-    }
-  }
+.yours .message {
+  margin-right: 20%;
+  background-color: #eee;
+  position: relative;
 }
 
-/* "Yours" (incoming) message styles */
-.yours {
-  align-items: flex-start;
-
-  .message {
-    margin-right: 20%;
-    background-color: #eee;
-
-    &:last-child:before {
-      left: -7px;
-      background: #eee;
-      border-bottom-right-radius: 15px;
-    }
-
-    &:last-child:after {
-      left: -10px;
-      border-bottom-right-radius: 10px;
-    }
-  }
+.yours .message:last-child:before {
+  content: "";
+  position: absolute;
+  z-index: 0;
+  bottom: 0;
+  left: -7px;
+  height: 20px;
+  width: 20px;
+  background: #eee;
+  border-bottom-right-radius: 15px;
+}
+
+.yours .message:last-child:after {
+  content: "";
+  position: absolute;
+  z-index: 1;
+  bottom: 0;
+  left: -10px;
+  width: 10px;
+  height: 20px;
+  background: white;
+  border-bottom-right-radius: 10px;
 }
 
-/* "Mine" (outgoing) message styles */
 .mine {
   align-items: flex-end;
-
-  .message {
-    color: white;
-    margin-left: 25%;
-    background: linear-gradient(to bottom, #00d0ea 0%, #0085d1 100%);
-    padding-bottom: 0.6rem;
-
-    &:last-child:before {
-      right: -8px;
-      background: linear-gradient(to bottom, #00d0ea 0%, #0085d1 100%);
-      border-bottom-left-radius: 15px;
-    }
-
-    &:last-child:after {
-      right: -10px;
-      border-bottom-left-radius: 10px;
-    }
-  }
 }
 
-.virtuoso-container {
-  flex: 1;
-  overflow: auto;
+.mine .message {
+  color: white;
+  margin-left: 25%;
+  background: linear-gradient(to bottom, #00d0ea 0%, #0085d1 100%);
+  position: relative;
+  padding-bottom: 0.6rem;
+}
+
+.mine .message:last-child:before {
+  content: "";
+  position: absolute;
+  z-index: 0;
+  bottom: 0;
+  right: -8px;
+  height: 20px;
+  width: 20px;
+  background: linear-gradient(to bottom, #00d0ea 0%, #0085d1 100%);
+  border-bottom-left-radius: 15px;
+}
+
+.mine .message:last-child:after {
+  content: "";
+  position: absolute;
+  z-index: 1;
+  bottom: 0;
+  right: -10px;
+  width: 10px;
+  height: 20px;
+  background: white;
+  border-bottom-left-radius: 10px;
 }

client/src/components/chat-messages-list/renderMessage.jsx

@@ -1,52 +0,0 @@
-import Icon from "@ant-design/icons";
-import { Tooltip } from "antd";
-import i18n from "i18next";
-import dayjs from "../../utils/day";
-import { MdDone, MdDoneAll } from "react-icons/md";
-import { DateTimeFormatter } from "../../utils/DateFormatter";
-
-export const renderMessage = (messages, index) => {
-  const message = messages[index];
-
-  return (
-    <div key={index} className={`${message.isoutbound ? "mine messages" : "yours messages"}`}>
-      <div className="message msgmargin">
-        <Tooltip title={DateTimeFormatter({ children: message.created_at })}>
-          <div>
-            {/* Render images if available */}
-            {message.image && message.image_path?.length > 0 && (
-              <div className="message-images">
-                {message.image_path.map((url, idx) => (
-                  <div key={idx} style={{ display: "flex", justifyContent: "center" }}>
-                    <a href={url} target="_blank" rel="noopener noreferrer">
-                      <img alt="Received" className="message-img" src={url} />
-                    </a>
-                  </div>
-                ))}
-              </div>
-            )}
-            {/* Render text if available */}
-            {message.text && <div>{message.text}</div>}
-          </div>
-        </Tooltip>
-
-        {/* Message status icons */}
-        {message.status && (message.status === "sent" || message.status === "delivered") && (
-          <div className="message-status">
-            <Icon component={message.status === "sent" ? MdDone : MdDoneAll} className="message-icon" />
-          </div>
-        )}
-      </div>
-
-      {/* Outbound message metadata */}
-      {message.isoutbound && (
-        <div style={{ fontSize: 10 }}>
-          {i18n.t("messaging.labels.sentby", {
-            by: message.userid,
-            time: dayjs(message.created_at).format("MM/DD/YYYY @ hh:mm a")
-          })}
-        </div>
-      )}
-    </div>
-  );
-};

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

@@ -1,12 +1,11 @@
 import { PlusCircleFilled } from "@ant-design/icons";
 import { Button, Form, Popover } from "antd";
-import React, { useContext } from "react";
+import React 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 SocketContext from "../../contexts/SocketIO/socketContext.jsx";
 
 const mapStateToProps = createStructuredSelector({
   //currentUser: selectCurrentUser
@@ -18,10 +17,8 @@ const mapDispatchToProps = (dispatch) => ({
 export function ChatNewConversation({ openChatByPhone }) {
   const { t } = useTranslation();
   const [form] = Form.useForm();
-  const { socket } = useContext(SocketContext);
-
   const handleFinish = (values) => {
-    openChatByPhone({ phone_num: values.phoneNumber, socket });
+    openChatByPhone({ phone_num: values.phoneNumber });
     form.resetFields();
   };
 

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

@@ -1,5 +1,6 @@
+import { notification } from "antd";
 import parsePhoneNumber from "libphonenumber-js";
-import React, { useContext } from "react";
+import React from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { openChatByPhone } from "../../redux/messaging/messaging.actions";
@@ -8,8 +9,6 @@ import PhoneNumberFormatter from "../../utils/PhoneFormatter";
 import { createStructuredSelector } from "reselect";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import { searchingForConversation } from "../../redux/messaging/messaging.selectors";
-import SocketContext from "../../contexts/SocketIO/socketContext.jsx";
-import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -22,9 +21,6 @@ const mapDispatchToProps = (dispatch) => ({
 
 export function ChatOpenButton({ bodyshop, searchingForConversation, phone, jobid, openChatByPhone }) {
   const { t } = useTranslation();
-  const { socket } = useContext(SocketContext);
-  const notification = useNotification();
-
   if (!phone) return <></>;
 
   if (!bodyshop.messagingservicesid) return <PhoneNumberFormatter>{phone}</PhoneNumberFormatter>;
@@ -37,7 +33,7 @@ export function ChatOpenButton({ bodyshop, searchingForConversation, phone, jobi
         const p = parsePhoneNumber(phone, "CA");
         if (searchingForConversation) return; //This is to prevent finding the same thing twice.
         if (p && p.isValid()) {
-          openChatByPhone({ phone_num: p.formatInternational(), jobid: jobid, socket });
+          openChatByPhone({ phone_num: p.formatInternational(), jobid: jobid });
         } else {
           notification["error"]({ message: t("messaging.error.invalidphone") });
         }

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

@@ -1,114 +1,59 @@
-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 React, { useContext, useEffect, useState } from "react";
+import { InfoCircleOutlined, MessageOutlined, ShrinkOutlined } from "@ant-design/icons";
+import { Badge, Card, Col, Row, Space, Tooltip, Typography } from "antd";
+import React, { useCallback, useContext, useEffect } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
-import { CONVERSATION_LIST_QUERY, UNREAD_CONVERSATION_COUNT } from "../../graphql/conversations.queries";
 import { toggleChatVisible } from "../../redux/messaging/messaging.actions";
-import { selectChatVisible, selectSelectedConversation } from "../../redux/messaging/messaging.selectors";
+import {
+  selectChatVisible,
+  selectConversations,
+  selectSelectedConversation,
+  selectUnreadCount
+} from "../../redux/messaging/messaging.selectors";
 import ChatConversationListComponent from "../chat-conversation-list/chat-conversation-list.component";
 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 "./chat-popup.styles.scss";
-import SocketContext from "../../contexts/SocketIO/socketContext.jsx";
+import { selectBodyshop } from "../../redux/user/user.selectors";
+import SocketContext from "../../contexts/SocketIO/socketContext";
 
 const mapStateToProps = createStructuredSelector({
   selectedConversation: selectSelectedConversation,
-  chatVisible: selectChatVisible
+  chatVisible: selectChatVisible,
+  bodyshop: selectBodyshop,
+  conversations: selectConversations,
+  unreadCount: selectUnreadCount
 });
-
 const mapDispatchToProps = (dispatch) => ({
   toggleChatVisible: () => dispatch(toggleChatVisible())
 });
 
-export function ChatPopupComponent({ chatVisible, selectedConversation, toggleChatVisible }) {
+export function ChatPopupComponent({
+  chatVisible,
+  selectedConversation,
+  toggleChatVisible,
+  bodyshop,
+  conversations,
+  unreadCount
+}) {
   const { t } = useTranslation();
-  const [pollInterval, setPollInterval] = useState(0);
   const { socket } = useContext(SocketContext);
-  const client = useApolloClient(); // Apollo Client instance for cache operations
 
-  // Lazy query for conversations
-  const [getConversations, { loading, data, refetch }] = useLazyQuery(CONVERSATION_LIST_QUERY, {
-    fetchPolicy: "network-only",
-    nextFetchPolicy: "network-only",
-    skip: !chatVisible,
-    ...(pollInterval > 0 ? { pollInterval } : {})
-  });
-
-  // Query for unread count when chat is not visible
-  const { data: unreadData } = useQuery(UNREAD_CONVERSATION_COUNT, {
-    fetchPolicy: "network-only",
-    nextFetchPolicy: "network-only",
-    skip: chatVisible, // Skip when chat is visible
-    ...(pollInterval > 0 ? { pollInterval } : {})
-  });
-
-  // Socket connection status
+  // Emit event to open messaging when chat becomes visible
   useEffect(() => {
-    const handleSocketStatus = () => {
-      if (socket?.connected) {
-        setPollInterval(15 * 60 * 1000); // 15 minutes
-      } else {
-        setPollInterval(60 * 1000); // 60 seconds
-      }
-    };
-
-    handleSocketStatus();
+    if (chatVisible && socket && bodyshop?.id) {
+      socket.emit("open-messaging", bodyshop.id);
+    }
+  }, [chatVisible, socket, bodyshop?.id]);
 
+  // Handle loading more conversations
+  const loadMoreConversations = useCallback(() => {
     if (socket) {
-      socket.on("connect", handleSocketStatus);
-      socket.on("disconnect", handleSocketStatus);
+      socket.emit("load-more-conversations", { offset: conversations.length });
     }
-
-    return () => {
-      if (socket) {
-        socket.off("connect", handleSocketStatus);
-        socket.off("disconnect", handleSocketStatus);
-      }
-    };
-  }, [socket]);
-
-  // Fetch conversations when chat becomes visible
-  useEffect(() => {
-    if (chatVisible)
-      getConversations({
-        variables: {
-          offset: 0
-        }
-      }).catch((err) => {
-        console.error(`Error fetching conversations: ${(err, err.message || "")}`);
-      });
-  }, [chatVisible, getConversations]);
-
-  // Get unread count from the cache
-  const unreadCount = (() => {
-    if (chatVisible) {
-      try {
-        const cachedData = client.readQuery({
-          query: CONVERSATION_LIST_QUERY,
-          variables: { offset: 0 }
-        });
-
-        if (!cachedData?.conversations) return 0;
-
-        // Aggregate unread message count
-        return cachedData.conversations.reduce((total, conversation) => {
-          const unread = conversation.messages_aggregate?.aggregate?.count || 0;
-          return total + unread;
-        }, 0);
-      } catch (error) {
-        console.warn("Unread count not found in cache:", error);
-        return 0; // Fallback if not in cache
-      }
-    } else if (unreadData?.messages_aggregate?.aggregate?.count) {
-      // Use the unread count from the query result
-      return unreadData.messages_aggregate.aggregate.count;
-    }
-    return 0;
-  })();
+  }, [socket, conversations.length]);
 
   return (
     <Badge count={unreadCount}>
@@ -121,20 +66,21 @@ export function ChatPopupComponent({ chatVisible, selectedConversation, toggleCh
               <Tooltip title={t("messaging.labels.recentonly")}>
                 <InfoCircleOutlined />
               </Tooltip>
-              <SyncOutlined style={{ cursor: "pointer" }} onClick={() => refetch()} />
-              {!socket?.connected && <Tag color="yellow">{t("messaging.labels.nopush")}</Tag>}
+              <ShrinkOutlined
+                onClick={() => toggleChatVisible()}
+                style={{ position: "absolute", right: ".5rem", top: ".5rem" }}
+              />
             </Space>
-            <ShrinkOutlined
-              onClick={() => toggleChatVisible()}
-              style={{ position: "absolute", right: ".5rem", top: ".5rem" }}
-            />
 
             <Row gutter={[8, 8]} className="chat-popup-content">
               <Col span={8}>
-                {loading ? (
+                {conversations && conversations.length === 0 ? (
                   <LoadingSpinner />
                 ) : (
-                  <ChatConversationListComponent conversationList={data ? data.conversations : []} />
+                  <ChatConversationListComponent
+                    conversationList={conversations.conversations}
+                    loadMoreConversations={loadMoreConversations}
+                  />
                 )}
               </Col>
               <Col span={16}>{selectedConversation ? <ChatConversationContainer /> : null}</Col>

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

@@ -6,7 +6,6 @@ import { createStructuredSelector } from "reselect";
 import { setEmailOptions } from "../../redux/email/email.actions";
 import { GenerateDocument } from "../../utils/RenderTemplate";
 import { TemplateList } from "../../utils/TemplateConstants";
-import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
 
 const mapStateToProps = createStructuredSelector({});
 
@@ -16,7 +15,6 @@ const mapDispatchToProps = (dispatch) => ({
 
 export function ChatPrintButton({ conversation }) {
   const [loading, setLoading] = useState(false);
-  const notification = useNotification();
 
   const generateDocument = (type) => {
     setLoading(true);
@@ -29,8 +27,7 @@ export function ChatPrintButton({ conversation }) {
         subject: TemplateList("messaging").conversation_list.subject
       },
       type,
-      conversation.id,
-      notification
+      conversation.id
     ).catch((e) => {
       console.warn("Something went wrong generating a document.");
     });

client/src/components/chat-send-message/chat-send-message.component.jsx

@@ -1,44 +1,47 @@
 import { LoadingOutlined, SendOutlined } from "@ant-design/icons";
 import { Input, Spin } from "antd";
-import React, { useEffect, useRef, useState } from "react";
+import React, { useContext, useEffect, useRef, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { logImEXEvent } from "../../firebase/firebase.utils";
-import { sendMessage, setMessage } from "../../redux/messaging/messaging.actions";
+import { setMessage } from "../../redux/messaging/messaging.actions";
 import { selectIsSending, selectMessage } from "../../redux/messaging/messaging.selectors";
-import { selectBodyshop } from "../../redux/user/user.selectors";
+import { selectBodyshop, selectCurrentUser } from "../../redux/user/user.selectors";
 import ChatMediaSelector from "../chat-media-selector/chat-media-selector.component";
 import ChatPresetsComponent from "../chat-presets/chat-presets.component";
+import SocketContext from "../../contexts/SocketIO/socketContext.jsx";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
   isSending: selectIsSending,
-  message: selectMessage
+  message: selectMessage,
+  user: selectCurrentUser
 });
 
 const mapDispatchToProps = (dispatch) => ({
-  sendMessage: (message) => dispatch(sendMessage(message)),
   setMessage: (message) => dispatch(setMessage(message))
 });
 
-function ChatSendMessageComponent({ conversation, bodyshop, sendMessage, isSending, message, setMessage }) {
+function ChatSendMessageComponent({ conversation, bodyshop, isSending, message, setMessage, user }) {
+  const { socket } = useContext(SocketContext); // Access WebSocket instance
   const inputArea = useRef(null);
   const [selectedMedia, setSelectedMedia] = useState([]);
+  const { t } = useTranslation();
 
   useEffect(() => {
     inputArea.current.focus();
   }, [isSending, setMessage]);
 
-  const { t } = useTranslation();
-
   const handleEnter = () => {
     const selectedImages = selectedMedia.filter((i) => i.isSelected);
     if ((message === "" || !message) && selectedImages.length === 0) return;
+
     logImEXEvent("messaging_send_message");
 
     if (selectedImages.length < 11) {
-      const newMessage = {
+      const messageData = {
+        user,
         to: conversation.phone_num,
         body: message || "",
         messagingServiceSid: bodyshop.messagingservicesid,
@@ -46,12 +49,18 @@ function ChatSendMessageComponent({ conversation, bodyshop, sendMessage, isSendi
         selectedMedia: selectedImages,
         imexshopid: bodyshop.imexshopid
       };
-      sendMessage(newMessage);
+
+      // Emit the send-message event via WebSocket
+      socket.emit("send-message", messageData);
+
       setSelectedMedia(
         selectedMedia.map((i) => {
           return { ...i, isSelected: false };
         })
       );
+
+      // Optionally clear the input message
+      setMessage("");
     }
   };
 
@@ -76,15 +85,11 @@ function ChatSendMessageComponent({ conversation, bodyshop, sendMessage, isSendi
           onChange={(e) => setMessage(e.target.value)}
           onPressEnter={(event) => {
             event.preventDefault();
-            if (!!!event.shiftKey) handleEnter();
+            if (!event.shiftKey) handleEnter();
           }}
         />
       </span>
-      <SendOutlined
-        className="chat-send-message-button"
-        //  disabled={message === "" || !message}
-        onClick={handleEnter}
-      />
+      <SendOutlined className="imex-flex-row__margin" onClick={handleEnter} />
       <Spin
         style={{ display: `${isSending ? "" : "none"}` }}
         indicator={

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

@@ -2,33 +2,22 @@ import { PlusOutlined } from "@ant-design/icons";
 import { useLazyQuery, useMutation } from "@apollo/client";
 import { Tag } from "antd";
 import _ from "lodash";
-import React, { useContext, useState } from "react";
+import React, { 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 SocketContext from "../../contexts/SocketIO/socketContext.jsx";
-import { createStructuredSelector } from "reselect";
-import { selectBodyshop } from "../../redux/user/user.selectors.js";
-import { connect } from "react-redux";
 
-const mapStateToProps = createStructuredSelector({
-  bodyshop: selectBodyshop
-});
-
-const mapDispatchToProps = () => ({});
-
-export function ChatTagRoContainer({ conversation, bodyshop }) {
+export default function ChatTagRoContainer({ conversation }) {
   const { t } = useTranslation();
   const [open, setOpen] = useState(false);
-  const { socket } = useContext(SocketContext);
 
   const [loadRo, { loading, data }] = useLazyQuery(SEARCH_FOR_JOBS);
 
   const executeSearch = (v) => {
     logImEXEvent("messaging_search_job_tag", { searchTerm: v });
-    loadRo(v).catch((e) => console.error("Error in ChatTagRoContainer executeSearch:", e));
+    loadRo(v);
   };
 
   const debouncedExecuteSearch = _.debounce(executeSearch, 500);
@@ -41,40 +30,9 @@ export function ChatTagRoContainer({ conversation, bodyshop }) {
     variables: { conversationId: conversation.id }
   });
 
-  const handleInsertTag = async (value, option) => {
+  const handleInsertTag = (value, option) => {
     logImEXEvent("messaging_add_job_tag");
-
-    await insertTag({
-      variables: { jobId: option.key }
-    });
-
-    if (socket) {
-      // Find the job details from the search data
-      const selectedJob = data?.search_jobs.find((job) => job.id === option.key);
-      if (!selectedJob) return;
-      socket.emit("conversation-modified", {
-        conversationId: conversation.id,
-        bodyshopId: bodyshop.id,
-        type: "tag-added",
-        selectedJob,
-        job_conversations: [
-          {
-            __typename: "job_conversations",
-            jobid: selectedJob.id,
-            conversationid: conversation.id,
-            job: {
-              __typename: "jobs",
-              id: selectedJob.id,
-              ro_number: selectedJob.ro_number,
-              ownr_co_nm: selectedJob.ownr_co_nm,
-              ownr_fn: selectedJob.ownr_fn,
-              ownr_ln: selectedJob.ownr_ln
-            }
-          }
-        ]
-      });
-    }
-
+    insertTag({ variables: { jobId: option.key } });
     setOpen(false);
   };
 
@@ -92,10 +50,9 @@ export function ChatTagRoContainer({ conversation, bodyshop }) {
           handleSearch={handleSearch}
           handleInsertTag={handleInsertTag}
           setOpen={setOpen}
-          style={{ cursor: "pointer" }}
         />
       ) : (
-        <Tag style={{ cursor: "pointer" }} onClick={() => setOpen(true)}>
+        <Tag onClick={() => setOpen(true)}>
           <PlusOutlined />
           {t("messaging.actions.link")}
         </Tag>
@@ -103,5 +60,3 @@ export function ChatTagRoContainer({ conversation, bodyshop }) {
     </div>
   );
 }
-
-export default connect(mapStateToProps, mapDispatchToProps)(ChatTagRoContainer);

client/src/components/conflict/conflict.component.jsx

@@ -16,7 +16,8 @@ export default function ConflictComponent() {
               {t("general.labels.instanceconflictext", {
                 app: InstanceRenderManager({
                   imex: "$t(titles.imexonline)",
-                  rome: "$t(titles.romeonline)"
+                  rome: "$t(titles.romeonline)",
+                  promanager: "$t(titles.promanager)"
                 })
               })}
             </div>

client/src/components/contract-convert-to-ro/contract-convert-to-ro.component.jsx

@@ -1,5 +1,5 @@
 import { useMutation } from "@apollo/client";
-import { Button, Form, InputNumber, Popover, Radio, Select, Space } from "antd";
+import { Button, Form, InputNumber, notification, Popover, Radio, Select, Space } from "antd";
 import axios from "axios";
 import dayjs from "../../utils/day";
 import React, { useState } from "react";
@@ -9,7 +9,6 @@ import { useNavigate } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
 import { INSERT_NEW_JOB } from "../../graphql/jobs.queries";
 import { selectBodyshop, selectCurrentUser } from "../../redux/user/user.selectors";
-import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
 
 const mapStateToProps = createStructuredSelector({
   //currentUser: selectCurrentUser
@@ -26,7 +25,6 @@ export function ContractConvertToRo({ bodyshop, currentUser, contract, disabled
   const [loading, setLoading] = useState(false);
   const [insertJob] = useMutation(INSERT_NEW_JOB);
   const history = useNavigate();
-  const notification = useNotification();
 
   const handleFinish = async (values) => {
     setLoading(true);

client/src/components/contract-form/contract-form-job-prefill.component.jsx

@@ -1,14 +1,12 @@
 import { useLazyQuery } from "@apollo/client";
-import { Button } from "antd";
+import { Button, notification } from "antd";
 import React, { useEffect } from "react";
 import { useTranslation } from "react-i18next";
 import { GET_JOB_FOR_CC_CONTRACT } from "../../graphql/jobs.queries";
-import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
 
 export default function ContractCreateJobPrefillComponent({ jobId, form }) {
   const [call, { loading, error, data }] = useLazyQuery(GET_JOB_FOR_CC_CONTRACT);
   const { t } = useTranslation();
-  const notification = useNotification();
 
   const handleClick = () => {
     call({ variables: { id: jobId } });

client/src/components/courtesy-car-return-modal/courtesy-car-return-modal.container.jsx

@@ -1,4 +1,4 @@
-import { Form, Modal } from "antd";
+import { Form, Modal, notification } from "antd";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -10,7 +10,6 @@ import CourtesyCarReturnModalComponent from "./courtesy-car-return-modal.compone
 import dayjs from "../../utils/day";
 import { RETURN_CONTRACT } from "../../graphql/cccontracts.queries";
 import { useMutation } from "@apollo/client";
-import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
 
 const mapStateToProps = createStructuredSelector({
   courtesyCarReturnModal: selectCourtesyCarReturn,
@@ -27,8 +26,6 @@ export function CCReturnModalContainer({ courtesyCarReturnModal, toggleModalVisi
   const { t } = useTranslation();
   const [form] = Form.useForm();
   const [updateContract] = useMutation(RETURN_CONTRACT);
-  const notification = useNotification();
-
   const handleFinish = (values) => {
     setLoading(true);
     updateContract({

client/src/components/courtesy-cars-list/courtesy-cars-list.component.jsx

@@ -10,7 +10,6 @@ import { TemplateList } from "../../utils/TemplateConstants";
 import { alphaSort } from "../../utils/sorters";
 import useLocalStorage from "../../utils/useLocalStorage";
 import { OwnerNameDisplayFunction } from "../owner-name-display/owner-name-display.component";
-import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
 
 export default function CourtesyCarsList({ loading, courtesycars, refetch }) {
   const [state, setState] = useState({
@@ -19,7 +18,6 @@ export default function CourtesyCarsList({ loading, courtesycars, refetch }) {
   const [searchText, setSearchText] = useState("");
   const [filter, setFilter] = useLocalStorage("filter_courtesy_cars_list", null);
   const { t } = useTranslation();
-  const notification = useNotification();
 
   const columns = [
     {
@@ -66,8 +64,8 @@ export default function CourtesyCarsList({ loading, courtesycars, refetch }) {
         },
         {
           text: t("courtesycars.status.unavailable"),
-          value: "courtesycars.status.unavailable"
-        }
+          value: "courtesycars.status.unavailable",
+        },
       ],
       onFilter: (value, record) => record.status === value,
       sortOrder: state.sortedInfo.columnKey === "status" && state.sortedInfo.order,
@@ -241,9 +239,7 @@ export default function CourtesyCarsList({ loading, courtesycars, refetch }) {
             }
           },
           {},
-          "p",
-          null,
-          notification
+          "p"
         )
     }
   ];

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

@@ -1,6 +1,6 @@
 import Icon, { SyncOutlined } from "@ant-design/icons";
 import { gql, useMutation, useQuery } from "@apollo/client";
-import { Button, Dropdown, Space } from "antd";
+import { Button, Dropdown, notification, Space } from "antd";
 import { PageHeader } from "@ant-design/pro-layout";
 import i18next from "i18next";
 import _ from "lodash";
@@ -46,7 +46,6 @@ import JobLifecycleDashboardComponent, {
 } from "../dashboard-components/job-lifecycle/job-lifecycle-dashboard.component";
 import "./dashboard-grid.styles.scss";
 import { GenerateDashboardData } from "./dashboard-grid.utils";
-import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
 
 const ResponsiveReactGridLayout = WidthProvider(Responsive);
 
@@ -65,7 +64,6 @@ export function DashboardGridComponent({ currentUser, bodyshop }) {
       ? bodyshop.associations[0].user.dashboardlayout
       : { items: [], layout: {}, layouts: [] })
   });
-  const notification = useNotification();
 
   const { loading, error, data, refetch } = useQuery(createDashboardQuery(state), {
     fetchPolicy: "network-only",

client/src/components/document-editor/document-editor.component.jsx

@@ -9,7 +9,6 @@ import { selectBodyshop, selectCurrentUser } from "../../redux/user/user.selecto
 import { handleUpload } from "../documents-upload/documents-upload.utility";
 import { GenerateSrcUrl } from "../jobs-documents-gallery/job-documents.utility";
 import LoadingSpinner from "../loading-spinner/loading-spinner.component";
-import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
 
 const mapStateToProps = createStructuredSelector({
   currentUser: selectCurrentUser,
@@ -25,7 +24,6 @@ export function DocumentEditorComponent({ currentUser, bodyshop, document }) {
   const [uploaded, setuploaded] = useState(false);
   const markerArea = useRef(null);
   const { t } = useTranslation();
-  const notification = useNotification();
 
   const triggerUpload = useCallback(
     async (dataUrl) => {
@@ -47,11 +45,10 @@ export function DocumentEditorComponent({ currentUser, bodyshop, document }) {
           //billId: billId,
           tagsArray: ["edited"]
           //callback: callbackAfterUpload,
-        },
-        notification
+        }
       );
     },
-    [bodyshop, currentUser, document, notification]
+    [bodyshop, currentUser, document]
   );
 
   useEffect(() => {

client/src/components/documents-local-upload/documents-local-upload.component.jsx

@@ -6,10 +6,6 @@ import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { selectBodyshop, selectCurrentUser } from "../../redux/user/user.selectors";
 import { handleUpload } from "./documents-local-upload.utility";
-import { HasFeatureAccess } from "../feature-wrapper/feature-wrapper.component";
-import LockWrapperComponent from "../lock-wrapper/lock-wrapper.component";
-import { useTranslation } from "react-i18next";
-import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
 
 const mapStateToProps = createStructuredSelector({
   currentUser: selectCurrentUser,
@@ -27,8 +23,6 @@ export function DocumentsLocalUploadComponent({
   allowAllTypes
 }) {
   const [fileList, setFileList] = useState([]);
-  const { t } = useTranslation();
-  const notification = useNotification();
 
   const handleDone = (uid) => {
     setTimeout(() => {
@@ -36,13 +30,10 @@ export function DocumentsLocalUploadComponent({
     }, 2000);
   };
 
-  const hasMediaAccess = HasFeatureAccess({ bodyshop, featureName: "media" });
-
   return (
     <Upload.Dragger
       multiple={true}
       fileList={fileList}
-      disabled={!hasMediaAccess}
       onChange={(f) => {
         if (f.event && f.event.percent === 100) handleDone(f.file.uid);
 
@@ -56,8 +47,7 @@ export function DocumentsLocalUploadComponent({
             vendorid,
             invoice_number,
             callback: callbackAfterUpload
-          },
-          notification
+          }
         })
       }
       {...(!allowAllTypes && {
@@ -69,9 +59,7 @@ export function DocumentsLocalUploadComponent({
           <p className="ant-upload-drag-icon">
             <UploadOutlined />
           </p>
-          <p className="ant-upload-text">
-            <LockWrapperComponent featureName="media">{t("documents.labels.dragtoupload")}</LockWrapperComponent>
-          </p>
+          <p className="ant-upload-text">Click or drag files to this area to upload.</p>
         </>
       )}
     </Upload.Dragger>

client/src/components/documents-local-upload/documents-local-upload.utility.js

@@ -2,9 +2,10 @@ import cleanAxios from "../../utils/CleanAxios";
 import { store } from "../../redux/store";
 import { addMediaForJob } from "../../redux/media/media.actions";
 import normalizeUrl from "normalize-url";
+import { notification } from "antd";
 import i18n from "i18next";
 
-export const handleUpload = async ({ ev, context, notification }) => {
+export const handleUpload = async ({ ev, context }) => {
   const { onError, onSuccess, onProgress, file } = ev;
   const { jobid, invoice_number, vendorid, callbackAfterUpload } = context;
 
@@ -42,15 +43,11 @@ export const handleUpload = async ({ ev, context, notification }) => {
     }
   } else {
     onSuccess && onSuccess(file);
-    if (notification) {
-      notification.open({
-        type: "success",
-        key: "docuploadsuccess",
-        message: i18n.t("documents.successes.insert")
-      });
-    } else {
-      console.error("No notification context found in document local upload utility.");
-    }
+    notification.open({
+      type: "success",
+      key: "docuploadsuccess",
+      message: i18n.t("documents.successes.insert")
+    });
     store.dispatch(
       addMediaForJob({
         jobid,

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

@@ -1,5 +1,5 @@
 import { UploadOutlined } from "@ant-design/icons";
-import { Progress, Result, Space, Upload } from "antd";
+import { notification, Progress, Result, Space, Upload } from "antd";
 import React, { useMemo, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -7,9 +7,6 @@ import { createStructuredSelector } from "reselect";
 import { selectBodyshop, selectCurrentUser } from "../../redux/user/user.selectors";
 import formatBytes from "../../utils/formatbytes";
 import { handleUpload } from "./documents-upload.utility";
-import LockWrapperComponent from "../lock-wrapper/lock-wrapper.component";
-import { HasFeatureAccess } from "../feature-wrapper/feature-wrapper.component";
-import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
 
 const mapStateToProps = createStructuredSelector({
   currentUser: selectCurrentUser,
@@ -29,7 +26,6 @@ export function DocumentsUploadComponent({
 }) {
   const { t } = useTranslation();
   const [fileList, setFileList] = useState([]);
-  const notification = useNotification();
 
   const pct = useMemo(() => {
     return parseInt((totalSize / ((bodyshop && bodyshop.jobsizelimit) || 1)) * 100);
@@ -49,13 +45,11 @@ export function DocumentsUploadComponent({
       setFileList((fileList) => fileList.filter((x) => x.uid !== uid));
     }, 2000);
   };
-  const hasMediaAccess = HasFeatureAccess({ bodyshop, featureName: "media" });
 
   return (
     <Upload.Dragger
       multiple={true}
       fileList={fileList}
-      disabled={!hasMediaAccess}
       onChange={(f) => {
         if (f.event && f.event.percent === 100) handleDone(f.file.uid);
         setFileList(f.fileList);
@@ -78,18 +72,14 @@ export function DocumentsUploadComponent({
         return true;
       }}
       customRequest={(ev) =>
-        handleUpload(
-          ev,
-          {
-            bodyshop: bodyshop,
-            uploaded_by: currentUser.email,
-            jobId: jobId,
-            billId: billId,
-            tagsArray: tagsArray,
-            callback: callbackAfterUpload
-          },
-          notification
-        )
+        handleUpload(ev, {
+          bodyshop: bodyshop,
+          uploaded_by: currentUser.email,
+          jobId: jobId,
+          billId: billId,
+          tagsArray: tagsArray,
+          callback: callbackAfterUpload
+        })
       }
       accept="audio/*, video/*, image/*, .pdf, .doc, .docx, .xls, .xlsx"
       // showUploadList={false}
@@ -99,9 +89,7 @@ export function DocumentsUploadComponent({
           <p className="ant-upload-drag-icon">
             <UploadOutlined />
           </p>
-          <p className="ant-upload-text">
-            <LockWrapperComponent featureName="media">{t("documents.labels.dragtoupload")}</LockWrapperComponent>
-          </p>
+          <p className="ant-upload-text">Click or drag files to this area to upload.</p>
           {!ignoreSizeLimit && (
             <Space wrap className="ant-upload-text">
               <Progress type="dashboard" percent={pct} size="small" />

client/src/components/documents-upload/documents-upload.utility.js

@@ -1,3 +1,4 @@
+import { notification } from "antd";
 import axios from "axios";
 import i18n from "i18next";
 import { logImEXEvent } from "../../firebase/firebase.utils";
@@ -13,7 +14,7 @@ import { store } from "../../redux/store";
 var cleanAxios = axios.create();
 cleanAxios.interceptors.request.eject(axiosAuthInterceptorId);
 
-export const handleUpload = (ev, context, notification) => {
+export const handleUpload = (ev, context) => {
   logImEXEvent("document_upload", { filetype: ev.file.type });
 
   const { onError, onSuccess, onProgress } = ev;
@@ -23,20 +24,10 @@ export const handleUpload = (ev, context, notification) => {
 
   let key = `${bodyshop.id}/${jobId}/${replaceAccents(fileName).replace(/[^A-Z0-9]+/gi, "_")}-${new Date().getTime()}`;
   let extension = fileName.split(".").pop();
-  uploadToCloudinary(key, extension, ev.file.type, ev.file, onError, onSuccess, onProgress, context, notification);
+  uploadToCloudinary(key, extension, ev.file.type, ev.file, onError, onSuccess, onProgress, context);
 };
 
-export const uploadToCloudinary = async (
-  key,
-  extension,
-  fileType,
-  file,
-  onError,
-  onSuccess,
-  onProgress,
-  context,
-  notification
-) => {
+export const uploadToCloudinary = async (key, extension, fileType, file, onError, onSuccess, onProgress, context) => {
   const { bodyshop, jobId, billId, uploaded_by, callback, tagsArray } = context;
 
   //Set variables for getting the signed URL.

client/src/components/email-overlay/email-overlay.container.jsx

@@ -1,4 +1,4 @@
-import { Button, Divider, Form, Modal, Space } from "antd";
+import { Button, Divider, Form, Modal, notification, Space } from "antd";
 import axios from "axios";
 import React, { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
@@ -13,7 +13,6 @@ import { EmailSettings } from "../../utils/TemplateConstants";
 import LoadingSkeleton from "../loading-skeleton/loading-skeleton.component";
 import LoadingSpinner from "../loading-spinner/loading-spinner.component";
 import EmailOverlayComponent from "./email-overlay.component";
-import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
 
 const mapStateToProps = createStructuredSelector({
   modalVisible: selectEmailVisible,
@@ -37,7 +36,6 @@ export function EmailOverlayContainer({ emailConfig, modalVisible, toggleEmailOv
     pdf: null
   });
   const [selectedMedia, setSelectedMedia] = useState([]);
-  const notification = useNotification();
 
   const defaultEmailFrom = {
     from: {
@@ -111,14 +109,7 @@ export function EmailOverlayContainer({ emailConfig, modalVisible, toggleEmailOv
   const render = async () => {
     logImEXEvent("email_render_template", { template: emailConfig.template });
     setLoading(true);
-    let { html, pdf, filename } = await RenderTemplate(
-      emailConfig.template,
-      bodyshop,
-      true,
-      false,
-      false,
-      notification
-    );
+    let { html, pdf, filename } = await RenderTemplate(emailConfig.template, bodyshop, true);
 
     const response = await axios.post("/render/inlinecss", {
       html: html,

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

@@ -8,7 +8,6 @@ import { GenerateDocument } from "../../utils/RenderTemplate";
 import DateTimePicker from "../form-date-time-picker/form-date-time-picker.component";
 import LayoutFormRow from "../layout-form-row/layout-form-row.component";
 import dayjs from "../../utils/day";
-import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
 
 const mapStateToProps = createStructuredSelector({
   currentUser: selectCurrentUser
@@ -20,7 +19,6 @@ const mapDispatchToProps = (dispatch) => ({
 
 export function EmailTestComponent({ currentUser, setEmailOptions }) {
   const [form] = Form.useForm();
-  const notification = useNotification();
 
   const handleFinish = (values) => {
     GenerateDocument(
@@ -42,9 +40,7 @@ export function EmailTestComponent({ currentUser, setEmailOptions }) {
       {
         to: values.to
       },
-      values.email ? "e" : "p",
-      null,
-      notification
+      values.email ? "e" : "p"
     );
   };
 

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

@@ -1,10 +1,10 @@
-import * as Sentry from "@sentry/react";
 import { Button, Col, Collapse, Result, Row, Space } from "antd";
 import React from "react";
 import { withTranslation } from "react-i18next";
+import { logImEXEvent } from "../../firebase/firebase.utils";
+import * as Sentry from "@sentry/react";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
-import { logImEXEvent } from "../../firebase/firebase.utils";
 import { selectBodyshop, selectCurrentUser } from "../../redux/user/user.selectors";
 import InstanceRenderManager from "../../utils/instanceRenderMgr";
 
@@ -38,23 +38,28 @@ class ErrorBoundary extends React.Component {
   }
 
   handleErrorSubmit = () => {
-    window.$crisp.push([
-      "do",
-      "message:send",
-      [
-        "text",
-        `I hit the following error: \n\n
+    InstanceRenderManager({
+      executeFunction: true,
+      args: [],
+      imex: () => {
+        window.$crisp.push([
+          "do",
+          "message:send",
+          [
+            "text",
+            `I hit the following error: \n\n
               ${this.state.error.message}\n\n
               ${this.state.error.stack}\n\n
               URL:${window.location} as ${this.props.currentUser.email} for ${
                 this.props.bodyshop && this.props.bodyshop.name
               }
               `
-      ]
-    ]);
-
-    window.$crisp.push(["do", "chat:open"]);
+          ]
+        ]);
 
+        window.$crisp.push(["do", "chat:open"]);
+      }
+    });
     //     const errorDescription = `**Please add relevant details about what you were doing before you encountered this issue**
 
     // ----
@@ -103,7 +108,8 @@ class ErrorBoundary extends React.Component {
             subTitle={t("general.messages.exception", {
               app: InstanceRenderManager({
                 imex: "$t(titles.imexonline)",
-                rome: "$t(titles.romeonline)"
+                rome: "$t(titles.romeonline)",
+                promanager: "$t(titles.promanager)"
               })
             })}
             extra={

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

@@ -1,5 +1,5 @@
 import React, { useCallback, useEffect, useRef, useState } from "react";
-import { Button, Card, Checkbox, Col, Form, Input, Modal, Row } from "antd";
+import { Button, Card, Checkbox, Col, Form, Input, Modal, notification, Row } from "antd";
 import Markdown from "react-markdown";
 import { createStructuredSelector } from "reselect";
 import { selectCurrentEula, selectCurrentUser } from "../../redux/user/user.selectors";
@@ -12,7 +12,6 @@ import dayjs from "../../utils/day";
 
 import "./eula.styles.scss";
 import DateTimePicker from "../form-date-time-picker/form-date-time-picker.component.jsx";
-import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
 
 const Eula = ({ currentEula, currentUser, acceptEula }) => {
   const [formReady, setFormReady] = useState(false);
@@ -21,7 +20,7 @@ const Eula = ({ currentEula, currentUser, acceptEula }) => {
   const [form] = Form.useForm();
   const markdownCardRef = useRef(null);
   const { t } = useTranslation();
-  const notification = useNotification();
+  const [api, contextHolder] = notification.useNotification();
 
   const handleScroll = useCallback(
     (e) => {
@@ -76,7 +75,7 @@ const Eula = ({ currentEula, currentUser, acceptEula }) => {
       });
       acceptEula();
     } catch (err) {
-      notification.error({
+      api.error({
         message: t("eula.errors.acceptance.message"),
         description: t("eula.errors.acceptance.description"),
         placement: "bottomRight",
@@ -92,6 +91,7 @@ const Eula = ({ currentEula, currentUser, acceptEula }) => {
 
   return (
     <>
+      {contextHolder}
       <Modal
         title={t("eula.titles.modal")}
         className="eula-modal"

client/src/components/feature-wrapper/blur-wrapper.component.jsx

@@ -1,144 +0,0 @@
-import Dinero from "dinero.js";
-import React from "react";
-import { connect } from "react-redux";
-import { createStructuredSelector } from "reselect";
-import { selectBodyshop } from "../../redux/user/user.selectors";
-import { HasFeatureAccess } from "./feature-wrapper.component";
-import { DateTimeFormatterFunction } from "../../utils/DateFormatter";
-
-const mapStateToProps = createStructuredSelector({
-  bodyshop: selectBodyshop
-});
-const blurringProps = {
-  filter: "blur(4px)",
-  webkitUserSelect: "none",
-  msUserSelect: "none",
-  mozUserSelect: "none",
-  userSelect: "none",
-  pointerEvents: "none"
-};
-
-export function BlurWrapper({
-  bodyshop,
-  featureName,
-  styleProp = "style",
-  valueProp = "value",
-  overrideValue = true,
-  overrideValueFunction,
-  children,
-  debug,
-  bypass
-}) {
-  if (import.meta.env.DEV) {
-    if (!ValidateFeatureName(featureName)) console.trace("*** INVALID FEATURE NAME", featureName);
-  }
-
-  if (debug) {
-    console.trace("*** DEBUG MODE", featureName);
-    console.log("*** HAS FEATURE ACCESS?", featureName, HasFeatureAccess({ featureName, bodyshop }));
-    console.log(
-      "***LOG  ~ All Blur Wrapper Props ",
-      styleProp,
-      valueProp,
-      overrideValue,
-      overrideValueFunction,
-      children,
-      debug,
-      bypass
-    );
-  }
-
-  if (bypass) {
-    if (import.meta.env.DEV) {
-      console.trace("*** Blur Wrapper BYPASS USED", featureName);
-    }
-    return children;
-  }
-
-  if (!HasFeatureAccess({ featureName, bodyshop })) {
-    const childrenWithBlurProps = React.Children.map(children, (child) => {
-      if (React.isValidElement(child)) {
-        //Clone the child, and spread in our props to overwrite it.
-        let newValueProp;
-        if (!overrideValue) {
-          newValueProp = child.props[valueProp];
-        } else {
-          if (typeof overrideValueFunction === "function") {
-            newValueProp = overrideValueFunction();
-          } else if (typeof overrideValueFunction === "string" && overrideValueFunction === "RandomDinero") {
-            newValueProp = RandomDinero();
-          } else if (typeof overrideValueFunction === "string" && overrideValueFunction === "RandomAmount") {
-            newValueProp = RandomAmount();
-          } else if (
-            typeof overrideValueFunction === "string" &&
-            overrideValueFunction.startsWith("RandomSmallString")
-          ) {
-            newValueProp = RandomSmallString(overrideValueFunction.split(":")[1] || 3); //Default back to 3 words, otherwise use the string.
-          } else if (typeof overrideValueFunction === "string" && overrideValueFunction.startsWith("RandomDate")) {
-            newValueProp = RandomDate();
-          } else {
-            newValueProp = "This is some random text. Nothing interesting here.";
-          }
-        }
-
-        return React.cloneElement(child, {
-          [valueProp]: newValueProp,
-          [styleProp]: { ...child.props[styleProp], ...blurringProps }
-        });
-      }
-      return child;
-    });
-
-    return childrenWithBlurProps;
-  }
-
-  return children;
-}
-export default connect(mapStateToProps, null)(BlurWrapper);
-
-function RandomDinero() {
-  return Dinero({ amount: Math.round(Math.exp(Math.random() * 10, 2)) }).toFormat();
-}
-function RandomAmount() {
-  return Math.round(Math.exp(Math.random() * 10));
-}
-
-function RandomSmallString(maxWords = 3) {
-  const words = ["lorem", "ipsum", "dolor", "sit", "amet", "consectetur", "adipiscing", "elit"];
-  const wordCount = Math.floor(Math.random() * maxWords) + 1; // Random number between 1 and 3
-  let result = [];
-  for (let i = 0; i < wordCount; i++) {
-    const randomIndex = Math.floor(Math.random() * words.length);
-    result.push(words[randomIndex]);
-  }
-  return result.join(" ");
-}
-function RandomDate() {
-  return DateTimeFormatterFunction(new Date(Math.floor(Math.random() * 1000000000000)));
-}
-
-const featureNameList = [
-  "mobile",
-  "allAccess",
-  //"audit", //Removing 2024-12-13. Keeping as default feature.
-  "timetickets",
-  "payments",
-  "partsorders",
-  "bills",
-  "export",
-  "csi",
-  "courtesycars",
-  "media",
-  "visualboard",
-  "scoreboard",
-  "techconsole",
-  "checklist",
-  "smartscheduling",
-  "roguard",
-  "dashboard"
-  //"lifecycle" //Removing 2024-12-13. Keeping as default feature.
-];
-
-export function ValidateFeatureName(featureName) {
-  return featureNameList.includes(featureName);
-}

client/src/components/feature-wrapper/feature-wrapper.component.jsx

@@ -1,84 +1,48 @@
+import dayjs from "../../utils/day";
 import React from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { selectBodyshop } from "../../redux/user/user.selectors";
-import dayjs from "../../utils/day";
-import InstanceRenderManager from "../../utils/instanceRenderMgr";
 import AlertComponent from "../alert/alert.component";
-import { ValidateFeatureName } from "./blur-wrapper.component";
+import InstanceRenderManager from "../../utils/instanceRenderMgr";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop
 });
 
-function FeatureWrapper({
-  bodyshop,
-  featureName,
-  noauth,
-  blurContent,
-  children,
-  upsellComponent,
-  bypass,
-  ...restProps
-}) {
+function FeatureWrapper({ bodyshop, featureName, noauth, children, ...restProps }) {
   const { t } = useTranslation();
 
-  if (bypass) {
-    if (import.meta.env.DEV) {
-      console.trace("*** Feature Wrapper BYPASS USED", featureName);
-    }
-    return children;
-  }
-
-  if (import.meta.env.DEV) {
-    if (!ValidateFeatureName(featureName)) console.trace("*** INVALID FEATURE NAME", featureName);
-  }
-
-  if (upsellComponent) {
-    console.error("*** Upsell component passed in. This is not yet implemented.");
-  }
-
   if (HasFeatureAccess({ featureName, bodyshop })) return children;
 
-  if (blurContent) {
-    const childrenWithBlurProps = React.Children.map(children, (child) => {
-      // Checking isValidElement is the safe way and avoids a
-      // typescript error too.
-      if (React.isValidElement(child)) {
-        return React.cloneElement(child, { blur: true });
-      }
-      return child;
-    });
-    return childrenWithBlurProps;
-  } else {
-    return (
-      noauth || (
-        <AlertComponent
-          message={t("general.messages.nofeatureaccess", {
-            app: InstanceRenderManager({
-              imex: "$t(titles.imexonline)",
-              rome: "$t(titles.romeonline)"
-            })
-          })}
-          type="warning"
-        />
-      )
-    );
-  }
+  return (
+    noauth || (
+      <AlertComponent
+        message={t("general.messages.nofeatureaccess", {
+          app: InstanceRenderManager({
+            imex: "$t(titles.imexonline)",
+            rome: "$t(titles.romeonline)",
+            promanager: "$t(titles.promanager)"
+          })
+        })}
+        type="warning"
+      />
+    )
+  );
 }
 
-export function HasFeatureAccess({ featureName, bodyshop, bypass, debug = false }) {
-  if (debug) {
-    console.trace(`*** HasFeatureAccessFunction called with feature << ${featureName} >>`);
-  }
-  if (bypass) {
-    if (import.meta.env.DEV) {
-      console.trace("*** Feature Wrapper BYPASS USED", featureName);
-    }
-    return true;
-  }
+export function HasFeatureAccess({ featureName, bodyshop }) {
   return bodyshop?.features?.allAccess || dayjs(bodyshop?.features[featureName]).isAfter(dayjs());
 }
 
 export default connect(mapStateToProps, null)(FeatureWrapper);
+
+/* 
+dashboard
+production-board
+scoreboard
+csi
+tech-console
+mobile-imaging
+*/

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

@@ -26,7 +26,8 @@ import Icon, {
   UserOutlined
 } from "@ant-design/icons";
 import { useSplitTreatments } from "@splitsoftware/splitio-react";
-import { Layout, Menu, Space } from "antd";
+import { Layout, Menu } from "antd";
+import React from "react";
 import { useTranslation } from "react-i18next";
 import { BsKanban } from "react-icons/bs";
 import { FaCalendarAlt, FaCarCrash, FaCreditCard, FaFileInvoiceDollar, FaTasks } from "react-icons/fa";
@@ -43,7 +44,6 @@ import { signOutStart } from "../../redux/user/user.actions";
 import { selectBodyshop, selectCurrentUser } from "../../redux/user/user.selectors";
 import InstanceRenderManager from "../../utils/instanceRenderMgr";
 import { HasFeatureAccess } from "../feature-wrapper/feature-wrapper.component";
-import LockWrapper from "../lock-wrapper/lock-wrapper.component";
 
 const mapStateToProps = createStructuredSelector({
   currentUser: selectCurrentUser,
@@ -128,39 +128,34 @@ function Header({
 
   const accountingChildren = [];
 
-  accountingChildren.push(
-    {
-      key: "bills",
-      id: "header-accounting-bills",
-      icon: <Icon component={FaFileInvoiceDollar} />,
-      label: (
-        <Link to="/manage/bills">
-          <LockWrapper featureName="bills" bodyshop={bodyshop}>
-            {t("menus.header.bills")}
-          </LockWrapper>
-        </Link>
-      )
-    },
-    {
-      key: "enterbills",
-      id: "header-accounting-enterbills",
-      icon: <Icon component={GiPayMoney} />,
-      label: (
-        <Space>
-          <LockWrapper featureName="bills" bodyshop={bodyshop}>
-            {t("menus.header.enterbills")}
-          </LockWrapper>
-        </Space>
-      ),
-      onClick: () => {
-        HasFeatureAccess({ featureName: "bills", bodyshop }) &&
+  if (
+    InstanceRenderManager({
+      imex: true,
+      rome: true,
+      promanager: HasFeatureAccess({ featureName: "bills", bodyshop })
+    })
+  ) {
+    accountingChildren.push(
+      {
+        key: "bills",
+        id: "header-accounting-bills",
+        icon: <Icon component={FaFileInvoiceDollar} />,
+        label: <Link to="/manage/bills">{t("menus.header.bills")}</Link>
+      },
+      {
+        key: "enterbills",
+        id: "header-accounting-enterbills",
+        icon: <Icon component={GiPayMoney} />,
+        label: t("menus.header.enterbills"),
+        onClick: () => {
           setBillEnterContext({
             actions: {},
             context: {}
           });
+        }
       }
-    }
-  );
+    );
+  }
 
   if (Simple_Inventory.treatment === "on") {
     accountingChildren.push(
@@ -175,41 +170,37 @@ function Header({
       }
     );
   }
-
-  accountingChildren.push(
-    {
-      type: "divider"
-    },
-    {
-      key: "allpayments",
-      id: "header-accounting-allpayments",
-      icon: <BankFilled />,
-      label: (
-        <Link to="/manage/payments">
-          <LockWrapper featureName="payments" bodyshop={bodyshop}>
-            {t("menus.header.allpayments")}
-          </LockWrapper>
-        </Link>
-      )
-    },
-    {
-      key: "enterpayments",
-      id: "header-accounting-enterpayments",
-      icon: <Icon component={FaCreditCard} />,
-      label: (
-        <LockWrapper featureName="payments" bodyshop={bodyshop}>
-          {t("menus.header.enterpayment")}
-        </LockWrapper>
-      ),
-      onClick: () => {
-        HasFeatureAccess({ featureName: "payments", bodyshop }) &&
+  if (
+    InstanceRenderManager({
+      imex: true,
+      rome: true,
+      promanager: HasFeatureAccess({ featureName: "payments", bodyshop })
+    })
+  ) {
+    accountingChildren.push(
+      {
+        type: "divider"
+      },
+      {
+        key: "allpayments",
+        id: "header-accounting-allpayments",
+        icon: <BankFilled />,
+        label: <Link to="/manage/payments">{t("menus.header.allpayments")}</Link>
+      },
+      {
+        key: "enterpayments",
+        id: "header-accounting-enterpayments",
+        icon: <Icon component={FaCreditCard} />,
+        label: t("menus.header.enterpayment"),
+        onClick: () => {
           setPaymentContext({
             actions: {},
             context: null
           });
+        }
       }
-    }
-  );
+    );
+  }
 
   if (ImEXPay.treatment === "on") {
     accountingChildren.push({
@@ -226,44 +217,40 @@ function Header({
     });
   }
 
-  accountingChildren.push(
-    {
-      type: "divider"
-    },
-    {
-      key: "timetickets",
-      id: "header-accounting-timetickets",
-      icon: <FieldTimeOutlined />,
-      label: (
-        <Link to="/manage/timetickets">
-          <LockWrapper featureName="timetickets" bodyshop={bodyshop}>
-            {t("menus.header.timetickets")}
-          </LockWrapper>
-        </Link>
-      )
-    }
-  );
+  if (
+    InstanceRenderManager({
+      imex: true,
+      rome: true,
+      promanager: HasFeatureAccess({ featureName: "timetickets", bodyshop })
+    })
+  ) {
+    accountingChildren.push(
+      {
+        type: "divider"
+      },
+      {
+        key: "timetickets",
+        id: "header-accounting-timetickets",
+        icon: <FieldTimeOutlined />,
+        label: <Link to="/manage/timetickets">{t("menus.header.timetickets")}</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",
-      icon: <Icon component={GiPlayerTime} />,
-      label: (
-        <LockWrapper featureName="timetickets" bodyshop={bodyshop}>
-          {t("menus.header.entertimeticket")}
-        </LockWrapper>
-      ),
-      id: "header-accounting-entertimetickets",
-      onClick: () => {
-        HasFeatureAccess({ featureName: "timetickets", bodyshop }) &&
+    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",
+        icon: <Icon component={GiPlayerTime} />,
+        label: t("menus.header.entertimeticket"),
+        id: "header-accounting-entertimetickets",
+        onClick: () => {
           setTimeTicketContext({
             actions: {},
             context: {
@@ -272,24 +259,19 @@ function Header({
                 : currentUser.email
             }
           });
+        }
+      },
+      {
+        type: "divider"
       }
-    },
-    {
-      type: "divider"
-    }
-  );
+    );
+  }
 
   const accountingExportChildren = [
     {
       key: "receivables",
       id: "header-accounting-receivables",
-      label: (
-        <Link to="/manage/accounting/receivables">
-          <LockWrapper featureName="export" bodyshop={bodyshop}>
-            {t("menus.header.accounting-receivables")}
-          </LockWrapper>
-        </Link>
-      )
+      label: <Link to="/manage/accounting/receivables">{t("menus.header.accounting-receivables")}</Link>
     }
   ];
 
@@ -297,13 +279,7 @@ function Header({
     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>
-      )
+      label: <Link to="/manage/accounting/payables">{t("menus.header.accounting-payables")}</Link>
     });
   }
 
@@ -311,13 +287,7 @@ function Header({
     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>
-      )
+      label: <Link to="/manage/accounting/payments">{t("menus.header.accounting-payments")}</Link>
     });
   }
 
@@ -328,27 +298,25 @@ function Header({
     {
       key: "exportlogs",
       id: "header-accounting-exportlogs",
-      label: (
-        <Link to="/manage/accounting/exportlogs">
-          <LockWrapper featureName="export" bodyshop={bodyshop}>
-            {t("menus.header.export-logs")}
-          </LockWrapper>
-        </Link>
-      )
+      label: <Link to="/manage/accounting/exportlogs">{t("menus.header.export-logs")}</Link>
     }
   );
 
-  accountingChildren.push({
-    key: "accountingexport",
-    id: "header-accounting-export",
-    icon: <ExportOutlined />,
-    label: (
-      <LockWrapper featureName="export" bodyshop={bodyshop}>
-        {t("menus.header.export")}
-      </LockWrapper>
-    ),
-    children: accountingExportChildren
-  });
+  if (
+    InstanceRenderManager({
+      imex: true,
+      rome: true,
+      promanager: HasFeatureAccess({ featureName: "export", bodyshop })
+    })
+  ) {
+    accountingChildren.push({
+      key: "accountingexport",
+      id: "header-accounting-export",
+      icon: <ExportOutlined />,
+      label: t("menus.header.export"),
+      children: accountingExportChildren
+    });
+  }
 
   const menuItems = [
     {
@@ -400,8 +368,7 @@ function Header({
           label: <Link to="/manage/jobs/new">{t("menus.header.newjob")}</Link>
         },
         {
-          type: "divider",
-          id: "header-jobs-divider"
+          type: "divider"
         },
         {
           key: "alljobs",
@@ -410,8 +377,7 @@ function Header({
           label: <Link to="/manage/jobs/all">{t("menus.header.alljobs")}</Link>
         },
         {
-          type: "divider",
-          id: "header-jobs-divider2"
+          type: "divider"
         },
         {
           key: "productionlist",
@@ -419,36 +385,38 @@ function Header({
           icon: <ScheduleOutlined />,
           label: <Link to="/manage/production/list">{t("menus.header.productionlist")}</Link>
         },
+        ...(InstanceRenderManager({
+          imex: true,
+          rome: true,
+          promanager: HasFeatureAccess({ featureName: "visualboard", bodyshop })
+        })
+          ? [
+              {
+                key: "productionboard",
+                id: "header-production-board",
+                icon: <Icon component={BsKanban} />,
+                label: <Link to="/manage/production/board">{t("menus.header.productionboard")}</Link>
+              }
+            ]
+          : []),
 
-        {
-          key: "productionboard",
-          id: "header-production-board",
-          icon: <Icon component={BsKanban} />,
-          label: (
-            <Link to="/manage/production/board">
-              <LockWrapper featureName="visualboard" bodyshop={bodyshop}>
-                {t("menus.header.productionboard")}
-              </LockWrapper>
-            </Link>
-          )
-        },
-
-        {
-          type: "divider",
-          id: "header-jobs-divider3"
-        },
-        {
-          key: "scoreboard",
-          id: "header-scoreboard",
-          icon: <LineChartOutlined />,
-          label: (
-            <Link to="/manage/scoreboard">
-              <LockWrapper featureName="scoreboard" bodyshop={bodyshop}>
-                {t("menus.header.scoreboard")}
-              </LockWrapper>
-            </Link>
-          )
-        }
+        ...(InstanceRenderManager({
+          imex: true,
+          rome: true,
+          promanager: HasFeatureAccess({ featureName: "scoreboard", bodyshop })
+        })
+          ? [
+              {
+                type: "divider"
+              },
+              {
+                key: "scoreboard",
+                id: "header-scoreboard",
+                icon: <LineChartOutlined />,
+                label: <Link to="/manage/scoreboard">{t("menus.header.scoreboard")}</Link>
+              }
+            ]
+          : [])
       ]
     },
     {
@@ -471,54 +439,40 @@ function Header({
         }
       ]
     },
-    {
-      key: "ccs",
-      id: "header-css",
-      icon: <CarFilled />,
-      label: (
-        <LockWrapper featureName="courtesycars" bodyshop={bodyshop}>
-          {t("menus.header.courtesycars")}
-        </LockWrapper>
-      ),
-      children: [
-        {
-          key: "courtesycarsall",
-          id: "header-courtesycars-all",
-          icon: <CarFilled />,
-          label: (
-            <Link to="/manage/courtesycars">
-              <LockWrapper featureName="courtesycars" bodyshop={bodyshop}>
-                {t("menus.header.courtesycars-all")}
-              </LockWrapper>
-            </Link>
-          )
-        },
-        {
-          key: "contracts",
-          id: "header-contracts",
-          icon: <FileFilled />,
-          label: (
-            <Link to="/manage/courtesycars/contracts">
-              <LockWrapper featureName="courtesycars" bodyshop={bodyshop}>
-                {t("menus.header.courtesycars-contracts")}
-              </LockWrapper>
-            </Link>
-          )
-        },
-        {
-          key: "newcontract",
-          id: "header-newcontract",
-          icon: <FileAddFilled />,
-          label: (
-            <Link to="/manage/courtesycars/contracts/new">
-              <LockWrapper featureName="courtesycars" bodyshop={bodyshop}>
-                {t("menus.header.courtesycars-newcontract")}
-              </LockWrapper>
-            </Link>
-          )
-        }
-      ]
-    },
+    ...(InstanceRenderManager({
+      imex: true,
+      rome: true,
+      promanager: false // HasFeatureAccess({ featureName: 'courtesycars', bodyshop }),
+    })
+      ? [
+          {
+            key: "ccs",
+            id: "header-css",
+            icon: <CarFilled />,
+            label: t("menus.header.courtesycars"),
+            children: [
+              {
+                key: "courtesycarsall",
+                id: "header-courtesycars-all",
+                icon: <CarFilled />,
+                label: <Link to="/manage/courtesycars">{t("menus.header.courtesycars-all")}</Link>
+              },
+              {
+                key: "contracts",
+                id: "header-contracts",
+                icon: <FileFilled />,
+                label: <Link to="/manage/courtesycars/contracts">{t("menus.header.courtesycars-contracts")}</Link>
+              },
+              {
+                key: "newcontract",
+                id: "header-newcontract",
+                icon: <FileAddFilled />,
+                label: <Link to="/manage/courtesycars/contracts/new">{t("menus.header.courtesycars-newcontract")}</Link>
+              }
+            ]
+          }
+        ]
+      : []),
 
     ...(accountingChildren.length > 0
       ? [
@@ -537,20 +491,20 @@ function Header({
       icon: <PhoneOutlined />,
       label: <Link to="/manage/phonebook">{t("menus.header.phonebook")}</Link>
     },
-
-    {
-      key: "temporarydocs",
-      id: "header-temporarydocs",
-      icon: <PaperClipOutlined />,
-      label: (
-        <Link to="/manage/temporarydocs">
-          <LockWrapper featureName="media" bodyshop={bodyshop}>
-            {t("menus.header.temporarydocs")}
-          </LockWrapper>
-        </Link>
-      )
-    },
-
+    ...(InstanceRenderManager({
+      imex: true,
+      rome: true,
+      promanager: HasFeatureAccess({ featureName: "media", bodyshop })
+    })
+      ? [
+          {
+            key: "temporarydocs",
+            id: "header-temporarydocs",
+            icon: <PaperClipOutlined />,
+            label: <Link to="/manage/temporarydocs">{t("menus.header.temporarydocs")}</Link>
+          }
+        ]
+      : []),
     {
       key: "tasks",
       id: "tasks",
@@ -559,7 +513,6 @@ function Header({
       children: [
         {
           key: "createTask",
-          id: "header-create-task",
           icon: <PlusCircleOutlined />,
           label: t("menus.header.create_task"),
           onClick: () => {
@@ -571,13 +524,11 @@ function Header({
         },
         {
           key: "mytasks",
-          id: "header-my-tasks",
           icon: <FaTasks />,
           label: <Link to="/manage/tasks/mytasks">{t("menus.header.my_tasks")}</Link>
         },
         {
           key: "all_tasks",
-          id: "header-all-tasks",
           icon: <FaTasks />,
           label: <Link to="/manage/tasks/alltasks">{t("menus.header.all_tasks")}</Link>
         }
@@ -599,11 +550,7 @@ function Header({
           key: "dashboard",
           id: "header-dashboard",
           icon: <DashboardFilled />,
-          label: (
-            <Link to="/manage/dashboard">
-              <LockWrapper featureName="bills">{t("menus.header.dashboard")}</LockWrapper>
-            </Link>
-          )
+          label: <Link to="/manage/dashboard">{t("menus.header.dashboard")}</Link>
         },
         {
           key: "reportcenter",
@@ -623,19 +570,20 @@ function Header({
           icon: <Icon component={IoBusinessOutline} />,
           label: <Link to="/manage/shop/vendors">{t("menus.header.shop_vendors")}</Link>
         },
-
-        {
-          key: "shop-csi",
-          id: "header-shop-csi",
-          icon: <Icon component={RiSurveyLine} />,
-          label: (
-            <Link to="/manage/shop/csi">
-              <LockWrapper featureName="export" bodyshop={bodyshop}>
-                {t("menus.header.shop_csi")}
-              </LockWrapper>
-            </Link>
-          )
-        }
+        ...(InstanceRenderManager({
+          imex: true,
+          rome: true,
+          promanager: HasFeatureAccess({ featureName: "csi", bodyshop })
+        })
+          ? [
+              {
+                key: "shop-csi",
+                id: "header-shop-csi",
+                icon: <Icon component={RiSurveyLine} />,
+                label: <Link to="/manage/shop/csi">{t("menus.header.shop_csi")}</Link>
+              }
+            ]
+          : [])
       ]
     },
     {
@@ -656,17 +604,25 @@ function Header({
           icon: <Icon component={QuestionCircleFilled} />,
           label: t("menus.header.help"),
           onClick: () => {
-            window.open("https://help.imex.online/", "_blank");
+            window.open(
+              InstanceRenderManager({
+                imex: "https://help.imex.online/",
+                rome: "https://rometech.com//",
+                promanager: "https://web-est.com"
+              }),
+
+              "_blank"
+            );
           }
         },
         ...(InstanceRenderManager({
           imex: true,
-          rome: false
+          rome: false,
+          promanager: false
         })
           ? [
               {
                 key: "rescue",
-                id: "header-rescue",
                 icon: <Icon component={CarFilled} />,
                 label: t("menus.header.rescueme"),
                 onClick: () => {
@@ -676,19 +632,20 @@ function Header({
             ]
           : []),
 
-        {
-          key: "shiftclock",
-          id: "header-shiftclock",
-          icon: <Icon component={GiPlayerTime} />,
-          label: (
-            <Link to="/manage/shiftclock">
-              <LockWrapper featureName="export" bodyshop={bodyshop}>
-                {t("menus.header.shiftclock")}
-              </LockWrapper>
-            </Link>
-          )
-        },
-
+        ...(InstanceRenderManager({
+          imex: true,
+          rome: true,
+          promanager: HasFeatureAccess({ featureName: "timetickets", bodyshop })
+        })
+          ? [
+              {
+                key: "shiftclock",
+                id: "header-shiftclock",
+                icon: <Icon component={GiPlayerTime} />,
+                label: <Link to="/manage/shiftclock">{t("menus.header.shiftclock")}</Link>
+              }
+            ]
+          : []),
         {
           key: "profile",
           id: "header-profile",
@@ -730,7 +687,6 @@ function Header({
       id: "header-recent",
       children: recentItems.map((i, idx) => ({
         key: idx,
-        id: `header-recent-${idx}`,
         label: <Link to={i.url}>{i.label}</Link>
       }))
     }

client/src/components/inventory-line-delete/inventory-line-delete.component.jsx

@@ -1,17 +1,15 @@
 import { DeleteFilled } from "@ant-design/icons";
 import { useMutation } from "@apollo/client";
-import { Button, Popconfirm } from "antd";
+import { Button, notification, Popconfirm } from "antd";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { DELETE_INVENTORY_LINE } from "../../graphql/inventory.queries";
 import RbacWrapper from "../rbac-wrapper/rbac-wrapper.component";
-import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
 
 export default function InventoryLineDelete({ inventoryline, disabled, refetch }) {
   const [loading, setLoading] = useState(false);
   const { t } = useTranslation();
   const [deleteInventoryLine] = useMutation(DELETE_INVENTORY_LINE);
-  const notification = useNotification();
 
   const handleDelete = async () => {
     setLoading(true);

client/src/components/inventory-upsert-modal/inventory-upsert-modal.container.jsx

@@ -1,5 +1,5 @@
 import { useMutation } from "@apollo/client";
-import { Form, Modal } from "antd";
+import { Form, Modal, notification } from "antd";
 import React, { useEffect } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -10,7 +10,6 @@ import { toggleModalVisible } from "../../redux/modals/modals.actions";
 import { selectInventoryUpsert } from "../../redux/modals/modals.selectors";
 import { selectBodyshop, selectCurrentUser } from "../../redux/user/user.selectors";
 import InventoryUpsertModal from "./inventory-upsert-modal.component";
-import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -25,7 +24,6 @@ export function InventoryUpsertModalContainer({ currentUser, bodyshop, inventory
   const { t } = useTranslation();
   const [insertInventory] = useMutation(INSERT_INVENTORY_LINE);
   const [updateInventoryLine] = useMutation(UPDATE_INVENTORY_LINE);
-  const notification = useNotification();
 
   const { open, context, actions } = inventoryUpsertModal;
   const { existingInventory } = context;

client/src/components/job-3rd-party-modal/job-3rd-party-modal.component.jsx

@@ -11,7 +11,6 @@ import { GenerateDocument } from "../../utils/RenderTemplate";
 import { TemplateList } from "../../utils/TemplateConstants";
 import LayoutFormRow from "../layout-form-row/layout-form-row.component";
 import VendorSearchSelect from "../vendor-search-select/vendor-search-select.component";
-import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -31,7 +30,6 @@ export function Jobd3RdPartyModal({ bodyshop, jobId, job, technician }) {
     fetchPolicy: "network-only",
     nextFetchPolicy: "network-only"
   });
-  const notification = useNotification();
 
   const showModal = () => {
     form.setFieldsValue({
@@ -61,9 +59,7 @@ export function Jobd3RdPartyModal({ bodyshop, jobId, job, technician }) {
         context: restVals
       },
       { subject: TemplateList("job_special").special_thirdpartypayer.subject },
-      sendtype,
-      null,
-      notification
+      sendtype
     );
   };
 

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

@@ -4,10 +4,9 @@ import { UPDATE_JOB } from "../../graphql/jobs.queries";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
-import { Dropdown } from "antd";
+import { Dropdown, notification } from "antd";
 import { DownOutlined } from "@ant-design/icons";
 import { selectBodyshop } from "../../redux/user/user.selectors";
-import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop
@@ -19,7 +18,6 @@ const mapDispatchToProps = (dispatch) => ({
 export function JobAltTransportChange({ bodyshop, job }) {
   const [updateJob] = useMutation(UPDATE_JOB);
   const { t } = useTranslation();
-  const notification = useNotification();
 
   const onClick = async ({ key }) => {
     const result = await updateJob({

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

@@ -4,10 +4,9 @@ import { UPDATE_APPOINTMENT } from "../../graphql/appointments.queries";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
-import { Dropdown } from "antd";
+import { Dropdown, notification } from "antd";
 import { DownOutlined } from "@ant-design/icons";
 import { selectBodyshop } from "../../redux/user/user.selectors";
-import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop
@@ -19,7 +18,6 @@ const mapDispatchToProps = (dispatch) => ({
 export function ScheduleEventColor({ bodyshop, event }) {
   const [updateAppointment] = useMutation(UPDATE_APPOINTMENT);
   const { t } = useTranslation();
-  const notification = useNotification();
 
   const onClick = async ({ key }) => {
     const result = await updateAppointment({

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

@@ -1,31 +1,29 @@
 import { AlertFilled } from "@ant-design/icons";
-import { useMutation } from "@apollo/client";
-import { Button, Divider, Dropdown, Form, Input, Popover, Select, Space } from "antd";
+import { Button, Divider, Dropdown, Form, Input, notification, Popover, Select, Space } from "antd";
 import parsePhoneNumber from "libphonenumber-js";
+import dayjs from "../../utils/day";
 import queryString from "query-string";
-import React, { useContext, useState } from "react";
+import React, { 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 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";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";
-import dayjs from "../../utils/day";
 import { GenerateDocument } from "../../utils/RenderTemplate";
 import { TemplateList } from "../../utils/TemplateConstants";
 import ChatOpenButton from "../chat-open-button/chat-open-button.component";
 import DataLabel from "../data-label/data-label.component";
 import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
-import ProductionListColumnComment from "../production-list-columns/production-list-columns.comment.component";
 import ScheduleManualEvent from "../schedule-manual-event/schedule-manual-event.component";
 import ScheduleAtChange from "./job-at-change.component";
 import ScheduleEventColor from "./schedule-event.color.component";
 import ScheduleEventNote from "./schedule-event.note.component";
-import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
+import { useMutation } from "@apollo/client";
+import { UPDATE_APPOINTMENT } from "../../graphql/appointments.queries";
+import ProductionListColumnComment from "../production-list-columns/production-list-columns.comment.component";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop
@@ -51,9 +49,6 @@ export function ScheduleEventComponent({
   const searchParams = queryString.parse(useLocation().search);
   const [updateAppointment] = useMutation(UPDATE_APPOINTMENT);
   const [title, setTitle] = useState(event.title);
-  const { socket } = useContext(SocketContext);
-  const notification = useNotification();
-
   const blockContent = (
     <Space direction="vertical" wrap>
       <Input
@@ -129,9 +124,6 @@ export function ScheduleEventComponent({
           <DataLabel label={t("jobs.fields.ownr_ph2")}>
             <ChatOpenButton phone={event.job && event.job.ownr_ph2} jobid={event.job.id} />
           </DataLabel>
-          <DataLabel hideIfNull label={t("jobs.fields.loss_of_use")}>
-            {(event.job && event.job.loss_of_use) || ""}
-          </DataLabel>
           <DataLabel label={t("jobs.fields.alt_transport")}>
             {(event.job && event.job.alt_transport) || ""}
             <ScheduleAtChange job={event && event.job} />
@@ -185,8 +177,7 @@ export function ScheduleEventComponent({
                         subject: Template.subject
                       },
                       "e",
-                      event.job && event.job.id,
-                      notification
+                      event.job && event.job.id
                     );
                   }
                 },
@@ -199,8 +190,7 @@ export function ScheduleEventComponent({
                     if (p && p.isValid()) {
                       openChatByPhone({
                         phone_num: p.formatInternational(),
-                        jobid: event.job.id,
-                        socket
+                        jobid: event.job.id
                       });
                       setMessage(
                         t("appointments.labels.reminder", {

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

@@ -1,4 +1,5 @@
 import { useMutation } from "@apollo/client";
+import { notification } from "antd";
 import React from "react";
 import { useTranslation } from "react-i18next";
 import { useDispatch } from "react-redux";
@@ -8,15 +9,12 @@ import { UPDATE_JOB } from "../../graphql/jobs.queries";
 import { insertAuditTrail } from "../../redux/application/application.actions";
 import AuditTrailMapping from "../../utils/AuditTrailMappings";
 import ScheduleEventComponent from "./schedule-event.component";
-import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
 
 export default function ScheduleEventContainer({ bodyshop, event, refetch }) {
   const dispatch = useDispatch();
   const { t } = useTranslation();
   const [cancelAppointment] = useMutation(CANCEL_APPOINTMENT_BY_ID);
   const [updateJob] = useMutation(UPDATE_JOB);
-  const notification = useNotification();
-
   const handleCancel = async ({ id, lost_sale_reason }) => {
     logImEXEvent("schedule_cancel_appt");
 

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

@@ -1,6 +1,6 @@
 import { EditFilled, SaveFilled } from "@ant-design/icons";
 import { useMutation } from "@apollo/client";
-import { Button, Input, Space } from "antd";
+import { Button, Input, notification, Space } from "antd";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -8,7 +8,6 @@ import { createStructuredSelector } from "reselect";
 import { UPDATE_APPOINTMENT } from "../../graphql/appointments.queries";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import DataLabel from "../data-label/data-label.component";
-import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop
@@ -23,7 +22,6 @@ export function ScheduleEventNote({ event }) {
   const [loading, setLoading] = useState(false);
   const [updateAppointment] = useMutation(UPDATE_APPOINTMENT);
   const { t } = useTranslation();
-  const notification = useNotification();
 
   const toggleEdit = async () => {
     if (editing) {

client/src/components/job-audit-trail/job-audit-trail.component.jsx

@@ -1,27 +1,23 @@
-import { SyncOutlined } from "@ant-design/icons";
 import { useQuery } from "@apollo/client";
 import { Button, Card, Col, Row, Table, Tag } from "antd";
+import { SyncOutlined } from "@ant-design/icons";
 import React from "react";
 import { useTranslation } from "react-i18next";
+import { QUERY_AUDIT_TRAIL } from "../../graphql/audit_trail.queries";
+import { DateTimeFormatter } from "../../utils/DateFormatter";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
-import { QUERY_AUDIT_TRAIL } from "../../graphql/audit_trail.queries";
-import { selectBodyshop, selectCurrentUser } from "../../redux/user/user.selectors";
-import { DateTimeFormatter } from "../../utils/DateFormatter";
-import BlurWrapperComponent from "../feature-wrapper/blur-wrapper.component";
-import { HasFeatureAccess } from "../feature-wrapper/feature-wrapper.component";
-import UpsellComponent, { upsellEnum } from "../upsell/upsell.component";
+import { selectCurrentUser } from "../../redux/user/user.selectors";
 
 const mapStateToProps = createStructuredSelector({
-  currentUser: selectCurrentUser,
-  bodyshop: selectBodyshop
+  currentUser: selectCurrentUser
 });
 const mapDispatchToProps = (dispatch) => ({
   //setUserLanguage: language => dispatch(setUserLanguage(language))
 });
 export default connect(mapStateToProps, mapDispatchToProps)(JobAuditTrail);
 
-export function JobAuditTrail({ bodyshop, currentUser, jobId }) {
+export function JobAuditTrail({ currentUser, jobId }) {
   const { t } = useTranslation();
   const { loading, data, refetch } = useQuery(QUERY_AUDIT_TRAIL, {
     variables: { jobid: jobId },
@@ -45,12 +41,7 @@ export function JobAuditTrail({ bodyshop, currentUser, jobId }) {
     {
       title: t("audit.fields.operation"),
       dataIndex: "operation",
-      key: "operation",
-      render: (text, record) => (
-        <BlurWrapperComponent featureName="audit" bypass>
-          <div>{text}</div>
-        </BlurWrapperComponent>
-      )
+      key: "operation"
     }
   ];
   const emailColumns = [
@@ -73,84 +64,52 @@ export function JobAuditTrail({ bodyshop, currentUser, jobId }) {
       dataIndex: "to",
       key: "to",
 
-      render: (text, record) =>
-        record.to &&
-        record.to.map((email, idx) => (
-          <Tag key={idx}>
-            <BlurWrapperComponent featureName="audit" bypass>
-              <div>{email}</div>
-            </BlurWrapperComponent>
-          </Tag>
-        ))
+      render: (text, record) => record.to && record.to.map((email, idx) => <Tag key={idx}>{email}</Tag>)
     },
     {
       title: t("audit.fields.cc"),
       dataIndex: "cc",
       key: "cc",
 
-      render: (text, record) =>
-        record.cc &&
-        record.cc.map((email, idx) => (
-          <Tag key={idx}>
-            <BlurWrapperComponent featureName="audit" bypass>
-              <div>{email}</div>
-            </BlurWrapperComponent>
-          </Tag>
-        ))
+      render: (text, record) => record.cc && record.cc.map((email, idx) => <Tag key={idx}>{email}</Tag>)
     },
     {
       title: t("audit.fields.subject"),
       dataIndex: "subject",
-      key: "subject",
-      render: (text, record) => (
-        <BlurWrapperComponent featureName="audit" bypass>
-          <div>{text}</div>
-        </BlurWrapperComponent>
-      )
+      key: "subject"
     },
     {
       title: t("audit.fields.status"),
       dataIndex: "status",
-      key: "status",
-      render: (text, record) => (
-        <BlurWrapperComponent featureName="audit" bypass>
-          <div>{text}</div>
-        </BlurWrapperComponent>
-      )
+      key: "status"
     },
-
-    {
-      title: t("audit.fields.contents"),
-      dataIndex: "contents",
-      key: "contents",
-      width: "10%",
-      render: (text, record) => (
-        <Button
-          onClick={() => {
-            var win = window.open(
-              "",
-              "Title",
-              "toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=yes,resizable=yes,width=780,height=400,"
-            );
-            win.document.body.innerHTML = record.contents;
-          }}
-        >
-          Preview
-        </Button>
-      )
-    }
+    ...(currentUser?.email.includes("@imex.")
+      ? [
+          {
+            title: t("audit.fields.contents"),
+            dataIndex: "contents",
+            key: "contents",
+            width: "10%",
+            render: (text, record) => (
+              <Button
+                onClick={() => {
+                  var win = window.open(
+                    "",
+                    "Title",
+                    "toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=yes,resizable=yes,width=780,height=400,"
+                  );
+                  win.document.body.innerHTML = record.contents;
+                }}
+              >
+                Preview
+              </Button>
+            )
+          }
+        ]
+      : [])
   ];
-
-  const hasAuditAccess = HasFeatureAccess({ bodyshop, featureName: "audit" });
   return (
     <Row gutter={[16, 16]}>
-      {!hasAuditAccess && (
-        <Col span={24}>
-          <Card>
-            <UpsellComponent upsell={upsellEnum().audit.general} disableMask />
-          </Card>
-        </Col>
-      )}
       <Col span={24}>
         <Card
           title={t("jobs.labels.audit")}

client/src/components/job-bills-total/job-bills-total.component.jsx

@@ -6,22 +6,8 @@ import InstanceRenderManager from "../../utils/instanceRenderMgr";
 import AlertComponent from "../alert/alert.component";
 import LoadingSkeleton from "../loading-skeleton/loading-skeleton.component";
 import "./job-bills-total.styles.scss";
-import BlurWrapperComponent from "../feature-wrapper/blur-wrapper.component";
-import UpsellComponent, { upsellEnum } from "../upsell/upsell.component";
-import { HasFeatureAccess } from "../feature-wrapper/feature-wrapper.component";
-import { connect } from "react-redux";
-import { createStructuredSelector } from "reselect";
-import { selectBodyshop } from "../../redux/user/user.selectors";
 
-const mapStateToProps = createStructuredSelector({
-  bodyshop: selectBodyshop
-});
-const mapDispatchToProps = (dispatch) => ({
-  //setUserLanguage: language => dispatch(setUserLanguage(language))
-});
-
-export function JobBillsTotalComponent({
-  bodyshop,
+export default function JobBillsTotalComponent({
   loading,
   bills,
   partsOrders,
@@ -32,7 +18,7 @@ export function JobBillsTotalComponent({
   const { t } = useTranslation();
 
   if (loading) return <LoadingSkeleton />;
-  if (!jobTotals) {
+  if (!!!jobTotals) {
     if (showWarning && warningCallback && typeof warningCallback === "function") {
       warningCallback({ key: "bills", warning: t("jobs.errors.nofinancial") });
     }
@@ -111,7 +97,8 @@ export function JobBillsTotalComponent({
     .add(
       InstanceRenderManager({
         imex: Dinero(),
-        rome: Dinero(totals.additional.additionalCosts)
+        rome: Dinero(totals.additional.additionalCosts),
+        promanager: "USE_ROME"
       })
     ); // Additional costs were captured for Rome, but not imex.
 
@@ -133,10 +120,10 @@ export function JobBillsTotalComponent({
       warningCallback({ key: "cm", warning: t("jobs.labels.outstanding_credit_memos") });
     }
   }
-  const hasBillsAccess = HasFeatureAccess({ bodyshop, featureName: "bills" });
+
   return (
     <Row gutter={[16, 16]}>
-      <Col {...(hasBillsAccess ? { md: 24, lg: 18 } : { span: 12 })}>
+      <Col md={24} lg={18}>
         <Card title={t("jobs.labels.jobtotals")} style={{ height: "100%" }}>
           <Space wrap size="large">
             <Tooltip
@@ -160,9 +147,7 @@ export function JobBillsTotalComponent({
                 />
               }
             >
-              <BlurWrapperComponent featureName="bills" overrideValueFunction="RandomDinero">
-                <Statistic title={t("bills.labels.retailtotal")} value={billTotals.toFormat()} />
-              </BlurWrapperComponent>
+              <Statistic title={t("bills.labels.retailtotal")} value={billTotals.toFormat()} />
             </Tooltip>
             <Typography.Title>=</Typography.Title>
             <Tooltip
@@ -174,15 +159,13 @@ export function JobBillsTotalComponent({
                 />
               }
             >
-              <BlurWrapperComponent featureName="bills" overrideValueFunction="RandomDinero">
-                <Statistic
-                  title={t("bills.labels.discrepancy")}
-                  valueStyle={{
-                    color: discrepancy.getAmount() === 0 ? "green" : "red"
-                  }}
-                  value={discrepancy.toFormat()}
-                />
-              </BlurWrapperComponent>
+              <Statistic
+                title={t("bills.labels.discrepancy")}
+                valueStyle={{
+                  color: discrepancy.getAmount() === 0 ? "green" : "red"
+                }}
+                value={discrepancy.toFormat()}
+              />
             </Tooltip>
             <Typography.Title>+</Typography.Title>
             <Tooltip
@@ -194,9 +177,7 @@ export function JobBillsTotalComponent({
                 />
               }
             >
-              <BlurWrapperComponent featureName="bills" overrideValueFunction="RandomDinero">
-                <Statistic title={t("bills.labels.dedfromlbr")} value={lbrAdjustments.toFormat()} />
-              </BlurWrapperComponent>
+              <Statistic title={t("bills.labels.dedfromlbr")} value={lbrAdjustments.toFormat()} />
             </Tooltip>
             <Typography.Title>=</Typography.Title>
             <Tooltip
@@ -208,15 +189,13 @@ export function JobBillsTotalComponent({
                 />
               }
             >
-              <BlurWrapperComponent featureName="bills" overrideValueFunction="RandomDinero">
-                <Statistic
-                  title={t("bills.labels.discrepancy")}
-                  valueStyle={{
-                    color: discrepWithLbrAdj.getAmount() === 0 ? "green" : "red"
-                  }}
-                  value={discrepWithLbrAdj.toFormat()}
-                />
-              </BlurWrapperComponent>
+              <Statistic
+                title={t("bills.labels.discrepancy")}
+                valueStyle={{
+                  color: discrepWithLbrAdj.getAmount() === 0 ? "green" : "red"
+                }}
+                value={discrepWithLbrAdj.toFormat()}
+              />
             </Tooltip>
             <Typography.Title>+</Typography.Title>
             <Tooltip
@@ -228,9 +207,7 @@ export function JobBillsTotalComponent({
                 />
               }
             >
-              <BlurWrapperComponent featureName="bills" overrideValueFunction="RandomDinero">
-                <Statistic title={t("bills.labels.totalreturns")} value={totalReturns.toFormat()} />
-              </BlurWrapperComponent>
+              <Statistic title={t("bills.labels.totalreturns")} value={totalReturns.toFormat()} />
             </Tooltip>
             <Typography.Title>=</Typography.Title>
             <Tooltip
@@ -242,17 +219,16 @@ export function JobBillsTotalComponent({
                 />
               }
             >
-              <BlurWrapperComponent featureName="bills" overrideValueFunction="RandomDinero">
-                <Statistic
-                  title={t("bills.labels.discrepancy")}
-                  valueStyle={{
-                    color: discrepWithCms.getAmount() === 0 ? "green" : "red"
-                  }}
-                  value={discrepWithCms.toFormat()}
-                />
-              </BlurWrapperComponent>
+              <Statistic
+                title={t("bills.labels.discrepancy")}
+                valueStyle={{
+                  color: discrepWithCms.getAmount() === 0 ? "green" : "red"
+                }}
+                value={discrepWithCms.toFormat()}
+              />
             </Tooltip>
           </Space>
+
           {showWarning &&
             (discrepWithCms.getAmount() !== 0 ||
               discrepWithLbrAdj.getAmount() !== 0 ||
@@ -277,9 +253,7 @@ export function JobBillsTotalComponent({
                 />
               }
             >
-              <BlurWrapperComponent featureName="bills" overrideValueFunction="RandomDinero">
-                <Statistic title={t("bills.labels.totalreturns")} value={totalReturns.toFormat()} />
-              </BlurWrapperComponent>
+              <Statistic title={t("bills.labels.totalreturns")} value={totalReturns.toFormat()} />
             </Tooltip>
             <Tooltip
               title={
@@ -290,19 +264,17 @@ export function JobBillsTotalComponent({
                 />
               }
             >
-              <BlurWrapperComponent featureName="bills" overrideValueFunction="RandomDinero">
-                <Statistic
-                  title={t("bills.labels.calculatedcreditsnotreceived")}
-                  valueStyle={{
-                    color: calculatedCreditsNotReceived.getAmount() <= 0 ? "green" : "red"
-                  }}
-                  value={
-                    calculatedCreditsNotReceived.getAmount() >= 0
-                      ? calculatedCreditsNotReceived.toFormat()
-                      : Dinero().toFormat()
-                  }
-                />
-              </BlurWrapperComponent>
+              <Statistic
+                title={t("bills.labels.calculatedcreditsnotreceived")}
+                valueStyle={{
+                  color: calculatedCreditsNotReceived.getAmount() <= 0 ? "green" : "red"
+                }}
+                value={
+                  calculatedCreditsNotReceived.getAmount() >= 0
+                    ? calculatedCreditsNotReceived.toFormat()
+                    : Dinero().toFormat()
+                }
+              />
             </Tooltip>
             <Tooltip
               title={
@@ -313,19 +285,17 @@ export function JobBillsTotalComponent({
                 />
               }
             >
-              <BlurWrapperComponent featureName="bills" overrideValueFunction="RandomDinero">
-                <Statistic
-                  title={t("bills.labels.creditsnotreceived")}
-                  valueStyle={{
-                    color: totalReturnsMarkedNotReceived.getAmount() <= 0 ? "green" : "red"
-                  }}
-                  value={
-                    totalReturnsMarkedNotReceived.getAmount() >= 0
-                      ? totalReturnsMarkedNotReceived.toFormat()
-                      : Dinero().toFormat()
-                  }
-                />
-              </BlurWrapperComponent>
+              <Statistic
+                title={t("bills.labels.creditsnotreceived")}
+                valueStyle={{
+                  color: totalReturnsMarkedNotReceived.getAmount() <= 0 ? "green" : "red"
+                }}
+                value={
+                  totalReturnsMarkedNotReceived.getAmount() >= 0
+                    ? totalReturnsMarkedNotReceived.toFormat()
+                    : Dinero().toFormat()
+                }
+              />
             </Tooltip>
           </Space>
           {showWarning && calculatedCreditsNotReceived.getAmount() > 0 && (
@@ -333,15 +303,6 @@ export function JobBillsTotalComponent({
           )}
         </Card>
       </Col>
-      {!hasBillsAccess && (
-        <Col span={6}>
-          <Card style={{ height: "100%" }}>
-            <UpsellComponent upsell={upsellEnum().bills.autoreconcile} disableMask />
-          </Card>
-        </Col>
-      )}
     </Row>
   );
 }
-
-export default connect(mapStateToProps, mapDispatchToProps)(JobBillsTotalComponent);

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

@@ -1,13 +1,11 @@
-import { Button } from "antd";
+import { Button, notification } from "antd";
 import Axios from "axios";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
-import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
 
 export default function JobCalculateTotals({ job, disabled, refetch }) {
   const { t } = useTranslation();
   const [loading, setLoading] = useState(false);
-  const notification = useNotification();
 
   const handleCalculate = async () => {
     try {

client/src/components/job-checklist/components/job-checklist-form/job-checklist-form.component.jsx

@@ -1,5 +1,5 @@
 import { useMutation } from "@apollo/client";
-import { Button, Card, Form, Input, Switch } from "antd";
+import { Button, Card, Form, Input, notification, Switch } from "antd";
 import queryString from "query-string";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
@@ -16,7 +16,6 @@ import AuditTrailMapping from "../../../../utils/AuditTrailMappings";
 import dayjs from "../../../../utils/day";
 import ConfigFormComponents from "../../../config-form-components/config-form-components.component";
 import DateTimePicker from "../../../form-date-time-picker/form-date-time-picker.component";
-import { useNotification } from "../../../../contexts/Notifications/notificationContext.jsx";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -33,7 +32,6 @@ export function JobChecklistForm({ insertAuditTrail, formItems, bodyshop, curren
   const [markAptArrived] = useMutation(MARK_APPOINTMENT_ARRIVED);
   const [markLatestAptArrived] = useMutation(MARK_LATEST_APPOINTMENT_ARRIVED);
   const [updateOwner] = useMutation(UPDATE_OWNER);
-  const notification = useNotification();
 
   const { jobId } = useParams();
   const history = useNavigate();

client/src/components/job-checklist/components/job-checklist-template-list/job-checklist-template-list.component.jsx

@@ -6,14 +6,12 @@ import { useParams } from "react-router-dom";
 import { logImEXEvent } from "../../../../firebase/firebase.utils";
 import { GenerateDocument, GenerateDocuments } from "../../../../utils/RenderTemplate";
 import { TemplateList } from "../../../../utils/TemplateConstants";
-import { useNotification } from "../../../../contexts/Notifications/notificationContext.jsx";
 const TemplateListGenerated = TemplateList();
 
 export default function JobIntakeTemplateList({ templates }) {
   const { jobId } = useParams();
   const { t } = useTranslation();
   const [loading, setLoading] = useState(false);
-  const notification = useNotification();
 
   const renderTemplate = async (templateKey) => {
     setLoading(true);
@@ -25,9 +23,7 @@ export default function JobIntakeTemplateList({ templates }) {
         variables: { id: jobId }
       },
       {},
-      "p",
-      null,
-      notification
+      "p"
     );
     setLoading(false);
   };
@@ -39,8 +35,7 @@ export default function JobIntakeTemplateList({ templates }) {
     await GenerateDocuments(
       templates.map((key) => {
         return { name: key, variables: { id: jobId } };
-      }),
-      notification
+      })
     );
     setLoading(false);
   };

client/src/components/job-create-iou/job-create-iou.component.jsx

@@ -1,6 +1,6 @@
 import { useApolloClient } from "@apollo/client";
 import { useSplitTreatments } from "@splitsoftware/splitio-react";
-import { Button, Popconfirm } from "antd";
+import { Button, notification, Popconfirm } from "antd";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -10,7 +10,6 @@ import { UPDATE_JOB_LINES_IOU } from "../../graphql/jobs-lines.queries";
 import { selectBodyshop, selectCurrentUser } from "../../redux/user/user.selectors";
 import { CreateIouForJob } from "../jobs-detail-header-actions/jobs-detail-header-actions.duplicate.util";
 import { selectTechnician } from "../../redux/tech/tech.selectors";
-import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -28,7 +27,6 @@ export function JobCreateIOU({ bodyshop, currentUser, job, selectedJobLines, tec
   const [loading, setLoading] = useState(false);
   const client = useApolloClient();
   const history = useNavigate();
-  const notification = useNotification();
 
   const {
     treatments: { IOU_Tracking }

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

@@ -47,7 +47,7 @@ export function JobDetailCards({ bodyshop, setPrintCenterContext }) {
     md: "100%",
     lg: "75%",
     xl: "75%",
-    xxl: "75%"
+    xxl: "60%"
   };
   const drawerPercentage = selectedBreakpoint ? bpoints[selectedBreakpoint[0]] : "100%";
 
@@ -122,7 +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} />
               </Col>
             )}
             <Col {...span}>

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

@@ -1,14 +1,11 @@
 import { Carousel } from "antd";
 import React from "react";
 import { useTranslation } from "react-i18next";
-import { HasFeatureAccess } from "../feature-wrapper/feature-wrapper.component";
 import { GenerateThumbUrl } from "../jobs-documents-gallery/job-documents.utility";
-import UpsellComponent, { upsellEnum } from "../upsell/upsell.component";
 import CardTemplate from "./job-detail-cards.template.component";
 
-export default function JobDetailCardsDocumentsComponent({ loading, data, bodyshop }) {
+export default function JobDetailCardsDocumentsComponent({ loading, data }) {
   const { t } = useTranslation();
-  const hasMediaAccess = HasFeatureAccess({ bodyshop, featureName: "media" });
 
   if (!data)
     return (
@@ -23,18 +20,14 @@ export default function JobDetailCardsDocumentsComponent({ loading, data, bodysh
       title={t("jobs.labels.cards.documents")}
       extraLink={`/manage/jobs/${data.id}?tab=documents`}
     >
-      {!hasMediaAccess && (
-        <UpsellComponent disableMask upsell={upsellEnum().media.general}>
-          {data.documents.length > 0 ? (
-            <Carousel autoplay>
-              {data.documents.map((item) => (
-                <img key={item.id} src={GenerateThumbUrl(item)} alt={item.name} />
-              ))}
-            </Carousel>
-          ) : (
-            <div>{t("documents.errors.nodocuments")}</div>
-          )}
-        </UpsellComponent>
+      {data.documents.length > 0 ? (
+        <Carousel autoplay>
+          {data.documents.map((item) => (
+            <img key={item.id} src={GenerateThumbUrl(item)} alt={item.name} />
+          ))}
+        </Carousel>
+      ) : (
+        <div>{t("documents.errors.nodocuments")}</div>
       )}
     </CardTemplate>
   );

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

@@ -12,10 +12,9 @@ import { selectBodyshop } from "../../redux/user/user.selectors";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";
 import { DateFormatter } from "../../utils/DateFormatter";
 import AlertComponent from "../alert/alert.component";
-import BillDetailEditcontainer from "../bill-detail-edit/bill-detail-edit.container";
-
-import BlurWrapper from "../feature-wrapper/blur-wrapper.component";
-import TaskListContainer from "../task-list/task-list.container";
+import BillDetailEditcontainer from "../bill-detail-edit/bill-detail-edit.container.jsx";
+import FeatureWrapper from "../feature-wrapper/feature-wrapper.component.jsx";
+import TaskListContainer from "../task-list/task-list.container.jsx";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -83,7 +82,7 @@ export function JobLinesExpander({ jobline, jobid, bodyshop, technician }) {
                   }
                 ]
           }
-        />
+        />{" "}
       </Col>
       <Col md={24} lg={8}>
         <Typography.Title level={4}>{t("parts_dispatch.labels.parts_dispatch")}</Typography.Title>
@@ -118,61 +117,57 @@ export function JobLinesExpander({ jobline, jobid, bodyshop, technician }) {
           }
         />
       </Col>
-
-      <Col md={24} lg={8}>
-        <Typography.Title level={4}>{t("bills.labels.bills")}</Typography.Title>
-        <BillDetailEditcontainer />
-        <Timeline
-          items={
-            data.billlines.length > 0
-              ? data.billlines.map((line) => ({
-                  key: line.id,
-                  children: (
-                    <Row wrap>
-                      <Col span={4}>
-                        {!technician ? (
-                          <>
-                            <Link to={`/manage/jobs/${jobid}?tab=partssublet&billid=${line.bill.id}`}>
-                              {line.bill.invoice_number}
-                            </Link>
-                          </>
-                        ) : (
-                          `${line.bill.invoice_number}`
-                        )}
-                      </Col>
-                      <Col span={4}>
-                        <span>
-                          {`${t("billlines.fields.actual_price")}: `}
-                          <CurrencyFormatter>{line.actual_price}</CurrencyFormatter>
-                        </span>
-                      </Col>
-                      <Col span={4}>
-                        <span>
-                          {`${t("billlines.fields.actual_cost")}: `}
-                          <CurrencyFormatter>{line.actual_cost}</CurrencyFormatter>
-                        </span>
-                      </Col>
-                      <Col span={4}>
-                        <DateFormatter>{line.bill.date}</DateFormatter>
-                      </Col>
-                      <Col span={4}> {line.bill.vendor.name}</Col>
-                    </Row>
-                  )
-                }))
-              : [
-                  {
-                    key: "no-orders",
+      <FeatureWrapper featureName="bills" noauth={() => null}>
+        <Col md={24} lg={8}>
+          <Typography.Title level={4}>{t("bills.labels.bills")}</Typography.Title>
+          <BillDetailEditcontainer />
+          <Timeline
+            items={
+              data.billlines.length > 0
+                ? data.billlines.map((line) => ({
+                    key: line.id,
                     children: (
-                      <BlurWrapper featureName="bills">
-                        <span>{t("bills.labels.nobilllines")}</span>
-                      </BlurWrapper>
+                      <Row wrap>
+                        <Col span={4}>
+                          {!technician ? (
+                            <>
+                              <Link to={`/manage/jobs/${jobid}?tab=partssublet&billid=${line.bill.id}`}>
+                                {line.bill.invoice_number}
+                              </Link>
+                            </>
+                          ) : (
+                            `${line.bill.invoice_number}`
+                          )}
+                        </Col>
+                        <Col span={4}>
+                          <span>
+                            {`${t("billlines.fields.actual_price")}: `}
+                            <CurrencyFormatter>{line.actual_price}</CurrencyFormatter>
+                          </span>
+                        </Col>
+                        <Col span={4}>
+                          <span>
+                            {`${t("billlines.fields.actual_cost")}: `}
+                            <CurrencyFormatter>{line.actual_cost}</CurrencyFormatter>
+                          </span>
+                        </Col>
+                        <Col span={4}>
+                          <DateFormatter>{line.bill.date}</DateFormatter>
+                        </Col>
+                        <Col span={4}> {line.bill.vendor.name}</Col>
+                      </Row>
                     )
-                  }
-                ]
-          }
-        />
-      </Col>
-
+                  }))
+                : [
+                    {
+                      key: "no-orders",
+                      children: t("bills.labels.nobilllines")
+                    }
+                  ]
+            }
+          />
+        </Col>
+      </FeatureWrapper>
       <Col md={24} lg={24}>
         <TaskListContainer
           parentJobId={jobid}

client/src/components/job-detail-lines/job-lines-part-price-change.component.jsx

@@ -1,5 +1,5 @@
 import { useMutation } from "@apollo/client";
-import { Button, Form, Popover, Tooltip } from "antd";
+import { Button, Form, notification, Popover, Tooltip } from "antd";
 import axios from "axios";
 import { t } from "i18next";
 import React, { useState } from "react";
@@ -11,7 +11,6 @@ import CurrencyFormatter from "../../utils/CurrencyFormatter";
 import InstanceRenderManager from "../../utils/instanceRenderMgr";
 import CurrencyFormItemComponent from "../form-items-formatted/currency-form-item.component";
 import JobLineConvertToLabor from "../job-line-convert-to-labor/job-line-convert-to-labor.component";
-import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
 
 const mapStateToProps = createStructuredSelector({
   technician: selectTechnician
@@ -21,7 +20,6 @@ const mapDispatchToProps = (dispatch) => ({});
 export function JobLinesPartPriceChange({ job, line, refetch, technician }) {
   const [loading, setLoading] = useState(false);
   const [updatePartPrice] = useMutation(UPDATE_LINE_PPC);
-  const notification = useNotification();
 
   const handleFinish = async (values) => {
     try {
@@ -62,21 +60,24 @@ export function JobLinesPartPriceChange({ job, line, refetch, technician }) {
     }
   };
 
-  const popcontent =
-    !technician &&
-    InstanceRenderManager({
-      imex: null,
-      rome: (
-        <Form layout="vertical" onFinish={handleFinish} initialValues={{ act_price: line.act_price }}>
-          <Form.Item name="act_price" label={t("jobs.labels.act_price_ppc")} rules={[{ required: true }]}>
-            <CurrencyFormItemComponent />
-          </Form.Item>
-          <Button disabled={InstanceRenderManager({ imex: true, rome: false })} loading={loading} htmlType="primary">
-            {t("general.actions.save")}
-          </Button>
-        </Form>
-      )
-    });
+  const popcontent = !technician && InstanceRenderManager({
+    imex: null,
+    rome: (
+      <Form layout="vertical" onFinish={handleFinish} initialValues={{ act_price: line.act_price }}>
+        <Form.Item name="act_price" label={t("jobs.labels.act_price_ppc")} rules={[{ required: true }]}>
+          <CurrencyFormItemComponent />
+        </Form.Item>
+        <Button
+          disabled={InstanceRenderManager({ imex: true, rome: false, promanager: true })}
+          loading={loading}
+          htmlType="primary"
+        >
+          {t("general.actions.save")}
+        </Button>
+      </Form>
+    ),
+    promanager: null
+  });
 
   return (
     <JobLineConvertToLabor jobline={line} job={job}>

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

@@ -216,9 +216,7 @@ export function JobLinesComponent({
     {
       title: t("joblines.fields.part_qty"),
       dataIndex: "part_qty",
-      key: "part_qty",
-      sorter: (a, b) => a.part_qty - b.part_qty,
-      sortOrder: state.sortedInfo.columnKey === "part_qty" && state.sortedInfo.order
+      key: "part_qty"
     },
     // {
     //   title: t('joblines.fields.tax_part'),
@@ -519,7 +517,6 @@ export function JobLinesComponent({
               {selectedLines.length > 0 && ` (${selectedLines.length})`}
             </Button>
             <Button
-              id="job-lines-order-parts-button"
               disabled={(job && !job.converted) || (selectedLines.length > 0 ? false : true) || jobRO || technician}
               onClick={() => {
                 setPartsOrderContext({
@@ -542,7 +539,6 @@ export function JobLinesComponent({
               {selectedLines.length > 0 && ` (${selectedLines.length})`}
             </Button>
             <Button
-              id="job-lines-filter-parts-only-button"
               onClick={() => {
                 setState((state) => ({
                   ...state,
@@ -556,7 +552,7 @@ export function JobLinesComponent({
               <FilterFilled /> {t("jobs.actions.filterpartsonly")}
             </Button>
             <Dropdown menu={markMenu} trigger={["click"]}>
-              <Button id="repair-data-mark-button">{t("jobs.actions.mark")}</Button>
+              <Button>{t("jobs.actions.mark")}</Button>
             </Dropdown>
             <Button
               disabled={jobRO || technician}

client/src/components/job-employee-assignments/job-employee-assignments.component.jsx

@@ -158,7 +158,8 @@ export function JobEmployeeAssignments({
           label={t(
             InstanceRenderManager({
               imex: "jobs.fields.employee_csr",
-              rome: "jobs.fields.employee_csr_writer"
+              rome: "jobs.fields.employee_csr_writer",
+              promanager: "USE_ROME"
             })
           )}
         >

client/src/components/job-employee-assignments/job-employee-assignments.container.jsx

@@ -1,4 +1,5 @@
 import { useMutation } from "@apollo/client";
+import { notification } from "antd";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { logImEXEvent } from "../../firebase/firebase.utils";
@@ -9,7 +10,6 @@ import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { insertAuditTrail } from "../../redux/application/application.actions";
 import AuditTrailMapping from "../../utils/AuditTrailMappings";
-import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
 
 const mapStateToProps = createStructuredSelector({
   //currentUser: selectCurrentUser
@@ -23,7 +23,6 @@ export function JobEmployeeAssignmentsContainer({ job, refetch, insertAuditTrail
   const { t } = useTranslation();
   const [updateJob] = useMutation(UPDATE_JOB_ASSIGNMENTS);
   const [loading, setLoading] = useState(false);
-  const notification = useNotification();
 
   const handleAdd = async (assignment) => {
     setLoading(true);