bugfix/IO-3531 - Disable unnecessary refetch queries causing page reload.

Merged in hotfix/2026-01-30 (pull request #2931 )
IO-3529 Fix for Parts Return
2026-02-02 12:25:19 -05:00 · 2026-02-01 01:49:08 +00:00 · 2026-02-01 01:41:46 +00:00 · 2026-01-31 17:43:16 -08:00 · 2026-01-31 16:59:17 -08:00 · 2026-02-01 00:57:43 +00:00
81 changed files with 1993 additions and 1250 deletions
--- a/_reference/refactorReports/REACT-19-DEPRECATION-FIXES.md
+++ b/_reference/refactorReports/REACT-19-DEPRECATION-FIXES.md
@@ -0,0 +1,593 @@
+# React 19 & Ant Design 6 Upgrade - Deprecation Fixes Report
+
+## Overview
+This document outlines all deprecations fixed during the upgrade from React 18 to React 19 and Ant Design 5 to Ant Design 6 in the branch `feature/IO-3499-React-19` compared to `origin/master-AIO`.
+
+---
+
+## 1. Core Dependency Updates
+
+### React & React DOM
+- **Upgraded from:** React ^18.3.1 → React ^19.2.4
+- **Upgraded from:** React DOM ^18.3.1 → React DOM ^19.2.4
+- **Impact:** Enabled React 19 compiler optimizations and new concurrent features
+
+### Ant Design
+- **Upgraded from:** Ant Design ^5.28.1 → ^6.2.2
+- **Upgraded from:** @ant-design/icons ^5.6.1 → ^6.1.0
+- **Impact:** Access to Ant Design 6 improvements and API changes
+
+### Apollo GraphQL
+- **@apollo/client:** ^3.13.9 → ^4.1.3
+- **apollo-link-logger:** ^2.0.1 → ^3.0.0
+- **graphql-ws:** ^6.0.7 (added for WebSocket subscriptions)
+- **Impact:** Major version upgrade with breaking changes to import paths and API
+
+### React Ecosystem Libraries
+- **react-router-dom:** ^6.30.0 → ^7.13.0
+- **react-i18next:** ^15.7.3 → ^16.5.4
+- **react-grid-layout:** 1.3.4 → ^2.2.2
+- **@testing-library/react:** ^16.3.1 → ^16.3.2
+- **styled-components:** ^6.2.0 → ^6.3.8
+
+### Build Tools
+- **Vite:** ^7.3.1 (maintained, peer dependencies updated)
+- **vite-plugin-babel:** ^1.3.2 → ^1.4.1
+- **vite-plugin-node-polyfills:** ^0.24.0 → ^0.25.0
+- **vitest:** ^3.2.4 → ^4.0.18
+
+### Monitoring & Analytics
+- **@sentry/react:** ^9.43.0 → ^10.38.0
+- **@sentry/cli:** ^2.58.2 → ^3.1.0
+- **@sentry/vite-plugin:** ^4.6.1 → ^4.8.0
+- **logrocket:** ^9.0.2 → ^12.0.0
+- **posthog-js:** ^1.315.1 → ^1.336.4
+- **@amplitude/analytics-browser:** ^2.33.1 → ^2.34.0
+
+### Other Key Dependencies
+- **axios:** ^1.13.2 → ^1.13.4
+- **env-cmd:** ^10.1.0 → ^11.0.0
+- **i18next:** ^25.7.4 → ^25.8.0
+- **libphonenumber-js:** ^1.12.33 → ^1.12.36
+- **lightningcss:** ^1.30.2 → ^1.31.1
+- **@fingerprintjs/fingerprintjs:** ^4.6.1 → ^5.0.1
+- **@firebase/app:** ^0.14.6 → ^0.14.7
+- **@firebase/firestore:** ^4.9.3 → ^4.10.0
+
+### Infrastructure
+- **Node.js:** 22.x → 24.x (Dockerfile updated)
+
+---
+
+## 2. React 19 Compiler Optimizations
+
+### Manual Memoization Removed
+
+React 19's new compiler automatically optimizes components, making manual memoization unnecessary and potentially counterproductive.
+
+#### 2.1 `useMemo` Hook Removals
+
+**Example - Job Watchers:**
+```javascript
+// BEFORE
+const jobWatchers = useMemo(() => (watcherData?.job_watchers ? [...watcherData.job_watchers] : []), [watcherData]);
+
+// AFTER
+// Do NOT clone arrays; keep referential stability for React Compiler and to reduce rerenders.
+const jobWatchers = watcherData?.job_watchers ?? EMPTY_ARRAY;
+```
+
+**Benefits:**
+- Eliminates unnecessary array cloning
+- Maintains referential stability for React Compiler
+- Reduces re-renders
+- Cleaner, more readable code
+
+**Files Affected:**
+- Multiple kanban components
+- Production board components
+- Job management components
+
+#### 2.2 `useCallback` Hook Removals
+
+**Example - Card Lookup Function:**
+```javascript
+// BEFORE
+const getCardByID = useCallback((data, cardId) => {
+  for (const lane of data.lanes) {
+    for (const card of lane.cards) {
+      // ... logic
+    }
+  }
+}, [/* dependencies */]);
+
+// AFTER
+const getCardByID = (data, cardId) => {
+  for (const lane of data.lanes) {
+    for (const card of lane.cards) {
+      // ... logic
+    }
+  }
+};
+```
+
+**Benefits:**
+- React 19 compiler automatically optimizes function references
+- Reduced complexity in component code
+- No need to manage dependency arrays
+
+**Files Affected:**
+- production-board-kanban.component.jsx
+- production-board-kanban.container.jsx
+- Multiple board controller components
+
+#### 2.3 `React.memo()` Wrapper Removals
+
+**Example - EllipsesToolTip Component:**
+```javascript
+// BEFORE
+const EllipsesToolTip = memo(({ title, children, kiosk }) => {
+  if (kiosk || !title) {
+    return <div className="ellipses no-select">{children}</div>;
+  }
+  return (
+    <Tooltip title={title}>
+      <div className="ellipses no-select">{children}</div>
+    </Tooltip>
+  );
+});
+EllipsesToolTip.displayName = "EllipsesToolTip";
+
+// AFTER
+function EllipsesToolTip({ title, children, kiosk }) {
+  if (kiosk || !title) {
+    return <div className="ellipses no-select">{children}</div>;
+  }
+  return (
+    <Tooltip title={title}>
+      <div className="ellipses no-select">{children}</div>
+    </Tooltip>
+  );
+}
+```
+
+**Benefits:**
+- Compiler handles optimization automatically
+- No need for manual displayName assignment
+- Standard function syntax is cleaner
+
+**Files Affected:**
+- production-board-kanban-card.component.jsx
+- EllipsesToolTip components
+- Various utility components
+
+---
+
+## 3. State Management Optimizations
+
+### Deep Cloning Elimination
+
+React 19's compiler efficiently handles change detection, eliminating the need for manual deep cloning.
+
+**Example - Board Lanes State Update:**
+```javascript
+// BEFORE
+setBoardLanes((prevBoardLanes) => {
+  const deepClonedData = cloneDeep(newBoardData);
+  if (!isEqual(prevBoardLanes, deepClonedData)) {
+    return deepClonedData;
+  }
+  return prevBoardLanes;
+});
+
+// AFTER
+setBoardLanes(newBoardData);
+```
+
+**Benefits:**
+- Removed lodash dependencies (`cloneDeep`, `isEqual`) from components
+- Reduced memory overhead
+- Faster state updates
+- React 19's compiler handles change detection efficiently
+
+---
+
+## 4. Import Cleanup
+
+### React Import Simplifications
+
+**Example - Removed Unnecessary Hook Imports:**
+```javascript
+// BEFORE
+import { useMemo, useState, useEffect, useCallback } from "react";
+
+// AFTER
+import { useState, useEffect } from "react";
+```
+
+Multiple files had their React imports streamlined by removing `useMemo`, `useCallback`, and `memo` imports that are no longer needed.
+
+---
+
+## 5. Apollo Client 4.x Migration
+
+### Import Path Changes
+
+Apollo Client 4.x requires React-specific imports to come from `@apollo/client/react` instead of the main package.
+
+**Example - Hook Imports:**
+```javascript
+// BEFORE (Apollo Client 3.x)
+import { useQuery, useMutation, useLazyQuery } from "@apollo/client";
+import { ApolloProvider } from "@apollo/client";
+import { useApolloClient } from "@apollo/client";
+
+// AFTER (Apollo Client 4.x)
+import { useQuery, useMutation, useLazyQuery } from "@apollo/client/react";
+import { ApolloProvider } from "@apollo/client/react";
+import { useApolloClient } from "@apollo/client/react";
+```
+
+**Benefits:**
+- Better tree-shaking for non-React Apollo Client usage
+- Clearer separation between core and React-specific functionality
+- Reduced bundle size for React-only applications
+
+**Files Affected:**
+- All components using Apollo hooks (50+ files)
+- Main app provider component
+- GraphQL container components
+
+### `useLazyQuery` API Changes
+
+The return value destructuring pattern for `useLazyQuery` changed in Apollo Client 4.x.
+
+**Example - Query Function Extraction:**
+```javascript
+// BEFORE (Apollo Client 3.x)
+const [, { data, refetch, queryLoading }] = useLazyQuery(QUERY_RO_AND_OWNER_BY_JOB_PKS, {
+  variables: { jobids: [context.jobid] },
+  skip: !context?.jobid
+});
+
+// AFTER (Apollo Client 4.x)
+const [loadRoAndOwnerByJobPks, { data, loading: queryLoading, error: queryError, refetch, called }] = useLazyQuery(
+  QUERY_RO_AND_OWNER_BY_JOB_PKS
+);
+
+// Call the query function explicitly when needed
+useEffect(() => {
+  if (context?.jobid) {
+    loadRoAndOwnerByJobPks({ variables: { jobids: [context.jobid] } });
+  }
+}, [context?.jobid, loadRoAndOwnerByJobPks]);
+```
+
+**Key Changes:**
+- **Query function must be destructured**: Previously ignored with `,` now must be named
+- **Options moved to function call**: `variables` and other options passed when calling the query function
+- **`loading` renamed**: More consistent with `useQuery` hook naming
+- **`called` property added**: Track if the query has been executed at least once
+- **No more `skip` option**: Logic moved to conditional query execution
+
+**Benefits:**
+- More explicit control over when queries execute
+- Better alignment with `useQuery` API patterns
+- Clearer code showing query execution timing
+
+**Files Affected:**
+- card-payment-modal.component.jsx
+- bill-form.container.jsx
+- Multiple job and payment components
+
+---
+
+## 6. forwardRef Pattern Migration
+
+React 19 simplifies ref handling by allowing `ref` to be passed as a regular prop, eliminating the need for `forwardRef` in most cases.
+
+### forwardRef Wrapper Removal
+
+**Example - Component Signature Change:**
+```javascript
+// BEFORE
+import { forwardRef } from "react";
+
+const BillLineSearchSelect = ({ options, disabled, allowRemoved, ...restProps }, ref) => {
+  const { t } = useTranslation();
+  
+  return (
+    <Select 
+      ref={ref}
+      options={generateOptions(options, allowRemoved, t)}
+      disabled={disabled}
+      {...restProps}
+    />
+  );
+};
+
+export default forwardRef(BillLineSearchSelect);
+
+// AFTER
+const BillLineSearchSelect = ({ options, disabled, allowRemoved, ref, ...restProps }) => {
+  const { t } = useTranslation();
+  
+  return (
+    <Select 
+      ref={ref}
+      options={generateOptions(options, allowRemoved, t)}
+      disabled={disabled}
+      {...restProps}
+    />
+  );
+};
+
+export default BillLineSearchSelect;
+```
+
+**Key Changes:**
+- **`ref` as regular prop**: Moved from second parameter to first parameter as a regular prop
+- **No `forwardRef` import needed**: Removed from React imports
+- **No `forwardRef` wrapper**: Export component directly
+- **Same ref behavior**: Works identically from parent component perspective
+
+**Benefits:**
+- Simpler component API (single parameter instead of two)
+- Reduced boilerplate code
+- Better TypeScript inference
+- More intuitive for developers
+
+**Components Migrated:**
+- BillLineSearchSelect
+- ContractStatusComponent
+- CourtesyCarFuelComponent
+- CourtesyCarReadinessComponent
+- CourtesyCarStatusComponent
+- EmployeeTeamSearchSelect
+- FormInputNumberCalculator
+- FormItemCurrency
+- FormItemEmail
+- 10+ additional form components
+
+---
+
+## 7. React.lazy Import Cleanup
+
+React 19 makes `React.lazy` usage more seamless, and in some cases lazy imports were removed where they were no longer beneficial.
+
+**Example - Lazy Import Removal:**
+```javascript
+// BEFORE
+import { lazy, Suspense, useEffect, useRef, useState } from "react";
+
+const LazyComponent = lazy(() => import('./HeavyComponent'));
+
+// AFTER
+import { Suspense, useEffect, useRef, useState } from "react";
+
+// Lazy loading handled differently or component loaded directly
+```
+
+**Context:**
+- Some components had lazy imports removed where the loading behavior wasn't needed
+- `Suspense` boundaries maintained for actual lazy-loaded components
+- React 19 improves Suspense integration
+
+**Files Affected:**
+- Multiple route components
+- Dashboard components
+- Heavy data visualization components
+
+---
+
+## 8. StrictMode Integration
+
+React 19's StrictMode was explicitly added to help catch potential issues during development.
+
+**Addition:**
+```javascript
+import { StrictMode } from "react";
+
+root.render(
+  <StrictMode>
+    <App />
+  </StrictMode>
+);
+```
+
+**Benefits:**
+- Detects unexpected side effects
+- Warns about deprecated APIs
+- Validates React 19 best practices
+- Double-invokes effects in development to catch issues
+
+**Impact:**
+- Helps ensure components work correctly with React 19 compiler
+- Catches potential issues with state management
+- Comment added: "This handles React StrictMode double-mounting"
+
+---
+
+## 9. React 19 New Hooks (Added Documentation)
+
+The upgrade includes documentation for React 19's new concurrent hooks:
+
+### `useFormStatus`
+Track form submission state for better UX during async operations.
+
+### `useOptimistic`
+Implement optimistic UI updates that rollback on failure.
+
+### `useActionState`
+Manage server actions with pending states and error handling.
+
+---
+
+## 10. ESLint Configuration Updates
+
+### React Compiler Plugin Added
+
+**Addition to eslint.config.js:**
+```javascript
+plugins: {
+  "react-compiler": pluginReactCompiler
+},
+rules: {
+  "react-compiler/react-compiler": "error"
+}
+```
+
+**Purpose:**
+- Enforces React 19 compiler best practices
+- Warns about patterns that prevent compiler optimizations
+- Ensures code is compatible with automatic optimizations
+
+---
+
+## 11. Testing Library Updates
+
+### @testing-library/react
+- **Upgraded:** ^16.3.1 → ^16.3.2
+- **Impact:** React 19 compatibility maintained
+- Tests continue to work with updated React APIs
+
+---
+
+## 12. Peer Dependencies Updates
+
+Multiple packages updated their peer dependency requirements to support React 19:
+
+**Examples:**
+```json
+// BEFORE
+"peerDependencies": {
+  "react": ">=16.9.0",
+  "react-dom": ">=16.9.0"
+}
+
+// AFTER
+"peerDependencies": {
+  "react": ">=18.0.0",
+  "react-dom": ">=18.0.0"
+}
+```
+
+**Affected Packages:**
+- Multiple internal and external dependencies
+- Ensures ecosystem compatibility with React 19
+
+---
+
+## 13. Ant Design 6 Changes
+
+### Icon Package Update
+- @ant-design/icons upgraded from ^5.6.1 to ^6.1.0
+- Icon imports remain compatible (no breaking changes in usage patterns)
+
+### Component API Compatibility
+- Existing Ant Design component usage remains largely compatible
+- Form.Item, Button, Modal, Table, and other components work with existing code
+- No major API breaking changes required in application code
+
+---
+
+## 14. Validation & Quality Assurance
+
+Based on the optimization summary included in the changes:
+
+### Deprecations Verified as Fixed ✓
+- **propTypes:** None found (already removed or using TypeScript)
+- **defaultProps:** None found (using default parameters instead)
+- **ReactDOM.render:** Already using createRoot
+- **componentWillMount/Receive/Update:** No legacy lifecycle methods found
+- **String refs:** Migrated to ref objects and useRef hooks
+
+### Performance Improvements
+- Cleaner, more readable code
+- Reduced bundle size (removed unnecessary memoization wrappers)
+- Better performance through compiler-optimized memoization
+- Fewer function closures and re-creations
+- Reduced memory overhead from eliminated deep cloning
+
+---
+
+## Summary Statistics
+
+### Dependencies Updated
+- **Core:** 3 major updates (React, Ant Design, Apollo Client)
+- **GraphQL:** 2 packages (Apollo Client 3→4, apollo-link-logger 2→3)
+- **Ecosystem:** 10+ related libraries (router, i18next, grid layout, etc.)
+- **Build Tools:** 3 plugins/tools (Vite plugins, vitest)
+- **Monitoring:** 6 packages (Sentry, LogRocket, PostHog, Amplitude)
+- **Infrastructure:** Node.js 22 → 24
+
+### Code Patterns Modernized
+- **useMemo removals:** 15+ instances across multiple files
+- **useCallback removals:** 10+ instances
+- **memo() wrapper removals:** 5+ components
+- **Deep clone eliminations:** Multiple state management simplifications
+- **Import cleanups:** Dozens of simplified import statements
+- **Apollo import migrations:** 50+ files updated to `/react` imports
+- **forwardRef removals:** 15+ components migrated to direct ref props
+- **useLazyQuery updates:** Multiple query patterns updated for Apollo 4.x API
+- **lazy import cleanups:** Several unnecessary lazy imports removed
+- **StrictMode integration:** Added to development builds
+
+### Files Impacted
+- **Production board kanban components:** Compiler optimization removals
+- **Trello-board controllers and components:** Memoization removals
+- **Job management components:** State management simplifications
+- **All GraphQL components:** Apollo Client 4.x import migrations (50+ files)
+- **Form components:** forwardRef pattern migrations (15+ components)
+- **Payment components:** useLazyQuery API updates
+- **Various utility components:** Import cleanups
+- **Build configuration files:** ESLint React compiler plugin
+- **Docker infrastructure:** Node.js 22→24 upgrade
+- **App root:** StrictMode integration
+- **Package manifests:** 30+ dependency upgrades
+
+---
+
+## Recommendations for Future Development
+
+1. **Avoid Manual Memoization:** Let React 19 compiler handle optimization automatically
+2. **Use ESLint React Compiler Plugin:** Catch patterns that prevent optimizations
+3. **Maintain Referential Stability:** Use constant empty arrays/objects instead of creating new ones
+4. **Leverage New React 19 Hooks:** Use `useOptimistic`, `useFormStatus`, and `useActionState` for better UX
+5. **Monitor Compiler Warnings:** Address any compiler optimization warnings during development
+6. **Apollo Client 4.x Imports:** Always import React hooks from `@apollo/client/react`
+7. **Ref as Props:** Use `ref` as a regular prop instead of `forwardRef` wrapper
+8. **useLazyQuery Pattern:** Extract query function and call explicitly rather than using `skip` option
+9. **StrictMode Aware:** Ensure components handle double-mounting in development properly
+10. **Keep Dependencies Updated:** Monitor for peer dependency compatibility as ecosystem evolves
+
+---
+
+## Conclusion
+
+This comprehensive upgrade successfully modernizes the codebase across multiple dimensions:
+
+### Major Achievements
+1. **React 19 Migration:** Leveraged new compiler optimizations by removing manual memoization
+2. **Apollo Client 4.x:** Updated all GraphQL operations to new import patterns and APIs
+3. **Ant Design 6:** Maintained UI consistency while gaining access to latest features
+4. **forwardRef Elimination:** Simplified 15+ components by using refs as regular props
+5. **Dependency Modernization:** Updated 30+ packages including monitoring, build tools, and ecosystem libraries
+6. **Infrastructure Upgrade:** Node.js 24.x support for latest runtime features
+
+### Code Quality Improvements
+- **Cleaner code:** Removed unnecessary wrappers and boilerplate
+- **Better performance:** Compiler-optimized rendering without manual hints
+- **Reduced bundle size:** Removed lodash cloning, unnecessary lazy imports, and redundant memoization
+- **Improved maintainability:** Simpler patterns that are easier to understand and modify
+- **Enhanced DX:** ESLint integration catches optimization blockers during development
+
+### Migration Completeness
+✅ All React 18→19 deprecations addressed  
+✅ All Apollo Client 3→4 breaking changes handled  
+✅ All Ant Design 5→6 updates applied  
+✅ All monitoring libraries updated to latest versions  
+✅ StrictMode integration for development safety  
+✅ Comprehensive testing library compatibility maintained  
+
+**No breaking changes to application functionality** - The upgrade maintains backward compatibility in behavior while providing forward-looking improvements in implementation.
--- a/client/.env.development.imex
+++ b/client/.env.development.imex
@@ -18,4 +18,3 @@ VITE_PUBLIC_POSTHOG_KEY=phc_xtLmBIu0rjWwExY73Oj5DTH1bGbwq1G1Y8jnlTceien
 VITE_PUBLIC_POSTHOG_HOST=https://us.i.posthog.com
 VITE_APP_AMP_URL=https://vp8k908qy2.execute-api.ca-central-1.amazonaws.com
 VITE_APP_AMP_KEY=6228a598e57cd66875cfd41604f1f891
-VITE_ENABLE_COMPILER_IN_DEV=1
--- a/client/.env.development.rome
+++ b/client/.env.development.rome
@@ -20,4 +20,3 @@ VITE_PUBLIC_POSTHOG_KEY=phc_xtLmBIu0rjWwExY73Oj5DTH1bGbwq1G1Y8jnlTceien
 VITE_PUBLIC_POSTHOG_HOST=https://us.i.posthog.com
 VITE_APP_AMP_URL=https://vp8k908qy2.execute-api.ca-central-1.amazonaws.com
 VITE_APP_AMP_KEY=46b1193a867d4e3131ae4c3a64a3fc78
-VITE_ENABLE_COMPILER_IN_DEV=1
--- a/client/.gitignore
+++ b/client/.gitignore
@@ -13,3 +13,6 @@ playwright/.cache/
 # Sentry Config File
 .sentryclirc
 /dev-dist
+
+# Local environment overrides (not version controlled)
+.env.development.local.overrides
--- a/client/package-lock.json
+++ b/client/package-lock.json
--- a/client/package.json
+++ b/client/package.json
@@ -8,9 +8,9 @@
  "private": true,
  "proxy": "http://localhost:4000",
  "dependencies": {
-    "@amplitude/analytics-browser": "^2.33.4",
+    "@amplitude/analytics-browser": "^2.34.0",
    "@ant-design/pro-layout": "^7.22.6",
-    "@apollo/client": "^4.1.1",
+    "@apollo/client": "^4.1.3",
    "@emotion/is-prop-valid": "^1.4.0",
    "@fingerprintjs/fingerprintjs": "^5.0.1",
    "@firebase/analytics": "^0.10.19",
@@ -21,14 +21,14 @@
    "@jsreport/browser-client": "^3.1.0",
    "@reduxjs/toolkit": "^2.11.2",
    "@sentry/cli": "^3.1.0",
-    "@sentry/react": "^10.35.0",
-    "@sentry/vite-plugin": "^4.7.0",
+    "@sentry/react": "^10.38.0",
+    "@sentry/vite-plugin": "^4.8.0",
    "@splitsoftware/splitio-react": "^2.6.1",
-    "@tanem/react-nprogress": "^5.0.56",
-    "antd": "^6.2.1",
+    "@tanem/react-nprogress": "^5.0.58",
+    "antd": "^6.2.2",
    "apollo-link-logger": "^3.0.0",
    "autosize": "^6.0.1",
-    "axios": "^1.13.2",
+    "axios": "^1.13.4",
    "classnames": "^2.5.1",
    "css-box-model": "^1.2.1",
    "dayjs": "^1.11.19",
@@ -38,31 +38,31 @@
    "env-cmd": "^11.0.0",
    "exifr": "^7.1.3",
    "graphql": "^16.12.0",
-    "graphql-ws": "^6.0.6",
+    "graphql-ws": "^6.0.7",
    "i18next": "^25.8.0",
    "i18next-browser-languagedetector": "^8.2.0",
    "immutability-helper": "^3.1.1",
-    "libphonenumber-js": "^1.12.34",
-    "lightningcss": "^1.31.0",
-    "logrocket": "^11.0.0",
+    "libphonenumber-js": "^1.12.36",
+    "lightningcss": "^1.31.1",
+    "logrocket": "^12.0.0",
    "markerjs2": "^2.32.7",
    "memoize-one": "^6.0.0",
    "normalize-url": "^8.1.1",
    "object-hash": "^3.0.0",
-    "phone": "^3.1.69",
-    "posthog-js": "^1.335.0",
+    "phone": "^3.1.70",
+    "posthog-js": "^1.336.4",
    "prop-types": "^15.8.1",
    "query-string": "^9.3.1",
    "raf-schd": "^4.0.3",
-    "react": "^19.2.3",
+    "react": "^19.2.4",
    "react-big-calendar": "^1.19.4",
    "react-color": "^2.19.3",
    "react-cookie": "^8.0.1",
-    "react-dom": "^19.2.3",
+    "react-dom": "^19.2.4",
    "react-drag-listview": "^2.0.0",
    "react-grid-gallery": "^1.0.1",
    "react-grid-layout": "^2.2.2",
-    "react-i18next": "^16.5.3",
+    "react-i18next": "^16.5.4",
    "react-icons": "^5.5.0",
    "react-image-lightbox": "^5.1.4",
    "react-markdown": "^10.1.0",
@@ -71,10 +71,10 @@
    "react-product-fruits": "^2.2.62",
    "react-redux": "^9.2.0",
    "react-resizable": "^3.1.3",
-    "react-router-dom": "^7.12.0",
+    "react-router-dom": "^7.13.0",
    "react-sticky": "^6.0.3",
    "react-virtuoso": "^4.18.1",
-    "recharts": "^3.6.0",
+    "recharts": "^3.7.0",
    "redux": "^5.0.1",
    "redux-actions": "^3.0.3",
    "redux-persist": "^6.0.0",
@@ -82,7 +82,7 @@
    "redux-state-sync": "^3.1.4",
    "reselect": "^5.1.1",
    "rxjs": "^7.8.2",
-    "sass": "^1.97.2",
+    "sass": "^1.97.3",
    "socket.io-client": "^4.8.3",
    "styled-components": "^6.3.8",
    "vite-plugin-ejs": "^1.7.0",
@@ -92,15 +92,17 @@
    "postinstall": "echo 'when updating react-big-calendar, remember to check to localizer in the calendar wrapper'",
    "analyze": "source-map-explorer 'build/static/js/*.js'",
    "start": "vite",
-    "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",
-    "preview:imex": "dotenvx run --env-file=.env.development.imex -- vite preview",
-    "preview:rome": "dotenvx run --env-file=.env.development.rome -- 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:production:imex": "env-cmd -f .env.production.imex -- npm run build",
-    "build:production:rome": "env-cmd -f .env.production.rome -- npm run build",
+    "build": "vite build",
+    "build:dev:imex": "dotenvx run --env-file=.env.development.imex --env-file=.env.development.local.overrides -- vite build",
+    "build:dev:rome": "dotenvx run --env-file=.env.development.rome --env-file=.env.development.local.overrides -- vite build",
+    "build:test:imex": "dotenvx run --env-file=.env.test.imex -- vite build",
+    "build:test:rome": "dotenvx run --env-file=.env.test.rome -- vite build",
+    "build:production:imex": "env-cmd -f .env.production.imex vite build",
+    "build:production:rome": "env-cmd -f .env.production.rome vite build",
+    "start:imex": "dotenvx run --env-file=.env.development.imex --env-file=.env.development.local.overrides -- vite",
+    "start:rome": "dotenvx run --env-file=.env.development.rome --env-file=.env.development.local.overrides -- vite",
+    "preview:imex": "dotenvx run --env-file=.env.development.imex --env-file=.env.development.local.overrides -- vite preview",
+    "preview:rome": "dotenvx run --env-file=.env.development.rome --env-file=.env.development.local.overrides -- vite preview",
    "madge": "madge  --image ./madge-graph.svg --extensions js,jsx,ts,tsx --circular .",
    "eulaize": "node src/utils/eulaize.js",
    "test:unit": "vitest run",
@@ -151,7 +153,7 @@
    "eslint": "^9.39.2",
    "eslint-plugin-react": "^7.37.5",
    "eslint-plugin-react-compiler": "^19.1.0-rc.2",
-    "globals": "^17.1.0",
+    "globals": "^17.2.0",
    "jsdom": "^27.4.0",
    "memfs": "^4.56.10",
    "os-browserify": "^0.3.0",
--- a/client/src/App/App.jsx
+++ b/client/src/App/App.jsx
@@ -100,14 +100,7 @@ export function App({
    if (currentUser.authorized && bodyshop) {
      client.setAttribute("imexshopid", bodyshop.imexshopid);

-      if (
-        client.getTreatment("LogRocket_Tracking") === "on" ||
-        window.location.hostname ===
-          InstanceRenderMgr({
-            imex: "beta.imex.online",
-            rome: "beta.romeonline.io"
-          })
-      ) {
+      if (client.getTreatment("LogRocket_Tracking") === "on") {
        console.log("LR Start");
        LogRocket.init(
          InstanceRenderMgr({
--- a/client/src/components/accounting-payables-table/accounting-payables-table.component.jsx
+++ b/client/src/components/accounting-payables-table/accounting-payables-table.component.jsx
@@ -169,7 +169,13 @@ export function AccountingPayablesTableComponent({ bodyshop, loading, bills, ref
            refetch={refetch}
          />
          {bodyshop.accountingconfig && bodyshop.accountingconfig.qbo && <QboAuthorizeComponent />}
-          <Input value={state.search} onChange={handleSearch} placeholder={t("general.labels.search")} allowClear />
+          <Input
+            value={state.search}
+            onChange={handleSearch}
+            placeholder={t("general.labels.search")}
+            allowClear
+            enterButton
+          />
        </Space>
      }
    >
--- a/client/src/components/accounting-payments-table/accounting-payments-table.component.jsx
+++ b/client/src/components/accounting-payments-table/accounting-payments-table.component.jsx
@@ -182,7 +182,13 @@ export function AccountingPayablesTableComponent({ bodyshop, loading, payments,
            refetch={refetch}
          />
          {bodyshop.accountingconfig && bodyshop.accountingconfig.qbo && <QboAuthorizeComponent />}
-          <Input value={state.search} onChange={handleSearch} placeholder={t("general.labels.search")} allowClear />
+          <Input
+            value={state.search}
+            onChange={handleSearch}
+            placeholder={t("general.labels.search")}
+            allowClear
+            enterButton
+          />
        </Space>
      }
    >
--- a/client/src/components/accounting-receivables-table/accounting-receivables-table.component.jsx
+++ b/client/src/components/accounting-receivables-table/accounting-receivables-table.component.jsx
@@ -204,6 +204,7 @@ export function AccountingReceivablesTableComponent({ bodyshop, loading, jobs, r
            onChange={handleSearch}
            placeholder={t("general.labels.search")}
            allowClear
+            enterButton
          />
        </Space>
      }
--- a/client/src/components/bill-detail-edit/bill-detail-edit-return.component.jsx
+++ b/client/src/components/bill-detail-edit/bill-detail-edit-return.component.jsx
@@ -48,7 +48,7 @@ export function BillDetailEditReturn({ setPartsOrderContext, data, disabled }) {
              //  db_price: i.actual_price,
              act_price: i.actual_price,
              cost: i.actual_cost,
-              quantity: i.quantity,
+              part_qty: i.quantity,
              joblineid: i.joblineid,
              oem_partno: i.jobline && i.jobline.oem_partno,
              part_type: i.jobline && i.jobline.part_type
@@ -104,6 +104,10 @@ export function BillDetailEditReturn({ setPartsOrderContext, data, disabled }) {
                    {fields.map((field, index) => (
                      <tr key={field.key}>
                        <td>
+                          {/* Hidden field to preserve the id */}
+                          <Form.Item name={[field.name, "id"]} hidden>
+                            <input type="hidden" />
+                          </Form.Item>
                          <Form.Item
                            //   label={t("joblines.fields.selected")}
                            key={`${index}selected`}
--- a/client/src/components/bills-list-table/bills-list-table.component.jsx
+++ b/client/src/components/bills-list-table/bills-list-table.component.jsx
@@ -232,6 +232,7 @@ export function BillsListTableComponent({
              e.preventDefault();
              setSearchText(e.target.value);
            }}
+            enterButton
          />
        </Space>
      }
--- a/client/src/components/chat-popup/chat-popup.component.jsx
+++ b/client/src/components/chat-popup/chat-popup.component.jsx
@@ -108,9 +108,12 @@ export function ChatPopupComponent({ chatVisible, selectedConversation, toggleCh
    hasLoadedConversationsOnceRef.current = true;

    getConversations({ variables: { offset: 0 } }).catch((err) => {
-      console.error(`Error fetching conversations: ${err?.message || ""}`, err);
+      // Ignore abort errors (they're expected when component unmounts)
+      if (err?.name !== "AbortError") {
+        console.error(`Error fetching conversations: ${err?.message || ""}`, err);
+      }
    });
-  }, [getConversations]);
+  }, []);

  const handleManualRefresh = async () => {
    try {
--- a/client/src/components/contract-cars/contract-cars.component.jsx
+++ b/client/src/components/contract-cars/contract-cars.component.jsx
@@ -99,6 +99,7 @@ export default function ContractsCarsComponent({ loading, data, selectedCarId, h
          placeholder={t("general.labels.search")}
          value={state.search}
          onChange={(e) => setState({ ...state, search: e.target.value })}
+          enterButton
        />
      }
    >
--- a/client/src/components/contract-form/contract-form.component.jsx
+++ b/client/src/components/contract-form/contract-form.component.jsx
@@ -1,5 +1,5 @@
 import { WarningFilled } from "@ant-design/icons";
-import { Form, Input, InputNumber, Space } from "antd";
+import { Card, Form, Input, InputNumber, Space } from "antd";
 import { useTranslation } from "react-i18next";
 import { DateFormatter } from "../../utils/DateFormatter";
 import dayjs from "../../utils/day";
@@ -19,9 +19,9 @@ import ContractFormJobPrefill from "./contract-form-job-prefill.component";
 export default function ContractFormComponent({ form, create = false, selectedJobState, selectedCar }) {
  const { t } = useTranslation();
  return (
-    <>
+    <Card>
      {!create && <FormFieldsChanged form={form} />}
-      <LayoutFormRow>
+      <LayoutFormRow noDivider={true}>
        {!create && (
          <Form.Item
            label={t("contracts.fields.status")}
@@ -310,6 +310,6 @@ export default function ContractFormComponent({ form, create = false, selectedJo
          <InputNumber precision={2} />
        </Form.Item>
      </LayoutFormRow>
-    </>
+    </Card>
  );
 }
--- a/client/src/components/contract-jobs/contract-jobs.component.jsx
+++ b/client/src/components/contract-jobs/contract-jobs.component.jsx
@@ -123,6 +123,7 @@ export default function ContractsJobsComponent({ loading, data, selectedJob, han
          placeholder={t("general.labels.search")}
          value={state.search}
          onChange={(e) => setState({ ...state, search: e.target.value })}
+          enterButton
        />
      }
    >
--- a/client/src/components/contracts-list/contracts-list.component.jsx
+++ b/client/src/components/contracts-list/contracts-list.component.jsx
@@ -164,6 +164,7 @@ export function ContractsList({ bodyshop, loading, contracts, refetch, total, se
              const updatedSearch = { ...search, search: value };
              history({ search: queryString.stringify(updatedSearch) });
            }}
+            enterButton
          />
        </Space>
      }
--- a/client/src/components/courtesy-car-form/courtesy-car-form.component.jsx
+++ b/client/src/components/courtesy-car-form/courtesy-car-form.component.jsx
@@ -1,6 +1,6 @@
 import { WarningFilled } from "@ant-design/icons";
 import { useApolloClient } from "@apollo/client/react";
-import { Button, Form, Input, InputNumber, Space } from "antd";
+import { Button, Card, Form, Input, InputNumber, Space } from "antd";
 import { PageHeader } from "@ant-design/pro-layout";
 import dayjs from "../../utils/day";
 import { useTranslation } from "react-i18next";
@@ -19,7 +19,7 @@ export default function CourtesyCarCreateFormComponent({ form, saveLoading, newC
  const client = useApolloClient();

  return (
-    <div>
+    <Card>
      <PageHeader
        title={t("menus.header.courtesycars")}
        extra={
@@ -314,6 +314,6 @@ export default function CourtesyCarCreateFormComponent({ form, saveLoading, newC
          <CurrencyInput />
        </Form.Item>
      </LayoutFormRow>
-    </div>
+    </Card>
  );
 }
--- a/client/src/components/dashboard-components/monthly-job-costing/monthly-job-costing.component.jsx
+++ b/client/src/components/dashboard-components/monthly-job-costing/monthly-job-costing.component.jsx
@@ -96,6 +96,7 @@ export default function DashboardMonthlyJobCosting({ data, ...cardProps }) {
              e.preventDefault();
              setSearchText(e.target.value);
            }}
+            enterButton
          />
        </Space>
      }
--- a/client/src/components/dms-cdk-makes/dms-cdk-makes.component.jsx
+++ b/client/src/components/dms-cdk-makes/dms-cdk-makes.component.jsx
@@ -49,12 +49,15 @@ export function DmsCdkVehicles({ form, job }) {
        open={open}
        onCancel={() => setOpen(false)}
        onOk={() => {
-          form.setFieldsValue({
-            dms_make: selectedModel.makecode,
-            dms_model: selectedModel.modelcode
-          });
-          setOpen(false);
+          if (selectedModel) {
+            form.setFieldsValue({
+              dms_make: selectedModel.makecode,
+              dms_model: selectedModel.modelcode
+            });
+            setOpen(false);
+          }
        }}
+        okButtonProps={{ disabled: !selectedModel }}
      >
        {error && <AlertComponent title={error.message} type="error" />}
        <Table
@@ -62,6 +65,7 @@ export function DmsCdkVehicles({ form, job }) {
            <Input.Search
              onSearch={(val) => callSearch({ variables: { search: val } })}
              placeholder={t("general.labels.search")}
+              enterButton
            />
          )}
          columns={columns}
--- a/client/src/components/dms-customer-selector/fortellis-customer-selector.jsx
+++ b/client/src/components/dms-customer-selector/fortellis-customer-selector.jsx
@@ -53,13 +53,13 @@ export default function FortellisCustomerSelector({ bodyshop, jobid, socket }) {
      render: (_t, r) => <Checkbox disabled checked={r.vinOwner} />
    },
    {
-      title: t("jobs.fields.dms.name1"),
+      title: t("jobs.fields.dms.first_name"),
      dataIndex: ["customerName", "firstName"],
      key: "firstName",
      sorter: (a, b) => alphaSort(a.customerName?.firstName, b.customerName?.firstName)
    },
    {
-      title: t("jobs.fields.dms.name1"),
+      title: t("jobs.fields.dms.last_name"),
      dataIndex: ["customerName", "lastName"],
      key: "lastName",
      sorter: (a, b) => alphaSort(a.customerName?.lastName, b.customerName?.lastName)
--- a/client/src/components/dms-post-form/cdklike-dms-post-form.jsx
+++ b/client/src/components/dms-post-form/cdklike-dms-post-form.jsx
@@ -272,7 +272,7 @@ export default function CdkLikePostForm({ bodyshop, socket, job, logsRef, mode,
                        name={[field.name, "name"]}
                        rules={[{ required: true }]}
                      >
-                        <Select style={{ minWidth: "15rem" }} onSelect={(value) => handlePayerSelect(value, index)}>
+                        <Select style={{ width: "100%" }} onSelect={(value) => handlePayerSelect(value, index)}>
                          {bodyshop.cdk_configuration?.payers?.map((payer) => (
                            <Select.Option key={payer.name}>{payer.name}</Select.Option>
                          ))}
--- a/client/src/components/job-costing-parts-table/job-costing-parts-table.component.jsx
+++ b/client/src/components/job-costing-parts-table/job-costing-parts-table.component.jsx
@@ -76,6 +76,7 @@ export default function JobCostingPartsTable({ data, summaryData }) {
                  e.preventDefault();
                  setSearchText(e.target.value);
                }}
+                enterButton
              />
            </Space>
          );
--- a/client/src/components/job-create-iou/job-create-iou.component.jsx
+++ b/client/src/components/job-create-iou/job-create-iou.component.jsx
@@ -50,7 +50,8 @@ export function JobCreateIOU({ bodyshop, currentUser, job, selectedJobLines, tec
      config: {
        status: bodyshop.md_ro_statuses.default_open,
        bodyshopid: bodyshop.id,
-        useremail: currentUser.email
+        useremail: currentUser.email,
+        timezone: bodyshop.timezone
      },
      currentUser
    });
--- a/client/src/components/job-detail-lines/job-lines.component.jsx
+++ b/client/src/components/job-detail-lines/job-lines.component.jsx
@@ -682,6 +682,7 @@ export function JobLinesComponent({
                e.preventDefault();
                setSearchText(e.target.value);
              }}
+              enterButton
            />
          </Space>
        }
--- a/client/src/components/jobs-available-scan/jobs-available-scan.component.jsx
+++ b/client/src/components/jobs-available-scan/jobs-available-scan.component.jsx
@@ -136,6 +136,7 @@ export function JobsAvailableScan({ partnerVersion, refetch }) {
            onChange={(e) => {
              setSearchText(e.currentTarget.value);
            }}
+            enterButton
          />
        </Space>
      }
--- a/client/src/components/jobs-available-table/jobs-available-table.component.jsx
+++ b/client/src/components/jobs-available-table/jobs-available-table.component.jsx
@@ -196,13 +196,16 @@ export function JobsAvailableComponent({ bodyshop, loading, data, refetch, addJo
          >
            {t("general.actions.deleteall")}
          </Button>
-
          <Input.Search
            placeholder={t("general.labels.search")}
            onChange={(e) => {
              setSearchText(e.currentTarget.value);
            }}
+            enterButton
          />
+          <Link to="/manage/jobs/new">
+            <Button>{t("jobs.actions.manualnew")}</Button>
+          </Link>
        </Space>
      }
    >
--- a/client/src/components/jobs-close-lines/jobs-close-lines.component.jsx
+++ b/client/src/components/jobs-close-lines/jobs-close-lines.component.jsx
@@ -42,6 +42,10 @@ export function JobsCloseLines({ bodyshop, job, jobRO }) {
              <tbody>
                {fields.map((field, index) => (
                  <tr key={field.key}>
+                    {/* Hidden field to preserve jobline ID */}
+                    <Form.Item hidden name={[field.name, "id"]}>
+                      <input />
+                    </Form.Item>
                    <td>
                      <Form.Item
                        //   label={t("joblines.fields.line_desc")}
--- a/client/src/components/jobs-create-vehicle-info/jobs-create-vehicle-info.predefined.component.jsx
+++ b/client/src/components/jobs-create-vehicle-info/jobs-create-vehicle-info.predefined.component.jsx
@@ -24,7 +24,7 @@ export default function JobsCreateVehicleInfoPredefined({ disabled, form }) {
    <div>
      <Table
        size="small"
-        title={() => <Input.Search onSearch={(value) => setSearch(value)} />}
+        title={() => <Input.Search onSearch={(value) => setSearch(value)} enterButton/>}
        dataSource={filteredPredefinedVehicles}
        columns={[
          {
--- a/client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.component.jsx
+++ b/client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.component.jsx
@@ -1,10 +1,11 @@
 import { DownCircleFilled } from "@ant-design/icons";
 import { useApolloClient, useMutation, useQuery } from "@apollo/client/react";
 import { useTreatmentsWithConfig } from "@splitsoftware/splitio-react";
-import { Button, Card, Dropdown, Form, Input, Modal, Popconfirm, Popover, Select, Space } from "antd";
+import { Button, Card, Dropdown, Form, Input, Modal, Popover, Select, Space } from "antd";
 import axios from "axios";
 import parsePhoneNumber from "libphonenumber-js";
 import { useCallback, useMemo, useRef, useState } from "react";
+import { HasRbacAccess } from "../../components/rbac-wrapper/rbac-wrapper.component";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { Link, useNavigate } from "react-router-dom";
@@ -20,7 +21,7 @@ import { selectJobReadOnly } from "../../redux/application/application.selectors
 import { setEmailOptions } from "../../redux/email/email.actions";
 import { openChatByPhone, setMessage } from "../../redux/messaging/messaging.actions";
 import { setModalContext } from "../../redux/modals/modals.actions";
-import { selectBodyshop, selectCurrentUser } from "../../redux/user/user.selectors";
+import { selectAuthLevel, selectBodyshop, selectCurrentUser } from "../../redux/user/user.selectors";
 import AuditTrailMapping from "../../utils/AuditTrailMappings";
 import { DateTimeFormatter } from "../../utils/DateFormatter";
 import { TemplateList } from "../../utils/TemplateConstants";
@@ -28,7 +29,6 @@ import dayjs from "../../utils/day";
 import { HasFeatureAccess } from "../feature-wrapper/feature-wrapper.component";
 import FormDateTimePickerComponent from "../form-date-time-picker/form-date-time-picker.component";
 import LockerWrapperComponent from "../lock-wrapper/lock-wrapper.component";
-import RbacWrapper from "../rbac-wrapper/rbac-wrapper.component";
 import ShareToTeamsButton from "../share-to-teams/share-to-teams.component.jsx";
 import AddToProduction from "./jobs-detail-header-actions.addtoproduction.util";
 import DuplicateJob from "./jobs-detail-header-actions.duplicate.util";
@@ -39,7 +39,8 @@ const EMPTY_ARRAY = Object.freeze([]);
 const mapStateToProps = createStructuredSelector({
  bodyshop: selectBodyshop,
  jobRO: selectJobReadOnly,
-  currentUser: selectCurrentUser
+  currentUser: selectCurrentUser,
+  authLevel: selectAuthLevel
 });

 const mapDispatchToProps = (dispatch) => ({
@@ -117,7 +118,8 @@ export function JobsDetailHeaderActions({
  openChatByPhone,
  setMessage,
  setTimeTicketTaskContext,
-  setTaskUpsertContext
+  setTaskUpsertContext,
+  authLevel
 }) {
  const { t } = useTranslation();
  const client = useApolloClient();
@@ -129,10 +131,6 @@ export function JobsDetailHeaderActions({
  const jobId = job?.id;
  const watcherVars = useMemo(() => ({ jobid: jobId }), [jobId]);

-  // Option A: coordinated Dropdown + Popconfirm open state so the menu doesn't unmount before Popconfirm renders.
-  const [confirmKey, setConfirmKey] = useState(null);
-  const confirmKeyRef = useRef(null);
-
  const [isCancelScheduleModalVisible, setIsCancelScheduleModalVisible] = useState(false);
  const [insertAppointment] = useMutation(INSERT_MANUAL_APPT);
  const [deleteJob] = useMutation(DELETE_JOB);
@@ -150,6 +148,8 @@ export function JobsDetailHeaderActions({
  const devEmails = ["imex.dev", "rome.dev"];
  const prodEmails = ["imex.prod", "rome.prod", "imex.test", "rome.test"];

+  const canVoidJob = useMemo(() => HasRbacAccess({ authLevel, bodyshop, action: "jobs:void" }), [authLevel, bodyshop]);
+
  const hasValidEmail = (emails) => emails.some((email) => userEmail.endsWith(email));
  const canSubmitForTesting = (isDevEnv && hasValidEmail(devEmails)) || (isProdEnv && hasValidEmail(prodEmails));

@@ -179,83 +179,69 @@ export function JobsDetailHeaderActions({
  const jobInPreProduction = preProductionStatuses.includes(jobStatus);
  const jobInPostProduction = postProductionStatuses.includes(jobStatus);

-  const openConfirm = useCallback((key) => {
-    confirmKeyRef.current = key;
-    setConfirmKey(key);
-    setDropdownOpen(true);
-  }, []);
+  const makeConfirmId = () =>
+    globalThis.crypto?.randomUUID?.() ?? `${Date.now()}-${Math.random().toString(16).slice(2)}`;

-  const closeConfirm = useCallback(() => {
-    confirmKeyRef.current = null;
-    setConfirmKey(null);
-  }, []);
+  const [modal, modalContextHolder] = Modal.useModal();

-  const handleDropdownOpenChange = useCallback(
-    (nextOpen, info) => {
-      if (!nextOpen && info?.source === "menu" && confirmKeyRef.current) return;
-      setDropdownOpen(nextOpen);
-      if (!nextOpen) closeConfirm();
-    },
-    [closeConfirm]
-  );
+  const confirmInstancesRef = useRef(new Map());

-  const renderPopconfirmMenuLabel = ({
-    key,
-    text,
+  const closeConfirmById = (id) => {
+    const inst = confirmInstancesRef.current.get(id);
+    if (inst) inst.destroy(); // hard close
+    confirmInstancesRef.current.delete(id);
+  };
+
+  const openConfirmFromMenu = ({
+    variant = "confirm", // "confirm" | "info" | "warning"
    title,
+    content,
    okText,
    cancelText,
    showCancel = true,
-    closeDropdownOnConfirm = true,
-    onConfirm
-  }) => (
-    <Popconfirm
-      title={title}
-      okText={okText}
-      cancelText={cancelText}
-      showCancel={showCancel}
-      open={confirmKey === key}
-      onOpenChange={(nextOpen) => {
-        if (nextOpen) openConfirm(key);
-        else closeConfirm();
-      }}
-      onConfirm={(e) => {
-        e?.stopPropagation?.();
-        closeConfirm();
+    onOk,
+    onCancel
+  }) => {
+    // close the dropdown immediately; confirm dialog is separate
+    setDropdownOpen(false);

-        // Critical: for informational popconfirms, keep the dropdown open so the Popconfirm can cleanly close.
-        if (closeDropdownOnConfirm) {
-          setDropdownOpen(false);
+    const id = makeConfirmId();
+
+    const openFn = variant === "info" ? modal.info : variant === "warning" ? modal.warning : modal.confirm;
+
+    const inst = openFn({
+      title,
+      content,
+      okText,
+      cancelText,
+      centered: true,
+      maskClosable: false,
+      onCancel: () => {
+        closeConfirmById(id);
+        onCancel?.();
+      },
+      onOk: async () => {
+        try {
+          await onOk?.();
+        } finally {
+          closeConfirmById(id);
        }
+      },
+      ...(showCancel ? {} : { okCancel: false })
+    });

-        onConfirm?.(e);
-      }}
-      onCancel={(e) => {
-        e?.stopPropagation?.();
-        closeConfirm();
-        // Keep dropdown open on cancel so the user can continue using the menu.
-      }}
-      getPopupContainer={() => document.body}
-    >
-      <div
-        style={{ width: "100%" }}
-        onClick={(e) => {
-          e.preventDefault();
-          e.stopPropagation();
-          openConfirm(key);
-        }}
-      >
-        {text}
-      </div>
-    </Popconfirm>
-  );
+    confirmInstancesRef.current.set(id, inst);
+    return id;
+  };
+
+  const handleDropdownOpenChange = useCallback((nextOpen) => {
+    setDropdownOpen(nextOpen);
+  }, []);

-  // Function to show modal
  const showCancelScheduleModal = () => {
    setIsCancelScheduleModalVisible(true);
  };

-  // Function to handle Cancel
  const handleCancelScheduleModalCancel = () => {
    setIsCancelScheduleModalVisible(false);
  };
@@ -264,7 +250,7 @@ export function JobsDetailHeaderActions({
    DuplicateJob({
      apolloClient: client,
      jobId: job.id,
-      config: { defaultOpenStatus: bodyshop.md_ro_statuses.default_imported },
+      config: { defaultOpenStatus: bodyshop.md_ro_statuses.default_imported, timezone: bodyshop.timezone },
      completionCallback: (newJobId) => {
        history(`/manage/jobs/${newJobId}`);
        notification.success({
@@ -279,7 +265,7 @@ export function JobsDetailHeaderActions({
    DuplicateJob({
      apolloClient: client,
      jobId: job.id,
-      config: { defaultOpenStatus: bodyshop.md_ro_statuses.default_imported },
+      config: { defaultOpenStatus: bodyshop.md_ro_statuses.default_imported, timezone: bodyshop.timezone },
      completionCallback: (newJobId) => {
        history(`/manage/jobs/${newJobId}`);
        notification.success({
@@ -476,6 +462,11 @@ export function JobsDetailHeaderActions({
  };

  const handleVoidJob = async () => {
+    if (!canVoidJob) {
+      notification.error({ title: t("general.messages.rbacunauth") });
+      return;
+    }
+
    //delete the job.
    const result = await voidJob({
      variables: {
@@ -964,26 +955,26 @@ export function JobsDetailHeaderActions({
        {
          key: "duplicate",
          id: "job-actions-duplicate",
-          label: renderPopconfirmMenuLabel({
-            key: "confirm-duplicate",
-            text: t("menus.jobsactions.duplicate"),
-            title: t("jobs.labels.duplicateconfirm"),
-            okText: t("general.labels.yes"),
-            cancelText: t("general.labels.no"),
-            onConfirm: handleDuplicate
-          })
+          label: t("menus.jobsactions.duplicate"),
+          onClick: () =>
+            openConfirmFromMenu({
+              title: t("jobs.labels.duplicateconfirm"),
+              okText: t("general.labels.yes"),
+              cancelText: t("general.labels.no"),
+              onOk: handleDuplicate
+            })
        },
        {
          key: "duplicatenolines",
          id: "job-actions-duplicatenolines",
-          label: renderPopconfirmMenuLabel({
-            key: "confirm-duplicate-nolines",
-            text: t("menus.jobsactions.duplicatenolines"),
-            title: t("jobs.labels.duplicateconfirm"),
-            okText: t("general.labels.yes"),
-            cancelText: t("general.labels.no"),
-            onConfirm: handleDuplicateConfirm
-          })
+          label: t("menus.jobsactions.duplicatenolines"),
+          onClick: () =>
+            openConfirmFromMenu({
+              title: t("jobs.labels.duplicateconfirm"),
+              okText: t("general.labels.yes"),
+              cancelText: t("general.labels.no"),
+              onOk: handleDuplicateConfirm
+            })
        }
      ]
    },
@@ -1156,26 +1147,25 @@ export function JobsDetailHeaderActions({
    menuItems.push({
      key: "deletejob",
      id: "job-actions-deletejob",
-      label:
-        jobWatchersCount === 0
-          ? renderPopconfirmMenuLabel({
-              key: "confirm-deletejob",
-              text: t("menus.jobsactions.deletejob"),
-              title: t("jobs.labels.deleteconfirm"),
-              okText: t("general.labels.yes"),
-              cancelText: t("general.labels.no"),
-              onConfirm: handleDeleteJob
-            })
-          : renderPopconfirmMenuLabel({
-              key: "confirm-deletejob-watchers",
-              text: t("menus.jobsactions.deletejob"),
-              title: t("jobs.labels.deletewatchers"),
-              showCancel: false,
-              closeDropdownOnConfirm: false, // <-- FIX: keep dropdown mounted so Popconfirm can close cleanly
-              onConfirm: () => {
-                // informational confirm only
-              }
-            })
+      label: t("menus.jobsactions.deletejob"),
+      onClick: () => {
+        if (jobWatchersCount === 0) {
+          openConfirmFromMenu({
+            title: t("jobs.labels.deleteconfirm"),
+            okText: t("general.labels.yes"),
+            cancelText: t("general.labels.no"),
+            onOk: handleDeleteJob
+          });
+        } else {
+          // informational "OK only"
+          openConfirmFromMenu({
+            variant: "info",
+            title: t("jobs.labels.deletewatchers"),
+            okText: t("general.actions.ok"),
+            showCancel: false
+          });
+        }
+      }
    });
  }

@@ -1188,22 +1178,18 @@ export function JobsDetailHeaderActions({
    label: t("appointments.labels.manualevent")
  });

-  if (!jobRO && job.converted) {
+  if (!jobRO && job.converted && canVoidJob) {
    menuItems.push({
      key: "voidjob",
      id: "job-actions-voidjob",
-      label: (
-        <RbacWrapper action="jobs:void" noauth>
-          {renderPopconfirmMenuLabel({
-            key: "confirm-voidjob",
-            text: t("menus.jobsactions.void"),
-            title: t("jobs.labels.voidjob"),
-            okText: t("general.labels.yes"),
-            cancelText: t("general.labels.no"),
-            onConfirm: handleVoidJob
-          })}
-        </RbacWrapper>
-      )
+      label: t("menus.jobsactions.void"),
+      onClick: () =>
+        openConfirmFromMenu({
+          title: t("jobs.labels.voidjob"),
+          okText: t("general.labels.yes"),
+          cancelText: t("general.labels.no"),
+          onOk: handleVoidJob
+        })
    });
  }

@@ -1235,6 +1221,7 @@ export function JobsDetailHeaderActions({

  return (
    <>
+      {modalContextHolder}
      <Modal
        title={t("menus.jobsactions.cancelallappointments")}
        open={isCancelScheduleModalVisible}
--- a/client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.duplicate.util.js
+++ b/client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.duplicate.util.js
@@ -15,7 +15,7 @@ export default async function DuplicateJob({
 }) {
  logImEXEvent("job_duplicate");

-  const { defaultOpenStatus } = config;
+  const { defaultOpenStatus, timezone } = config;
  //get a list of all fields on the job
  const res = await apolloClient.query({
    query: QUERY_JOB_FOR_DUPE,
@@ -31,9 +31,12 @@ export default async function DuplicateJob({
  delete existingJob.updatedat;
  delete existingJob.cieca_stl;
  delete existingJob.cieca_ttl;
+  !keepJobLines && delete existingJob.clm_total;

  const newJob = {
    ...existingJob,
+    date_estimated: dayjs().tz(timezone, false).format("YYYY-MM-DD"),
+    date_open: dayjs(),
    status: defaultOpenStatus
  };

@@ -70,7 +73,7 @@ export default async function DuplicateJob({
 export async function CreateIouForJob({ apolloClient, jobId, config, jobLinesToKeep, currentUser }) {
  logImEXEvent("job_create_iou");

-  const { status } = config;
+  const { status, timezone } = config;
  //get a list of all fields on the job
  const res = await apolloClient.query({
    query: QUERY_JOB_FOR_DUPE,
@@ -88,10 +91,10 @@ export async function CreateIouForJob({ apolloClient, jobId, config, jobLinesToK

  const newJob = {
    ...existingJob,
-
    converted: true,
    status: status,
    iouparent: jobId,
+    date_estimated: dayjs().tz(timezone, false).format("YYYY-MM-DD"),
    date_open: dayjs(),
    audit_trails: {
      data: [
--- a/client/src/components/jobs-detail-header/jobs-detail-header.component.jsx
+++ b/client/src/components/jobs-detail-header/jobs-detail-header.component.jsx
@@ -81,16 +81,17 @@ export function JobsDetailHeader({ job, bodyshop, disabled, insertAuditTrail, is
  const employeeData = bodyshop.associations.find((a) => a.useremail === job.admin_clerk)?.user?.employee ?? null;

  // Handle checkbox changes
-  const handleCheckboxChange = async (field, checked) => {
+  const handleCheckboxChange = async (field, e) => {
+    e.preventDefault();
+    e.stopPropagation();
+    const checked = e.target.checked;
    const value = checked ? dayjs().toISOString() : null;
    try {
      const ret = await updateJob({
        variables: {
          jobId: job.id,
          job: { [field]: value }
-        },
-        refetchQueries: ["GET_JOB_BY_PK"],
-        awaitRefetchQueries: true
+        }
      });
      insertAuditTrail({
        jobid: job.id,
@@ -143,7 +144,7 @@ export function JobsDetailHeader({ job, bodyshop, disabled, insertAuditTrail, is
                label={t("jobs.fields.comment")}
                styles={{ value: { overflow: "hidden", textOverflow: "ellipsis" } }}
              >
-                <ProductionListColumnComment record={job} />
+                <ProductionListColumnComment record={job} usePortal={true} />
              </DataLabel>
              {!isPartsEntry && <DataLabel label={t("jobs.fields.ins_co_nm_short")}>{job.ins_co_nm}</DataLabel>}
              <DataLabel label={t("jobs.fields.clm_no")}>{job.clm_no}</DataLabel>
@@ -176,13 +177,13 @@ export function JobsDetailHeader({ job, bodyshop, disabled, insertAuditTrail, is
                    </DataLabel>
                  )}
                  <DataLabel label={t("jobs.fields.production_vars.note")}>
-                    <ProductionListColumnProductionNote record={job} />
+                    <ProductionListColumnProductionNote record={job} usePortal={true} />
                  </DataLabel>
                  <DataLabel label={t("jobs.fields.estimate_sent_approval")}>
                    <Space>
                      <Checkbox
                        checked={!!job.estimate_sent_approval}
-                        onChange={(e) => handleCheckboxChange("estimate_sent_approval", e.target.checked)}
+                        onChange={(e) => handleCheckboxChange("estimate_sent_approval", e)}
                        disabled={disabled || isPartsEntry}
                      >
                        {job.estimate_sent_approval && (
@@ -197,7 +198,7 @@ export function JobsDetailHeader({ job, bodyshop, disabled, insertAuditTrail, is
                    <Space>
                      <Checkbox
                        checked={!!job.estimate_approved}
-                        onChange={(e) => handleCheckboxChange("estimate_approved", e.target.checked)}
+                        onChange={(e) => handleCheckboxChange("estimate_approved", e)}
                        disabled={disabled || isPartsEntry}
                      >
                        {job.estimate_approved && (
--- a/client/src/components/owner-find-modal/owner-find-modal.container.jsx
+++ b/client/src/components/owner-find-modal/owner-find-modal.container.jsx
@@ -48,6 +48,7 @@ export default function OwnerFindModalContainer({
            value={searchText}
            onChange={(e) => setSearchText(e.target.value)}
            onSearch={(val) => callSearchowners({ variables: { search: val.trim() } })}
+            enterButton
          />
          <OwnerFindModalComponent
            selectedOwner={selectedOwner}
--- a/client/src/components/parts-dispatch-table/parts-dispatch-table.component.jsx
+++ b/client/src/components/parts-dispatch-table/parts-dispatch-table.component.jsx
@@ -101,6 +101,7 @@ export function PartDispatchTableComponent({ bodyshop, job, billsQuery }) {
              e.preventDefault();
              setSearchText(e.target.value);
            }}
+            enterButton
          />
        </Space>
      }
--- a/client/src/components/parts-order-list-table/parts-order-list-table.component.jsx
+++ b/client/src/components/parts-order-list-table/parts-order-list-table.component.jsx
@@ -295,6 +295,7 @@ export function PartsOrderListTableComponent({
              e.preventDefault();
              setSearchText(e.target.value);
            }}
+            enterButton
          />
        </Space>
      }
--- a/client/src/components/parts-order-modal/parts-order-modal.component.jsx
+++ b/client/src/components/parts-order-modal/parts-order-modal.component.jsx
@@ -13,6 +13,13 @@ import PartsOrderModalPriceChange from "./parts-order-modal-price-change.compone
 import DateTimePicker from "../form-date-time-picker/form-date-time-picker.component.jsx";
 import { selectIsPartsEntry } from "../../redux/application/application.selectors.js";

+const PriceInputWrapper = ({ value, onChange, form, field }) => (
+  <Space.Compact style={{ width: "100%" }}>
+    <PartsOrderModalPriceChange form={form} field={field} />
+    <CurrencyInput style={{ flex: 1 }} value={value} onChange={onChange} />
+  </Space.Compact>
+);
+
 const mapStateToProps = createStructuredSelector({
  bodyshop: selectBodyshop,
  isPartsEntry: selectIsPartsEntry
@@ -199,10 +206,7 @@ export function PartsOrderModalComponent({
                        key={`${index}act_price`}
                        name={[field.name, "act_price"]}
                      >
-                        <Space.Compact style={{ width: "100%" }}>
-                          <PartsOrderModalPriceChange form={form} field={field} />
-                          <CurrencyInput style={{ flex: 1 }} />
-                        </Space.Compact>
+                        <PriceInputWrapper form={form} field={field} />
                      </Form.Item>
                      {isReturn && (
                        <Form.Item
--- a/client/src/components/parts-order-modal/parts-order-modal.container.jsx
+++ b/client/src/components/parts-order-modal/parts-order-modal.container.jsx
@@ -89,7 +89,8 @@ export function PartsOrderModalContainer({

      return {
        ...p,
-        job_line_id: jobLineId
+        job_line_id: jobLineId,
+        ...(isReturn && { cm_received: false })
      };
    });

--- a/client/src/components/parts-queue-list/parts-queue.list.component.jsx
+++ b/client/src/components/parts-queue-list/parts-queue.list.component.jsx
@@ -269,6 +269,7 @@ export function PartsQueueListComponent({ bodyshop }) {

  return (
    <Card
+      title={t("titles.bc.parts-queue")}
      extra={
        <Space wrap>
          <Button onClick={() => refetch()}>
--- a/client/src/components/phone-number-consent/phone-number-consent.component.jsx
+++ b/client/src/components/phone-number-consent/phone-number-consent.component.jsx
@@ -129,6 +129,7 @@ function PhoneNumberConsentList({ bodyshop }) {
        placeholder={t("general.labels.search")}
        onSearch={(value) => setSearch(value)}
        style={{ marginBottom: 16 }}
+        enterButton
      />

      <Table
--- a/client/src/components/production-board-filters/production-board-filters.component.jsx
+++ b/client/src/components/production-board-filters/production-board-filters.component.jsx
@@ -45,6 +45,7 @@ export function ProductionBoardFilters({ bodyshop, filter, setFilter, loading })
          setFilter({ ...filter, search: e.target.value });
          logImEXEvent("visual_board_filter_search", { search: e.target.value });
        }}
+        enterButton
      />
      <EmployeeSearchSelectComponent
        style={{ minWidth: "20rem" }}
--- a/client/src/components/production-board-kanban/trello-board/controllers/BoardContainer.jsx
+++ b/client/src/components/production-board-kanban/trello-board/controllers/BoardContainer.jsx
@@ -1,4 +1,4 @@
-import { useEffect, useRef, useState } from "react";
+import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import { useDispatch, useSelector } from "react-redux";
 import { DragDropContext } from "../dnd/lib";
 import PropTypes from "prop-types";
@@ -7,6 +7,7 @@ import { PopoverWrapper } from "react-popopo";
 import * as actions from "../../../../redux/trello/trello.actions.js";
 import { BoardWrapper } from "../styles/Base.js";
 import ProductionStatistics from "../../production-board-kanban.statistics.jsx";
+import isEqual from "lodash/isEqual";

 const useDragMap = () => {
  const dragMapRef = useRef(new Map());
@@ -47,8 +48,9 @@ const BoardContainer = ({
  const dispatch = useDispatch();
  const currentReducerData = useSelector((state) => (state.trello.lanes ? state.trello : {}));
  const { setDragTime, getLastDragTime } = useDragMap();
+  const previousDataRef = useRef(null);

-  const wireEventBus = () => {
+  const wireEventBus = useCallback(() => {
    const eventBus = {
      publish: (event) => {
        switch (event.type) {
@@ -68,14 +70,17 @@ const BoardContainer = ({
      }
    };
    eventBusHandle(eventBus);
-  };
+  }, [dispatch, eventBusHandle]);

  useEffect(() => {
-    dispatch(actions.loadBoard(data));
-    if (eventBusHandle) {
-      wireEventBus();
+    if (!isEqual(previousDataRef.current, data)) {
+      previousDataRef.current = data;
+      dispatch(actions.loadBoard(data));
+      if (eventBusHandle) {
+        wireEventBus();
+      }
    }
-  }, [data, eventBusHandle, dispatch]);
+  }, [data, wireEventBus, dispatch]);

  useEffect(() => {
    onDataChange(currentReducerData);
@@ -153,12 +158,17 @@ const BoardContainer = ({
    }
  };

+  const boardKey = useMemo(() => {
+    // React Compiler: Generate stable key from lane IDs
+    return currentReducerData.lanes?.map((l) => l.id).join("-") || "empty";
+  }, [currentReducerData.lanes]);
+
  return (
    <div>
      <ProductionStatistics data={queryData} reducerData={currentReducerData} cardSettings={cardSettings} />
      <PopoverWrapper>
        <BoardWrapper orientation={orientation}>
-          <DragDropContext onDragEnd={onLaneDrag} onDragStart={onDragStart} contextId="production-board">
+          <DragDropContext key={boardKey} onDragEnd={onLaneDrag} onDragStart={onDragStart} contextId="production-board">
            {currentReducerData.lanes.map((lane, index) => (
              <Lane
                key={lane.id}
--- a/client/src/components/production-board-kanban/trello-board/dnd/lib/state/registry/use-registry.js
+++ b/client/src/components/production-board-kanban/trello-board/dnd/lib/state/registry/use-registry.js
@@ -1,14 +1,28 @@
-import { useEffect, useMemo } from "react";
+import { useEffect, useMemo, useRef } from "react";
 import createRegistry from "./create-registry";

 export default function useRegistry() {
  const registry = useMemo(createRegistry, []);
+  const cleanupScheduledRef = useRef(false);
+
  useEffect(() => {
+    // Cancel any scheduled cleanup when component mounts
+    // This handles React StrictMode double-mounting
+    cleanupScheduledRef.current = false;
+
    return function unmount() {
+      // Mark cleanup as scheduled
+      cleanupScheduledRef.current = true;
+
      // clean up the registry to avoid any leaks
      // doing it after an animation frame so that other things unmounting
      // can continue to interact with the registry
-      requestAnimationFrame(registry.clean);
+      requestAnimationFrame(() => {
+        // Only clean if still scheduled (not cancelled by remount)
+        if (cleanupScheduledRef.current) {
+          registry.clean();
+        }
+      });
    };
  }, [registry]);
  return registry;
--- a/client/src/components/production-board-kanban/trello-board/dnd/lib/view/use-droppable-publisher/use-droppable-publisher.js
+++ b/client/src/components/production-board-kanban/trello-board/dnd/lib/view/use-droppable-publisher/use-droppable-publisher.js
@@ -171,6 +171,7 @@ export default function useDroppablePublisher(args) {
      }
      registry.droppable.unregister(entry);
    };
+    // eslint-disable-next-line react-compiler/react-compiler
  }, [callbacks, descriptor, dragStopped, entry, marshal, registry.droppable]);

  // update is enabled with the marshal
--- a/client/src/components/production-list-columns/production-list-columns.alert.component.jsx
+++ b/client/src/components/production-list-columns/production-list-columns.alert.component.jsx
@@ -63,10 +63,10 @@ const ProductionListColumnAlert = ({ id, productionVars, refetch, insertAuditTra
      okText={t("general.labels.yes")}
      cancelText={t("general.labels.no")}
    >
-      <Button className="production-alert" icon={<ExclamationCircleFilled />} />
+      <Button className="production-alert" icon={<ExclamationCircleFilled />} style={{ cursor: "pointer" }} />
    </Popconfirm>
  ) : (
-    <Button className="muted-button" icon={<PlusCircleFilled />} onClick={handleAlertToggle} />
+    <Button className="muted-button" icon={<PlusCircleFilled />} onClick={handleAlertToggle} style={{ cursor: "pointer" }} />
  );
 };

--- a/client/src/components/production-list-columns/production-list-columns.bodypriority.component.jsx
+++ b/client/src/components/production-list-columns/production-list-columns.bodypriority.component.jsx
@@ -48,7 +48,7 @@ export default function ProductionListColumnBodyPriority({ record }) {

  return (
    <Dropdown menu={menu} trigger={["click"]}>
-      <div style={{ width: "100%", height: "19px" }}>{record.production_vars?.bodypriority}</div>
+      <div style={{ width: "100%", height: "19px", cursor: "pointer" }}>{record.production_vars?.bodypriority}</div>
    </Dropdown>
  );
 }
--- a/client/src/components/production-list-columns/production-list-columns.comment.component.jsx
+++ b/client/src/components/production-list-columns/production-list-columns.comment.component.jsx
@@ -7,7 +7,7 @@ import { FaRegStickyNote } from "react-icons/fa";
 import { UPDATE_JOB } from "../../graphql/jobs.queries";
 import { logImEXEvent } from "../../firebase/firebase.utils";

-export default function ProductionListColumnComment({ record }) {
+export default function ProductionListColumnComment({ record, usePortal = false }) {
  const { t } = useTranslation();

  const [note, setNote] = useState(record.comment || "");
@@ -43,16 +43,20 @@ export default function ProductionListColumnComment({ record }) {
  };

  const content = (
-    <div style={{ width: "30em" }} onMouseDown={(e) => e.stopPropagation()} onClick={(e) => e.stopPropagation()}>
+    <div 
+      style={{ width: "30em" }} 
+      onClick={(e) => e.stopPropagation()}
+      onPointerDown={(e) => e.stopPropagation()}
+    >
      <Input.TextArea
+        id={`job-comment-${record.id}`}
+        name="comment"
        rows={5}
        value={note}
        onChange={handleChange}
        autoFocus
        allowClear
        style={{ marginBottom: "1em" }}
-        onMouseDown={(e) => e.stopPropagation()}
-        onClick={(e) => e.stopPropagation()}
      />
      <div>
        <Button onClick={handleSaveNote} type="primary">
@@ -63,7 +67,15 @@ export default function ProductionListColumnComment({ record }) {
  );

  return (
-    <Popover onOpenChange={handleOpenChange} open={open} content={content} trigger="click" fresh>
+    <Popover 
+      onOpenChange={handleOpenChange} 
+      open={open} 
+      content={content} 
+      trigger="click" 
+      destroyOnHidden
+      styles={{ body: { padding: '12px' } }}
+      {...(usePortal ? { getPopupContainer: (trigger) => trigger.parentElement || document.body } : {})}
+    >
      <div
        style={{
          width: "100%",
--- a/client/src/components/production-list-columns/production-list-columns.data.jsx
+++ b/client/src/components/production-list-columns/production-list-columns.data.jsx
@@ -64,6 +64,7 @@ const productionListColumnsData = ({ technician, state, activeStatuses, data, bo
            ellipsis: true,
            render: (text, record) => (
              <div
+                style={{ cursor: "pointer" }}
                onClick={() => {
                  store.dispatch(
                    setModalContext({
--- a/client/src/components/production-list-columns/production-list-columns.date.component.jsx
+++ b/client/src/components/production-list-columns/production-list-columns.date.component.jsx
@@ -86,7 +86,8 @@ export default function ProductionListDate({ record, field, time, pastIndicator
      <div
        onClick={() => setOpen(true)}
        style={{
-          height: "19px"
+          height: "19px",
+          cursor: "pointer"
        }}
        className={className}
      >
--- a/client/src/components/production-list-columns/production-list-columns.detailpriority.component.jsx
+++ b/client/src/components/production-list-columns/production-list-columns.detailpriority.component.jsx
@@ -48,7 +48,7 @@ export default function ProductionListColumnDetailPriority({ record }) {

  return (
    <Dropdown menu={menu} trigger={["click"]}>
-      <div style={{ width: "100%", height: "19px" }}>{record.production_vars?.detailpriority}</div>
+      <div style={{ width: "100%", height: "19px", cursor: "pointer" }}>{record.production_vars?.detailpriority}</div>
    </Dropdown>
  );
 }
--- a/client/src/components/production-list-columns/production-list-columns.empassignment.component.jsx
+++ b/client/src/components/production-list-columns/production-list-columns.empassignment.component.jsx
@@ -144,13 +144,13 @@ export function ProductionListEmpAssignment({ insertAuditTrail, bodyshop, record
    <Popover destroyOnHidden content={popContent} open={visibility}>
      <Spin spinning={loading}>
        {record[type] ? (
-          <div>
+          <div style={{ cursor: "pointer" }}>
            <span>{`${theEmployee?.first_name || ""} ${theEmployee?.last_name || ""}`}</span>
            <DeleteFilled style={iconStyle} onClick={() => handleRemove(type)} />
          </div>
        ) : (
          <PlusCircleFilled
-            style={iconStyle}
+            style={{ ...iconStyle, cursor: "pointer" }}
            className="muted-button"
            onClick={() => {
              setAssignment({ operation: type });
--- a/client/src/components/production-list-columns/production-list-columns.lastcontacted.component.jsx
+++ b/client/src/components/production-list-columns/production-list-columns.lastcontacted.component.jsx
@@ -124,7 +124,8 @@ export function ProductionLastContacted({ currentUser, record }) {
        <div
          onClick={() => setOpen(true)}
          style={{
-            height: "19px"
+            height: "19px",
+            cursor: "pointer"
          }}
        >
          <DateFormatter bordered={false}>{record.date_last_contacted}</DateFormatter>
--- a/client/src/components/production-list-columns/production-list-columns.paintpriority.component.jsx
+++ b/client/src/components/production-list-columns/production-list-columns.paintpriority.component.jsx
@@ -48,7 +48,7 @@ export default function ProductionListColumnPaintPriority({ record }) {

  return (
    <Dropdown menu={menu} trigger={["click"]}>
-      <div style={{ width: "100%", height: "19px" }}>{record.production_vars?.paintpriority}</div>
+      <div style={{ width: "100%", height: "19px", cursor: "pointer" }}>{record.production_vars?.paintpriority}</div>
    </Dropdown>
  );
 }
--- a/client/src/components/production-list-columns/production-list-columns.productionnote.component.jsx
+++ b/client/src/components/production-list-columns/production-list-columns.productionnote.component.jsx
@@ -16,7 +16,7 @@ const mapDispatchToProps = (dispatch) => ({
  setNoteUpsertContext: (context) => dispatch(setModalContext({ context: context, modal: "noteUpsert" }))
 });

-function ProductionListColumnProductionNote({ record, setNoteUpsertContext }) {
+function ProductionListColumnProductionNote({ record, setNoteUpsertContext, usePortal = false }) {
  const { t } = useTranslation();
  const [note, setNote] = useState(record.production_vars?.note || "");
  const [open, setOpen] = useState(false);
@@ -59,16 +59,20 @@ function ProductionListColumnProductionNote({ record, setNoteUpsertContext }) {
  );

  const content = (
-    <div style={{ width: "30em" }} onMouseDown={(e) => e.stopPropagation()} onClick={(e) => e.stopPropagation()}>
+    <div 
+      style={{ width: "30em" }} 
+      onClick={(e) => e.stopPropagation()}
+      onPointerDown={(e) => e.stopPropagation()}
+    >
      <Input.TextArea
+        id={`job-production-note-${record.id}`}
+        name="production_note"
        rows={5}
        value={note}
        onChange={handleChange}
        autoFocus
        allowClear
        style={{ marginBottom: "1em" }}
-        onMouseDown={(e) => e.stopPropagation()}
-        onClick={(e) => e.stopPropagation()}
      />
      <Space>
        <Button onClick={handleSaveNote} type="primary">
@@ -92,7 +96,15 @@ function ProductionListColumnProductionNote({ record, setNoteUpsertContext }) {
  );

  return (
-    <Popover onOpenChange={handleOpenChange} open={open} content={content} trigger="click" fresh>
+    <Popover 
+      onOpenChange={handleOpenChange} 
+      open={open} 
+      content={content} 
+      trigger="click" 
+      destroyOnHidden
+      styles={{ body: { padding: '12px' } }}
+      {...(usePortal ? { getPopupContainer: (trigger) => trigger.parentElement || document.body } : {})}
+    >
      <div
        style={{
          width: "100%",
--- a/client/src/components/profile-shops/profile-shops.component.jsx
+++ b/client/src/components/profile-shops/profile-shops.component.jsx
@@ -44,6 +44,7 @@ export default function ProfileShopsComponent({ loading, data, updateActiveShop
            onChange={(e) => setSearch(e.target.value)}
            allowClear
            placeholder={t("general.labels.search")}
+            enterButton
          />
        }
      >
--- a/client/src/components/report-center-modal/report-center-modal.component.jsx
+++ b/client/src/components/report-center-modal/report-center-modal.component.jsx
@@ -145,7 +145,7 @@ export function ReportCenterModalComponent({ reportCenterModal, bodyshop }) {
  return (
    <div className="report-center-modal">
      <Form onFinish={handleFinish} autoComplete={"off"} layout="vertical" form={form}>
-        <Input.Search onChange={(e) => setSearch(e.target.value)} value={search} />
+        <Input.Search onChange={(e) => setSearch(e.target.value)} value={search} enterButton />
        <Form.Item name="defaultSorters" hidden>
          <Input type="hidden" />
        </Form.Item>
--- a/client/src/components/shop-info/shop-info.general.component.jsx
+++ b/client/src/components/shop-info/shop-info.general.component.jsx
@@ -3,8 +3,7 @@ import { Button, Form, Input, InputNumber, Select, Space, Switch } from "antd";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
-import { selectBodyshop } from "../../redux/user/user.selectors";
-import FeatureWrapper, { HasFeatureAccess } from "../feature-wrapper/feature-wrapper.component";
+import FeatureWrapper from "../feature-wrapper/feature-wrapper.component";
 import CurrencyInput from "../form-items-formatted/currency-form-item.component";
 import FormItemEmail from "../form-items-formatted/email-form-item.component";
 import PhoneFormItem, { PhoneItemFormatterValidation } from "../form-items-formatted/phone-form-item.component";
@@ -12,15 +11,13 @@ import FormListMoveArrows from "../form-list-move-arrows/form-list-move-arrows.c
 import LayoutFormRow from "../layout-form-row/layout-form-row.component";

 const timeZonesList = Intl.supportedValuesOf("timeZone");
-const mapStateToProps = createStructuredSelector({
-  bodyshop: selectBodyshop
-});
+const mapStateToProps = createStructuredSelector({});
 const mapDispatchToProps = () => ({
  //setUserLanguage: language => dispatch(setUserLanguage(language))
 });
 export default connect(mapStateToProps, mapDispatchToProps)(ShopInfoGeneral);

-export function ShopInfoGeneral({ form, bodyshop }) {
+export function ShopInfoGeneral({ form }) {
  const { t } = useTranslation();

  return (
@@ -378,34 +375,6 @@ export function ShopInfoGeneral({ form, bodyshop }) {
          >
            <Select mode="tags" />
          </Form.Item>,
-          ...(HasFeatureAccess({ featureName: "timetickets", bodyshop })
-            ? [
-                <Form.Item
-                  key="tt_allow_post_to_invoiced"
-                  name={["tt_allow_post_to_invoiced"]}
-                  label={t("bodyshop.fields.tt_allow_post_to_invoiced")}
-                  valuePropName="checked"
-                >
-                  <Switch />
-                </Form.Item>,
-                <Form.Item
-                  key="tt_enforce_hours_for_tech_console"
-                  name={["tt_enforce_hours_for_tech_console"]}
-                  label={t("bodyshop.fields.tt_enforce_hours_for_tech_console")}
-                  valuePropName="checked"
-                >
-                  <Switch />
-                </Form.Item>,
-                <Form.Item
-                  key="bill_allow_post_to_closed"
-                  name={["bill_allow_post_to_closed"]}
-                  label={t("bodyshop.fields.bill_allow_post_to_closed")}
-                  valuePropName="checked"
-                >
-                  <Switch />
-                </Form.Item>
-              ]
-            : []),
          <Form.Item
            key="md_ded_notes"
            name={["md_ded_notes"]}
--- a/client/src/components/shop-info/shop-info.responsibilitycenters.component.jsx
+++ b/client/src/components/shop-info/shop-info.responsibilitycenters.component.jsx
@@ -313,6 +313,38 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
            >
              <Select mode="tags" />
            </Form.Item>,
+            ...(HasFeatureAccess({ featureName: "timetickets", bodyshop })
+              ? [
+                  <Form.Item
+                    key="tt_allow_post_to_invoiced"
+                    name={["tt_allow_post_to_invoiced"]}
+                    label={t("bodyshop.fields.tt_allow_post_to_invoiced")}
+                    valuePropName="checked"
+                  >
+                    <Switch />
+                  </Form.Item>,
+                  <Form.Item
+                    key="tt_enforce_hours_for_tech_console"
+                    name={["tt_enforce_hours_for_tech_console"]}
+                    label={t("bodyshop.fields.tt_enforce_hours_for_tech_console")}
+                    valuePropName="checked"
+                  >
+                    <Switch />
+                  </Form.Item>
+                ]
+              : []),
+            ...(HasFeatureAccess({ featureName: "bills", bodyshop })
+              ? [
+                  <Form.Item
+                    key="bill_allow_post_to_closed"
+                    name={["bill_allow_post_to_closed"]}
+                    label={t("bodyshop.fields.bill_allow_post_to_closed")}
+                    valuePropName="checked"
+                  >
+                    <Switch />
+                  </Form.Item>
+                ]
+              : []),
            ...(HasFeatureAccess({ featureName: "export", bodyshop })
              ? [
                  ...(ClosingPeriod.treatment === "on"
--- a/client/src/components/task-list/task-list.container.jsx
+++ b/client/src/components/task-list/task-list.container.jsx
@@ -33,8 +33,7 @@ export function TaskListContainer({
  currentUser,
  onlyMine,
  parentJobId,
-  showRo = true,
-  disableJobRefetch = false
+  showRo = true
 }) {
  const { t } = useTranslation();
  const notification = useNotification();
@@ -91,10 +90,6 @@ export function TaskListContainer({
        refetchQueries: [Object.keys(query)[0]]
      };

-      if (!disableJobRefetch) {
-        toggledTaskObject.refetchQueries.push("GET_JOB_BY_PK");
-      }
-
      const toggledTask = await toggleTaskCompleted(toggledTaskObject);

      if (!toggledTask.errors) {
@@ -144,10 +139,6 @@ export function TaskListContainer({
        refetchQueries: [Object.keys(query)[0]]
      };

-      if (!disableJobRefetch) {
-        toggledTaskObject.refetchQueries.push("GET_JOB_BY_PK");
-      }
-
      const toggledTask = await toggleTaskDeleted(toggledTaskObject);

      if (!toggledTask.errors) {
--- a/client/src/graphql/parts-orders.queries.js
+++ b/client/src/graphql/parts-orders.queries.js
@@ -356,7 +356,10 @@ export const MUTATION_BACKORDER_PART_LINE = gql`
 export const QUERY_UNRECEIVED_LINES = gql`
  query QUERY_UNRECEIVED_LINES($jobId: uuid!, $vendorId: uuid!) {
    parts_order_lines(
-      where: { parts_order: { jobid: { _eq: $jobId }, vendorid: { _eq: $vendorId } }, cm_received: { _neq: true } }
+      where: {
+        parts_order: { jobid: { _eq: $jobId }, vendorid: { _eq: $vendorId }, return: { _eq: true } }
+        _or: [{ cm_received: { _neq: true } }, { cm_received: { _is_null: true } }]
+      }
    ) {
      cm_received
      id
--- a/client/src/index.jsx
+++ b/client/src/index.jsx
@@ -82,13 +82,14 @@ const rootEl = document.getElementById("root");

 if (!rootEl) throw new Error('Missing root element: <div id="root" />');

-const appTree = import.meta.env.DEV ? (
-  <StrictMode>
+const appTree =
+  import.meta.env.DEV && import.meta.env?.VITE_DISABLE_STRICT_MODE !== "true" ? (
+    <StrictMode>
+      <App />
+    </StrictMode>
+  ) : (
    <App />
-  </StrictMode>
-) : (
-  <App />
-);
+  );

 ReactDOM.createRoot(rootEl).render(appTree);

--- a/client/src/pages/contract-detail/contract-detail.page.container.jsx
+++ b/client/src/pages/contract-detail/contract-detail.page.container.jsx
@@ -41,19 +41,25 @@ export function ContractDetailPageContainer({ setBreadcrumbs, addRecentItem, set

  useEffect(() => {
    setSelectedHeader("contracts");
-    document.title = loading
-      ? InstanceRenderManager({
-          imex: t("titles.imexonline"),
-          rome: t("titles.romeonline")
-        })
-      : error
-        ? InstanceRenderManager({
-            imex: t("titles.imexonline"),
-            rome: t("titles.romeonline")
-          })
-        : t("titles.contracts-detail", {
-            id: (data?.cccontracts_by_pk && data.cccontracts_by_pk.agreementnumber) || ""
-          });
+    
+    const appName = InstanceRenderManager({
+      imex: "$t(titles.imexonline)",
+      rome: "$t(titles.romeonline)"
+    });
+    
+    const fallbackTitle = InstanceRenderManager({
+      imex: t("titles.imexonline"),
+      rome: t("titles.romeonline")
+    });
+    
+    if (loading || error) {
+      document.title = fallbackTitle;
+    } else {
+      document.title = t("titles.contracts-detail", {
+        id: (data?.cccontracts_by_pk && data.cccontracts_by_pk.agreementnumber) || "",
+        app: appName
+      });
+    }

    setBreadcrumbs([
      { link: "/manage/courtesycars", label: t("titles.bc.courtesycars") },
--- a/client/src/pages/export-logs/export-logs.page.component.jsx
+++ b/client/src/pages/export-logs/export-logs.page.component.jsx
@@ -181,6 +181,7 @@ export function ExportLogsPageComponent() {
              searchParams.search = value;
              history({ search: queryString.stringify(searchParams) });
            }}
+            enterButton
          />
        </Space>
      }
--- a/client/src/pages/jobs-available/jobs-available.page.container.jsx
+++ b/client/src/pages/jobs-available/jobs-available.page.container.jsx
@@ -4,7 +4,6 @@ import { PageHeader } from "@ant-design/pro-layout";
 import { useEffect } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
-import { Link } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
 import AlertComponent from "../../components/alert/alert.component";
 import JobsAvailableTableContainer from "../../components/jobs-available-table/jobs-available-table.container";
@@ -25,6 +24,26 @@ const mapDispatchToProps = (dispatch) => ({
 export function JobsAvailablePageContainer({ partnerVersion, setBreadcrumbs, setSelectedHeader }) {
  const { t } = useTranslation();

+  const getOS = () => {
+    const userAgent = navigator.userAgent;
+    if (userAgent.indexOf("Win") !== -1) return "windows";
+    if (userAgent.indexOf("Mac") !== -1) return "mac";
+    if (userAgent.indexOf("Linux") !== -1) return "linux";
+    return "unknown";
+  };
+
+  const os = getOS();
+  const downloadUrl = InstanceRenderManager({
+    imex:
+      os === "windows"
+        ? "https://imex-partner.s3.ca-central-1.amazonaws.com/imex-partner-x64.exe"
+        : "https://imex-partner.s3.ca-central-1.amazonaws.com/imex-partner-arm64.dmg",
+    rome:
+      os === "windows"
+        ? "https://rome-partner.s3.us-east-2.amazonaws.com/rome-partner-x64.exe"
+        : "https://rome-partner.s3.us-east-2.amazonaws.com/rome-partner-arm64.dmg"
+  });
+
  useEffect(() => {
    document.title = t("titles.jobsavailable", {
      app: InstanceRenderManager({
@@ -39,24 +58,12 @@ export function JobsAvailablePageContainer({ partnerVersion, setBreadcrumbs, set
  return (
    <RbacWrapper action="jobs:available-list">
      <div>
-        <PageHeader
-          title={t("titles.bc.availablejobs")}
-          extra={
-            <Link to="/manage/jobs/new">
-              <Button>{t("jobs.actions.manualnew")}</Button>
-            </Link>
-          }
-        />
+        <PageHeader />
        {!partnerVersion && (
          <AlertComponent
            type="warning"
            action={
-              <a
-                href={InstanceRenderManager({
-                  imex: "https://partner.imex.online/Setup.exe",
-                  rome: "https://partner.romeonline.io/Setup.exe"
-                })}
-              >
+              <a href={downloadUrl}>
                <Button size="small">{t("general.actions.download")}</Button>
              </a>
            }
--- a/client/src/pages/jobs-close/jobs-close.component.jsx
+++ b/client/src/pages/jobs-close/jobs-close.component.jsx
@@ -82,10 +82,23 @@ export function JobsCloseComponent({ job, bodyshop, jobRO, insertAuditTrail, set

  const handleFinish = async ({ removefromproduction, ...values }) => {
    setLoading(true);
+    
+    // Validate that all joblines have valid IDs
+    const joblinesWithIds = values.joblines.filter(jl => jl && jl.id);
+    if (joblinesWithIds.length !== values.joblines.length) {
+      notification.error({
+        title: t("jobs.errors.invalidjoblines"),
+        message: t("jobs.errors.missingjoblineids")
+      });
+      setLoading(false);
+      return;
+    }
+    
    const result = await client.mutate({
      mutation: generateJobLinesUpdatesForInvoicing(values.joblines)
    });
    if (result.errors) {
+      setLoading(false);
      return; // Abandon the rest of the close.
    }

--- a/client/src/pages/manage/manage.page.component.jsx
+++ b/client/src/pages/manage/manage.page.component.jsx
@@ -2,7 +2,7 @@ import { FloatButton, Layout, Spin } from "antd";
 import { Route, Routes } from "react-router-dom";

 // import preval from "preval.macro";
-import { lazy, Suspense, useEffect, useRef, useState } from "react";
+import { Suspense, useEffect, useRef, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
@@ -29,87 +29,88 @@ import {
 import InstanceRenderManager from "../../utils/instanceRenderMgr.js";
 import useAlertsNotifications from "../../hooks/useAlertsNotifications.jsx";
 import { selectDarkMode } from "../../redux/application/application.selectors.js";
+import { lazyDev } from "../../utils/lazyWithPreload.jsx";

-const PrintCenterModalContainer = lazy(
+const PrintCenterModalContainer = lazyDev(
  () => import("../../components/print-center-modal/print-center-modal.container")
 );

-const NoteUpsertModal = lazy(() => import("../../components/note-upsert-modal/note-upsert-modal.container.jsx"));
+const NoteUpsertModal = lazyDev(() => import("../../components/note-upsert-modal/note-upsert-modal.container.jsx"));

-const JobsPage = lazy(() => import("../jobs/jobs.page"));
+const JobsPage = lazyDev(() => import("../jobs/jobs.page"));

-const CardPaymentModalContainer = lazy(
+const CardPaymentModalContainer = lazyDev(
  () => import("../../components/card-payment-modal/card-payment-modal.container.jsx")
 );

-const JobsDetailPage = lazy(() => import("../jobs-detail/jobs-detail.page.container"));
-const InventoryListPage = lazy(() => import("../inventory/inventory.page"));
-const ProfilePage = lazy(() => import("../profile/profile.container.page"));
-const JobsAvailablePage = lazy(() => import("../jobs-available/jobs-available.page.container"));
-const ScheduleContainer = lazy(() => import("../schedule/schedule.page.container"));
-const VehiclesContainer = lazy(() => import("../vehicles/vehicles.page.container"));
-const VehiclesDetailContainer = lazy(() => import("../vehicles-detail/vehicles-detail.page.container"));
-const OwnersContainer = lazy(() => import("../owners/owners.page.container"));
-const OwnersDetailContainer = lazy(() => import("../owners-detail/owners-detail.page.container"));
-const ShopPage = lazy(() => import("../shop/shop.page.component"));
-const ShopVendorPageContainer = lazy(() => import("../shop-vendor/shop-vendor.page.container"));
-const EmailOverlayContainer = lazy(() => import("../../components/email-overlay/email-overlay.container.jsx"));
-const JobsCreateContainerPage = lazy(() => import("../jobs-create/jobs-create.container"));
-const CourtesyCarCreateContainer = lazy(() => import("../courtesy-car-create/courtesy-car-create.page.container"));
-const CourtesyCarDetailContainer = lazy(() => import("../courtesy-car-detail/courtesy-car-detail.page.container"));
-const CourtesyCarsPage = lazy(() => import("../courtesy-cars/courtesy-cars.page.container"));
-const ContractCreatePage = lazy(() => import("../contract-create/contract-create.page.container"));
-const ContractDetailPage = lazy(() => import("../contract-detail/contract-detail.page.container"));
-const ContractsList = lazy(() => import("../contracts/contracts.page.container"));
-const BillsListPage = lazy(() => import("../bills/bills.page.container"));
-const FeatureRequestPage = lazy(() => import("../feature-request/feature-request.page.jsx"));
+const JobsDetailPage = lazyDev(() => import("../jobs-detail/jobs-detail.page.container"));
+const InventoryListPage = lazyDev(() => import("../inventory/inventory.page"));
+const ProfilePage = lazyDev(() => import("../profile/profile.container.page"));
+const JobsAvailablePage = lazyDev(() => import("../jobs-available/jobs-available.page.container"));
+const ScheduleContainer = lazyDev(() => import("../schedule/schedule.page.container"));
+const VehiclesContainer = lazyDev(() => import("../vehicles/vehicles.page.container"));
+const VehiclesDetailContainer = lazyDev(() => import("../vehicles-detail/vehicles-detail.page.container"));
+const OwnersContainer = lazyDev(() => import("../owners/owners.page.container"));
+const OwnersDetailContainer = lazyDev(() => import("../owners-detail/owners-detail.page.container"));
+const ShopPage = lazyDev(() => import("../shop/shop.page.component"));
+const ShopVendorPageContainer = lazyDev(() => import("../shop-vendor/shop-vendor.page.container"));
+const EmailOverlayContainer = lazyDev(() => import("../../components/email-overlay/email-overlay.container.jsx"));
+const JobsCreateContainerPage = lazyDev(() => import("../jobs-create/jobs-create.container"));
+const CourtesyCarCreateContainer = lazyDev(() => import("../courtesy-car-create/courtesy-car-create.page.container"));
+const CourtesyCarDetailContainer = lazyDev(() => import("../courtesy-car-detail/courtesy-car-detail.page.container"));
+const CourtesyCarsPage = lazyDev(() => import("../courtesy-cars/courtesy-cars.page.container"));
+const ContractCreatePage = lazyDev(() => import("../contract-create/contract-create.page.container"));
+const ContractDetailPage = lazyDev(() => import("../contract-detail/contract-detail.page.container"));
+const ContractsList = lazyDev(() => import("../contracts/contracts.page.container"));
+const BillsListPage = lazyDev(() => import("../bills/bills.page.container"));
+const FeatureRequestPage = lazyDev(() => import("../feature-request/feature-request.page.jsx"));

-const JobCostingModal = lazy(() => import("../../components/job-costing-modal/job-costing-modal.container"));
-const ReportCenterModal = lazy(() => import("../../components/report-center-modal/report-center-modal.container"));
-const BillEnterModalContainer = lazy(() => import("../../components/bill-enter-modal/bill-enter-modal.container"));
-const TimeTicketModalContainer = lazy(() => import("../../components/time-ticket-modal/time-ticket-modal.container"));
-const TimeTicketModalTask = lazy(
+const JobCostingModal = lazyDev(() => import("../../components/job-costing-modal/job-costing-modal.container"));
+const ReportCenterModal = lazyDev(() => import("../../components/report-center-modal/report-center-modal.container"));
+const BillEnterModalContainer = lazyDev(() => import("../../components/bill-enter-modal/bill-enter-modal.container"));
+const TimeTicketModalContainer = lazyDev(() => import("../../components/time-ticket-modal/time-ticket-modal.container"));
+const TimeTicketModalTask = lazyDev(
  () => import("../../components/time-ticket-task-modal/time-ticket-task-modal.container")
 );
-const PaymentModalContainer = lazy(() => import("../../components/payment-modal/payment-modal.container"));
-const ProductionListPage = lazy(() => import("../production-list/production-list.container"));
-const ProductionBoardPage = lazy(() => import("../production-board/production-board.container"));
-// const ShopTemplates = lazy(() =>
+const PaymentModalContainer = lazyDev(() => import("../../components/payment-modal/payment-modal.container"));
+const ProductionListPage = lazyDev(() => import("../production-list/production-list.container"));
+const ProductionBoardPage = lazyDev(() => import("../production-board/production-board.container"));
+// const ShopTemplates = lazyDev(() =>
 //   import("../shop-templates/shop-templates.container")
 // );
-const JobIntake = lazy(() => import("../jobs-intake/jobs-intake.page.container"));
-const JobChecklistView = lazy(() => import("../jobs-checklist-view/jobs-checklist-view.page"));
-const JobDeliver = lazy(() => import("../jobs-deliver/jobs-delivery.page.container"));
-const AccountingQboCallback = lazy(() => import("../accounting-qbo/accounting-qbo.page"));
-const AccountingReceivables = lazy(() => import("../accounting-receivables/accounting-receivables.container"));
-const AccountingPayables = lazy(() => import("../accounting-payables/accounting-payables.container"));
-const AccountingPayments = lazy(() => import("../accounting-payments/accounting-payments.container"));
-const AllJobs = lazy(() => import("../jobs-all/jobs-all.container"));
-const ReadyJobs = lazy(() => import("../jobs-ready/jobs-ready.page"));
-const JobsClose = lazy(() => import("../jobs-close/jobs-close.container"));
-const JobsAdmin = lazy(() => import("../jobs-admin/jobs-admin.page"));
-const TempDocs = lazy(() => import("../temporary-docs/temporary-docs.container"));
+const JobIntake = lazyDev(() => import("../jobs-intake/jobs-intake.page.container"));
+const JobChecklistView = lazyDev(() => import("../jobs-checklist-view/jobs-checklist-view.page"));
+const JobDeliver = lazyDev(() => import("../jobs-deliver/jobs-delivery.page.container"));
+const AccountingQboCallback = lazyDev(() => import("../accounting-qbo/accounting-qbo.page"));
+const AccountingReceivables = lazyDev(() => import("../accounting-receivables/accounting-receivables.container"));
+const AccountingPayables = lazyDev(() => import("../accounting-payables/accounting-payables.container"));
+const AccountingPayments = lazyDev(() => import("../accounting-payments/accounting-payments.container"));
+const AllJobs = lazyDev(() => import("../jobs-all/jobs-all.container"));
+const ReadyJobs = lazyDev(() => import("../jobs-ready/jobs-ready.page"));
+const JobsClose = lazyDev(() => import("../jobs-close/jobs-close.container"));
+const JobsAdmin = lazyDev(() => import("../jobs-admin/jobs-admin.page"));
+const TempDocs = lazyDev(() => import("../temporary-docs/temporary-docs.container"));

-const ShopCsiPageContainer = lazy(() => import("../shop-csi/shop-csi.container.page"));
-const PaymentsAll = lazy(() => import("../payments-all/payments-all.container.page"));
-const ShiftClock = lazy(() => import("../shift-clock/shift-clock.page"));
-const Scoreboard = lazy(() => import("../scoreboard/scoreboard.page.container"));
-const TimeTicketsAll = lazy(() => import("../time-tickets/time-tickets.container"));
-const Help = lazy(() => import("../help/help.page"));
-const PartsQueue = lazy(() => import("../parts-queue/parts-queue.page.container"));
-const ExportLogs = lazy(() => import("../export-logs/export-logs.page.container"));
-const Phonebook = lazy(() => import("../phonebook/phonebook.page.container"));
+const ShopCsiPageContainer = lazyDev(() => import("../shop-csi/shop-csi.container.page"));
+const PaymentsAll = lazyDev(() => import("../payments-all/payments-all.container.page"));
+const ShiftClock = lazyDev(() => import("../shift-clock/shift-clock.page"));
+const Scoreboard = lazyDev(() => import("../scoreboard/scoreboard.page.container"));
+const TimeTicketsAll = lazyDev(() => import("../time-tickets/time-tickets.container"));
+const Help = lazyDev(() => import("../help/help.page"));
+const PartsQueue = lazyDev(() => import("../parts-queue/parts-queue.page.container"));
+const ExportLogs = lazyDev(() => import("../export-logs/export-logs.page.container"));
+const Phonebook = lazyDev(() => import("../phonebook/phonebook.page.container"));

-const EmailTest = lazy(() => import("../../components/email-test/email-test-component"));
-const Dashboard = lazy(() => import("../dashboard/dashboard.container"));
-const Dms = lazy(() => import("../dms/dms.container"));
-const DmsPayables = lazy(() => import("../dms-payables/dms-payables.container"));
-const ManageRootPage = lazy(() => import("../manage-root/manage-root.page.container"));
-const TtApprovals = lazy(() => import("../tt-approvals/tt-approvals.page.container"));
-const MyTasksPage = lazy(() => import("../tasks/myTasksPageContainer.jsx"));
-const AllTasksPage = lazy(() => import("../tasks/allTasksPageContainer.jsx"));
+const EmailTest = lazyDev(() => import("../../components/email-test/email-test-component"));
+const Dashboard = lazyDev(() => import("../dashboard/dashboard.container"));
+const Dms = lazyDev(() => import("../dms/dms.container"));
+const DmsPayables = lazyDev(() => import("../dms-payables/dms-payables.container"));
+const ManageRootPage = lazyDev(() => import("../manage-root/manage-root.page.container"));
+const TtApprovals = lazyDev(() => import("../tt-approvals/tt-approvals.page.container"));
+const MyTasksPage = lazyDev(() => import("../tasks/myTasksPageContainer.jsx"));
+const AllTasksPage = lazyDev(() => import("../tasks/allTasksPageContainer.jsx"));

-const TaskUpsertModalContainer = lazy(() => import("../../components/task-upsert-modal/task-upsert-modal.container"));
+const TaskUpsertModalContainer = lazyDev(() => import("../../components/task-upsert-modal/task-upsert-modal.container"));
 const { Content } = Layout;

 const mapStateToProps = createStructuredSelector({
--- a/client/src/pages/phonebook/phonebook.page.component.jsx
+++ b/client/src/pages/phonebook/phonebook.page.component.jsx
@@ -167,6 +167,7 @@ export function PhonebookPageComponent({ bodyshop, authLevel }) {
              searchParams.page = 1;
              history({ search: queryString.stringify(searchParams) });
            }}
+            enterButton
          />
        </Space>
      }
--- a/client/src/pages/simplified-parts/simplified-parts.page.component.jsx
+++ b/client/src/pages/simplified-parts/simplified-parts.page.component.jsx
@@ -1,6 +1,6 @@
 import * as Sentry from "@sentry/react";
 import { FloatButton, Layout, Spin } from "antd";
-import { lazy, Suspense, useEffect } from "react";
+import { Suspense, useEffect } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { Navigate, Route, Routes, useLocation } from "react-router-dom";
@@ -15,20 +15,21 @@ import UpdateAlert from "../../components/update-alert/update-alert.component.js
 import { selectBodyshop, selectInstanceConflict } from "../../redux/user/user.selectors.js";
 import InstanceRenderManager from "../../utils/instanceRenderMgr.js";
 import useAlertsNotifications from "../../hooks/useAlertsNotifications.jsx";
+import { lazyDev } from "../../utils/lazyWithPreload.jsx";

-const SimplifiedPartsJobsPage = lazy(() => import("../simplified-parts-jobs/simplified-parts-jobs.page.jsx"));
-const SimplifiedPartsJobsDetailPage = lazy(
+const SimplifiedPartsJobsPage = lazyDev(() => import("../simplified-parts-jobs/simplified-parts-jobs.page.jsx"));
+const SimplifiedPartsJobsDetailPage = lazyDev(
  () => import("../simplified-parts-jobs-detail/simplified-parts-jobs-detail.container.jsx")
 );
-const PartsSettingsPage = lazy(() => import("../parts-settings/parts-settings.page.component.jsx"));
-const ShopVendorPageContainer = lazy(() => import("../shop-vendor/shop-vendor.page.container.jsx"));
-const EmailOverlayContainer = lazy(() => import("../../components/email-overlay/email-overlay.container.jsx"));
-const ReportCenterModal = lazy(() => import("../../components/report-center-modal/report-center-modal.container.jsx"));
-const PrintCenterModalContainer = lazy(
+const PartsSettingsPage = lazyDev(() => import("../parts-settings/parts-settings.page.component.jsx"));
+const ShopVendorPageContainer = lazyDev(() => import("../shop-vendor/shop-vendor.page.container.jsx"));
+const EmailOverlayContainer = lazyDev(() => import("../../components/email-overlay/email-overlay.container.jsx"));
+const ReportCenterModal = lazyDev(() => import("../../components/report-center-modal/report-center-modal.container.jsx"));
+const PrintCenterModalContainer = lazyDev(
  () => import("../../components/print-center-modal/print-center-modal.container")
 );
-const VehiclesContainer = lazy(() => import("../vehicles/vehicles.page.container.jsx"));
-const VehiclesDetailContainer = lazy(() => import("../vehicles-detail/vehicles-detail.page.container.jsx"));
+const VehiclesContainer = lazyDev(() => import("../vehicles/vehicles.page.container.jsx"));
+const VehiclesDetailContainer = lazyDev(() => import("../vehicles-detail/vehicles-detail.page.container.jsx"));
 const { Content } = Layout;

 // Redirector to strip '/parts/jobs' from path for non-detail routes
--- a/client/src/pages/tasks/tasks.page.component.jsx
+++ b/client/src/pages/tasks/tasks.page.component.jsx
@@ -23,17 +23,10 @@ export function TasksPageComponent({ bodyshop, currentUser, type }) {
          relationshipType={"assigned_to"}
          query={{ QUERY_MY_TASKS_PAGINATED }}
          titleTranslation={"tasks.titles.my_tasks"}
-          disableJobRefetch={true}
        />
      );
    case taskPageTypes.ALL_TASKS:
-      return (
-        <TaskListContainer
-          query={{ QUERY_ALL_TASKS_PAGINATED }}
-          titleTranslation={"tasks.titles.all_tasks"}
-          disableJobRefetch={true}
-        />
-      );
+      return <TaskListContainer query={{ QUERY_ALL_TASKS_PAGINATED }} titleTranslation={"tasks.titles.all_tasks"} />;
    default:
      return <></>;
  }
--- a/client/src/pages/tech/tech.page.component.jsx
+++ b/client/src/pages/tech/tech.page.component.jsx
@@ -1,5 +1,5 @@
 import { Card, FloatButton, Layout } from "antd";
-import { lazy, Suspense, useEffect } from "react";
+import { Suspense, useEffect } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { Route, Routes, useNavigate } from "react-router-dom";
@@ -15,25 +15,26 @@ import { selectTechnician } from "../../redux/tech/tech.selectors";
 import InstanceRenderManager from "../../utils/instanceRenderMgr";
 import "./tech.page.styles.scss";
 import UpsellComponent, { upsellEnum } from "../../components/upsell/upsell.component.jsx";
+import { lazyDev } from "../../utils/lazyWithPreload.jsx";

-const TimeTicketModalContainer = lazy(() => import("../../components/time-ticket-modal/time-ticket-modal.container"));
-const EmailOverlayContainer = lazy(() => import("../../components/email-overlay/email-overlay.container.jsx"));
-const PrintCenterModalContainer = lazy(
+const TimeTicketModalContainer = lazyDev(() => import("../../components/time-ticket-modal/time-ticket-modal.container"));
+const EmailOverlayContainer = lazyDev(() => import("../../components/email-overlay/email-overlay.container.jsx"));
+const PrintCenterModalContainer = lazyDev(
  () => import("../../components/print-center-modal/print-center-modal.container")
 );
-const TechLogin = lazy(() => import("../../components/tech-login/tech-login.component"));
-const TechLookup = lazy(() => import("../tech-lookup/tech-lookup.container"));
-const ProductionListPage = lazy(() => import("../production-list/production-list.container"));
-const ProductionBoardPage = lazy(() => import("../production-board/production-board.container"));
-const TechJobClock = lazy(() => import("../tech-job-clock/tech-job-clock.component"));
-const TechShiftClock = lazy(() => import("../tech-shift-clock/tech-shift-clock.component"));
-const TimeTicketModalTask = lazy(
+const TechLogin = lazyDev(() => import("../../components/tech-login/tech-login.component"));
+const TechLookup = lazyDev(() => import("../tech-lookup/tech-lookup.container"));
+const ProductionListPage = lazyDev(() => import("../production-list/production-list.container"));
+const ProductionBoardPage = lazyDev(() => import("../production-board/production-board.container"));
+const TechJobClock = lazyDev(() => import("../tech-job-clock/tech-job-clock.component"));
+const TechShiftClock = lazyDev(() => import("../tech-shift-clock/tech-shift-clock.component"));
+const TimeTicketModalTask = lazyDev(
  () => import("../../components/time-ticket-task-modal/time-ticket-task-modal.container")
 );
-const TechAssignedProdJobs = lazy(() => import("../tech-assigned-prod-jobs/tech-assigned-prod-jobs.component"));
-const TechDispatchedParts = lazy(() => import("../tech-dispatched-parts/tech-dispatched-parts.page"));
+const TechAssignedProdJobs = lazyDev(() => import("../tech-assigned-prod-jobs/tech-assigned-prod-jobs.component"));
+const TechDispatchedParts = lazyDev(() => import("../tech-dispatched-parts/tech-dispatched-parts.page"));

-const TaskUpsertModalContainer = lazy(() => import("../../components/task-upsert-modal/task-upsert-modal.container"));
+const TaskUpsertModalContainer = lazyDev(() => import("../../components/task-upsert-modal/task-upsert-modal.container"));

 const { Content } = Layout;

--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -1676,7 +1676,9 @@
        "deleted": "Error deleting Job. {{error}}",
        "exporting": "Error exporting Job. {{error}}",
        "exporting-partner": "Unable to connect to partner application. Please ensure it is running and logged in.",
+        "invalidjoblines": "Job has invalid job lines.",
        "invoicing": "Error invoicing Job. {{error}}",
+        "missingjoblineids": "Missing job line IDs for job lines.",
        "noaccess": "This Job does not exist or you do not have access to it.",
        "nodamage": "No damage points on estimate.",
        "nodates": "No dates specified for this Job.",
@@ -1782,6 +1784,8 @@
        "ded_status": "Deductible Status",
        "depreciation_taxes": "Betterment/Depreciation/Taxes",
        "dms": {
+          "first_name": "First Name",
+          "last_name": "Last Name",
          "address": "Customer Address",
          "amount": "Amount",
          "center": "Center",
@@ -3574,7 +3578,7 @@
      "accounting-payables": "Payables | {{app}}",
      "accounting-payments": "Payments | {{app}}",
      "accounting-receivables": "Receivables | {{app}}",
-      "all_tasks": "All Tasks",
+      "all_tasks": "All Tasks | {{app}}",
      "app": "",
      "bc": {
        "simplified-parts-jobs": "Jobs",
@@ -3655,7 +3659,7 @@
      "jobsdetail": "Job {{ro_number}} | {{app}}",
      "jobsdocuments": "Job Documents {{ro_number}} | {{app}}",
      "manageroot": "Home | {{app}}",
-      "my_tasks": "My Tasks",
+      "my_tasks": "My Tasks | {{app}}",
      "owners": "All Owners | {{app}}",
      "owners-detail": "{{name}} | {{app}}",
      "parts-queue": "Parts Queue | {{app}}",
--- a/client/src/translations/es/common.json
+++ b/client/src/translations/es/common.json
@@ -1674,7 +1674,9 @@
        "deleted": "Error al eliminar el trabajo.",
        "exporting": "",
        "exporting-partner": "",
+        "invalidjoblines": "",
        "invoicing": "",
+        "missingjoblineids": "",
        "noaccess": "Este trabajo no existe o no tiene acceso a él.",
        "nodamage": "",
        "nodates": "No hay fechas especificadas para este trabajo.",
@@ -1780,6 +1782,8 @@
        "ded_status": "Estado deducible",
        "depreciation_taxes": "Depreciación / Impuestos",
        "dms": {
+          "first_name": "",
+          "last_name": "",
          "address": "",
          "amount": "",
          "center": "",
--- a/client/src/translations/fr/common.json
+++ b/client/src/translations/fr/common.json
@@ -1674,7 +1674,9 @@
        "deleted": "Erreur lors de la suppression du travail.",
        "exporting": "",
        "exporting-partner": "",
+        "invalidjoblines": "",
        "invoicing": "",
+        "missingjoblineids": "",
        "noaccess": "Ce travail n'existe pas ou vous n'y avez pas accès.",
        "nodamage": "",
        "nodates": "Aucune date spécifiée pour ce travail.",
@@ -1780,6 +1782,8 @@
        "ded_status": "Statut de franchise",
        "depreciation_taxes": "Amortissement / taxes",
        "dms": {
+          "first_name": "",
+          "last_name": "",
          "address": "",
          "amount": "",
          "center": "",
--- a/client/src/utils/lazyWithPreload.jsx
+++ b/client/src/utils/lazyWithPreload.jsx
@@ -0,0 +1,35 @@
+import { lazy } from "react";
+
+/**
+ * Conditionally uses lazy loading based on environment.
+ * By default, uses React.lazy in all environments.
+ * Set VITE_DISABLE_LAZY_LOADING=true to load modules immediately in development (avoids compilation delays).
+ *
+ * Usage: const MyComponent = lazyDev(() => import('./MyComponent'));
+ */
+export const lazyDev = (importFunc) => {
+  // Check if lazy loading should be disabled (dev only, opt-in via env var)
+  const disableLazyLoading = import.meta.env.DEV && import.meta.env?.VITE_DISABLE_LAZY_LOADING === "true";
+
+  if (!disableLazyLoading) {
+    // Default behavior: use React.lazy for code splitting
+    return lazy(importFunc);
+  }
+
+  // Dev mode with lazy loading disabled: load immediately to avoid delays
+  let Component = null;
+  const promise = importFunc().then((module) => {
+    Component = module.default;
+  });
+
+  const LazyDevComponent = (props) => {
+    if (!Component) {
+      throw promise; // Suspense will catch this
+    }
+    return <Component {...props} />;
+  };
+
+  LazyDevComponent.displayName = "LazyDevComponent";
+
+  return LazyDevComponent;
+};
--- a/client/vite.config.js
+++ b/client/vite.config.js
@@ -11,6 +11,8 @@ import { VitePWA } from "vite-plugin-pwa";
 import InstanceRenderManager from "./src/utils/instanceRenderMgr";
 import browserslist from "browserslist";
 import { browserslistToTargets } from "lightningcss";
+import { fileURLToPath } from "url";
+import { dirname, resolve } from "path";

 process.env.VITE_APP_GIT_SHA_DATE = new Date().toLocaleString("en-US", { timeZone: "America/Los_Angeles" });
 const commitHash = child.execSync("git rev-parse HEAD").toString().trimEnd();
@@ -43,13 +45,19 @@ const httpsCerts = {
  cert: await fsPromises.readFile("../certs/cert.pem")
 };

+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
+
 export default defineConfig(({ command, mode }) => {
-  // Only enable React Compiler on build in production/test (keeps dev as fast as possible)
+  // React Compiler is always enabled for production/test builds
+  // In dev mode, it's enabled by default but can be disabled with VITE_DISABLE_COMPILER_IN_DEV=true
  const isBuild = command === "build";
  const isTestBuild =
    mode === "test" || process.env.VITE_APP_IS_TEST === "true" || process.env.VITE_APP_IS_TEST === "1";
+
  const enableReactCompiler =
-    process.env.VITE_ENABLE_COMPILER_IN_DEV || (isBuild && (mode === "production" || isTestBuild));
+    (isBuild && (mode === "production" || isTestBuild)) || // Always enable for prod/test builds
+    process.env?.VITE_DISABLE_COMPILER_IN_DEV !== "true"; // In dev, enable unless explicitly disabled

  logger.info(
    enableReactCompiler ? chalk.green.bold("React Compiler enabled") : chalk.yellow.bold("React Compiler disabled")
@@ -57,6 +65,13 @@ export default defineConfig(({ command, mode }) => {

  return {
    base: "/",
+    resolve: {
+      dedupe: ["styled-components", "react", "react-dom"],
+      alias: {
+        // Force all styled-components imports to resolve to the same location (absolute path)
+        "styled-components": resolve(__dirname, "node_modules/styled-components/dist/styled-components.browser.esm.js")
+      }
+    },
    plugins: [
      ViteEjsPlugin((viteConfig) => ({ env: viteConfig.env })),

@@ -243,7 +258,8 @@ export default defineConfig(({ command, mode }) => {

    // Strip console/debugger in prod to shrink bundles
    esbuild: {
-      //drop: ["console", "debugger"]
+      // drop: mode === "production" ? ["console", "debugger"] : [],
+      legalComments: "none" // Remove license comments in production
    },

    optimizeDeps: {
@@ -265,11 +281,14 @@ export default defineConfig(({ command, mode }) => {
        "@firebase/firestore",
        "@firebase/auth",
        "@firebase/messaging",
-        "@firebase/util"
+        "@firebase/util",
+        "styled-components"
      ],
      esbuildOptions: {
        loader: { ".jsx": "jsx", ".tsx": "tsx" }
-      }
+      },
+      // Force styled-components to be pre-bundled and deduplicated
+      force: mode === "development"
    },

    css: {
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -18,23 +18,23 @@
    "job-totals-fixtures:local": "docker exec node-app /usr/bin/node /app/download-job-totals-fixtures.js"
  },
  "dependencies": {
-    "@aws-sdk/client-cloudwatch-logs": "^3.974.0",
-    "@aws-sdk/client-elasticache": "^3.974.0",
-    "@aws-sdk/client-s3": "^3.974.0",
-    "@aws-sdk/client-secrets-manager": "^3.974.0",
-    "@aws-sdk/client-ses": "^3.974.0",
-    "@aws-sdk/credential-provider-node": "^3.972.1",
-    "@aws-sdk/lib-storage": "^3.974.0",
-    "@aws-sdk/s3-request-presigner": "^3.974.0",
+    "@aws-sdk/client-cloudwatch-logs": "^3.978.0",
+    "@aws-sdk/client-elasticache": "^3.978.0",
+    "@aws-sdk/client-s3": "^3.978.0",
+    "@aws-sdk/client-secrets-manager": "^3.978.0",
+    "@aws-sdk/client-ses": "^3.978.0",
+    "@aws-sdk/credential-provider-node": "^3.972.3",
+    "@aws-sdk/lib-storage": "^3.978.0",
+    "@aws-sdk/s3-request-presigner": "^3.978.0",
    "@opensearch-project/opensearch": "^2.13.0",
    "@socket.io/admin-ui": "^0.5.1",
    "@socket.io/redis-adapter": "^8.3.0",
    "archiver": "^7.0.1",
    "aws4": "^1.13.2",
-    "axios": "^1.13.2",
+    "axios": "^1.13.4",
    "axios-curlirize": "^2.0.0",
    "better-queue": "^3.8.12",
-    "bullmq": "^5.66.7",
+    "bullmq": "^5.67.2",
    "chart.js": "^4.5.1",
    "cloudinary": "^2.9.0",
    "compression": "^1.8.1",
@@ -44,7 +44,7 @@
    "dinero.js": "^1.9.1",
    "dotenv": "^17.2.3",
    "express": "^4.21.1",
-    "fast-xml-parser": "^5.3.3",
+    "fast-xml-parser": "^5.3.4",
    "firebase-admin": "^13.6.0",
    "graphql": "^16.12.0",
    "graphql-request": "^6.1.0",
@@ -65,7 +65,7 @@
    "recursive-diff": "^1.0.9",
    "rimraf": "^6.1.2",
    "skia-canvas": "^3.0.8",
-    "soap": "^1.6.3",
+    "soap": "^1.6.4",
    "socket.io": "^4.8.3",
    "socket.io-adapter": "^2.5.6",
    "ssh2-sftp-client": "^11.0.0",
@@ -82,7 +82,7 @@
    "@eslint/js": "^9.39.2",
    "eslint": "^9.39.2",
    "eslint-plugin-react": "^7.37.5",
-    "globals": "^17.1.0",
+    "globals": "^17.2.0",
    "mock-require": "^3.0.3",
    "p-limit": "^3.1.0",
    "prettier": "^3.8.1",
--- a/server/fortellis/fortellis.js
+++ b/server/fortellis/fortellis.js
@@ -306,8 +306,7 @@ async function FortellisSelectedCustomer({ socket, redisHelpers, selectedCustome
            CreateFortellisLogEvent(socket, "ERROR", `{7.1} Error posting vehicle service history. ${error.message}`);
          }

-          //TODO: IF THE VEHICLE SERVICE HISTORY FAILS, WE NEED TO MARK IT AS SUCH AND NOT DELETE THE TRANSACTION.
-          //socket.emit("export-success", JobData.id);
+          socket.emit("export-success", JobData.id);
        } else {
          //There was something wrong. Throw an error to trigger clean up. 
          //throw new Error("Error posting DMS Batch Transaction");
@@ -431,10 +430,10 @@ async function QueryDmsCustomerByName({ socket, redisHelpers, JobData }) {
  const ownerName =
    JobData.ownr_co_nm && JobData.ownr_co_nm.trim() !== ""
      //? [["firstName", JobData.ownr_co_nm.replace(replaceSpecialRegex, "").toUpperCase()]] // Commented out until we receive direction. 
-      ? [["email", JobData.ownr_ea.toUpperCase()]]
+      ? [["phone", JobData.ownr_ph1?.replace(replaceSpecialRegex, "")]]
      : [
-        ["firstName", JobData.ownr_fn.replace(replaceSpecialRegex, "").toUpperCase()],
-        ["lastName", JobData.ownr_ln.replace(replaceSpecialRegex, "").toUpperCase()]
+        ["firstName", JobData.ownr_fn?.replace(replaceSpecialRegex, "").toUpperCase()],
+        ["lastName", JobData.ownr_ln?.replace(replaceSpecialRegex, "").toUpperCase()]
      ];
  try {
    const result = await MakeFortellisCall({
--- a/server/graphql-client/queries.js
+++ b/server/graphql-client/queries.js
@@ -1725,6 +1725,7 @@ query QUERY_JOB_COSTING_DETAILS($id: uuid!) {
        profitcenter_part
        profitcenter_labor
        act_price_before_ppc
+        manual_line
      }
      bills {
        id
@@ -1842,6 +1843,7 @@ exports.QUERY_JOB_COSTING_DETAILS_MULTI = ` query QUERY_JOB_COSTING_DETAILS_MULT
      op_code_desc
      profitcenter_part
      profitcenter_labor
+      manual_line
    }
    bills {
      id
--- a/server/job/job-costing.js
+++ b/server/job/job-costing.js
@@ -343,7 +343,7 @@ function GenerateCostingData(job) {
          if (!acc.labor[laborProfitCenter]) acc.labor[laborProfitCenter] = Dinero();
          acc.labor[laborProfitCenter] = acc.labor[laborProfitCenter].add(laborAmount);

-          if (val.act_price > 0 && val.lbr_op === "OP14") {
+          if (val.act_price > 0 && val.lbr_op === "OP14" && !val.part_type) {
            //Scenario where SGI may pay out hours using a part price.
            acc.labor[laborProfitCenter] = acc.labor[laborProfitCenter].add(
              Dinero({
@@ -363,6 +363,9 @@ function GenerateCostingData(job) {
            if (val.mod_lbr_ty !== "LAR" && mashOpCodes.includes(val.lbr_op)) {
              materialsHours.mashHrs += val.mod_lb_hrs || 0;
            }
+            if (val.manual_line === true && !mashOpCodes.includes(val.lbr_op) && val.mod_lbr_ty !== "LAR" ) {
+              materialsHours.mashHrs += val.mod_lb_hrs || 0;
+            }
          }
        }

@@ -499,7 +502,7 @@ function GenerateCostingData(job) {
    let disc = Dinero(),
      markup = Dinero();
    const convertedKey = Object.keys(defaultProfits).find((k) => defaultProfits[k] === key);
-    if (job.parts_tax_rates && job.parts_tax_rates[convertedKey.toUpperCase()]) {
+    if (convertedKey && job.parts_tax_rates && job.parts_tax_rates[convertedKey.toUpperCase()]) {
      if (
        job.parts_tax_rates[convertedKey.toUpperCase()].prt_discp !== undefined &&
        job.parts_tax_rates[convertedKey.toUpperCase()].prt_discp >= 0
@@ -523,14 +526,16 @@ function GenerateCostingData(job) {
    }

    if (InstanceManager({ rome: true })) {
-      const correspondingCiecaStlTotalLine = job.cieca_stl?.data.find(
-        (c) => c.ttl_typecd === convertedKey.toUpperCase()
-      );
-      if (
-        correspondingCiecaStlTotalLine &&
-        Math.abs(jobLineTotalsByProfitCenter.parts[key].getAmount() - correspondingCiecaStlTotalLine.ttl_amt * 100) > 1
-      ) {
-        jobLineTotalsByProfitCenter.parts[key] = jobLineTotalsByProfitCenter.parts[key].add(disc).add(markup);
+      if (convertedKey) {
+        const correspondingCiecaStlTotalLine = job.cieca_stl?.data.find(
+          (c) => c.ttl_typecd === convertedKey.toUpperCase()
+        );
+        if (
+          correspondingCiecaStlTotalLine &&
+          Math.abs(jobLineTotalsByProfitCenter.parts[key].getAmount() - correspondingCiecaStlTotalLine.ttl_amt * 100) > 1
+        ) {
+          jobLineTotalsByProfitCenter.parts[key] = jobLineTotalsByProfitCenter.parts[key].add(disc).add(markup);
+        }
      }
    }
  });
--- a/server/job/job-totals-USA.js
+++ b/server/job/job-totals-USA.js
@@ -47,14 +47,14 @@ exports.totalsSsu = async function (req, res) {
      throw new Error("Failed to update job totals");
    }

-    res.status(200).send();
+    res.status(200).json({ success: true });
  } catch (error) {
    logger.log("job-totals-ssu-USA-error", "error", req?.user?.email, id, {
      jobid: id,
      error: error.message,
      stack: error.stack
    });
-    res.status(503).send();
+    res.status(503).json({ error: "Failed to calculate totals" });
  }
 };

--- a/server/job/job-totals.js
+++ b/server/job/job-totals.js
@@ -47,14 +47,14 @@ exports.totalsSsu = async function (req, res) {
      throw new Error("Failed to update job totals");
    }

-    res.status(200).send();
+    res.status(200).json({ success: true });
  } catch (error) {
    logger.log("job-totals-ssu-error", "error", req.user.email, id, {
      jobid: id,
      error: error.message,
      stack: error.stack
    });
-    res.status(503).send();
+    res.status(503).json({ error: "Failed to calculate totals" });
  }
 };
Author	SHA1	Message	Date
Dave	1566084d9c	bugfix/IO-3531 - Disable unnecessary refetch queries causing page reload.	2026-02-02 12:25:19 -05:00
Allan Carr	849d967b56	Merged in hotfix/2026-01-30 (pull request #2931 ) IO-3529 Fix for Parts Return	2026-02-01 01:49:08 +00:00
Allan Carr	519d7e8d87	Merged in feature/IO-3529-DMS-Make-Code (pull request #2932 ) IO-3529 CM Recieved Fix	2026-02-01 01:41:46 +00:00
Allan Carr	b08435607e	IO-3529 CM Recieved Fix Signed-off-by: Allan Carr <allan@imexsystems.ca>	2026-01-31 17:43:16 -08:00
Allan Carr	ea9e4ffcad	IO-3529 Fix for Parts Return Signed-off-by: Allan Carr <allan@imexsystems.ca>	2026-01-31 16:59:17 -08:00
Allan Carr	6c814c7dc6	Merged in feature/IO-3529-DMS-Make-Code (pull request #2929 ) IO-3529 Fix for Parts Return	2026-02-01 00:57:43 +00:00
Allan Carr	cc9e536059	Merged in hotfix/2026-01-30 (pull request #2928 ) IO-3529 Job Lines on Closing add IDs	2026-01-31 19:37:46 +00:00
Allan Carr	dadc9892d0	IO-3529 Job Lines on Closing add IDs Signed-off-by: Allan Carr <allan@imexsystems.ca>	2026-01-31 11:32:05 -08:00
Allan Carr	b05e20ce0d	Merged in feature/IO-3529-DMS-Make-Code (pull request #2926 ) IO-3529 Job Lines on Closing add IDs	2026-01-31 19:30:29 +00:00
Allan Carr	eb36b12cb0	Merged in hotfix/2026-01-30 (pull request #2925 ) IO-3529 DMS Make Code	2026-01-31 06:46:32 +00:00
Allan Carr	bf5a099fa6	IO-3529 DMS Make Code Signed-off-by: Allan Carr <allan@imexsystems.ca>	2026-01-30 22:39:56 -08:00
Allan Carr	ff3d24c623	Merged in feature/IO-3529-DMS-Make-Code (pull request #2923 ) IO-3529 DMS Make Code	2026-01-31 06:38:26 +00:00
Dave Richer	27b955a701	Merged in release/2026-01-23 (pull request #2918 ) Release/2026 01 23 into master-AIO - IO-3497, IO-3499, IO-3503, IO-3509, IO-3512, IO-3514, IO-3523	2026-01-31 03:23:30 +00:00
Allan Carr	1896c4db59	Merged in feature/IO-3503-Job-Costing-Fixes (pull request #2921 ) IO-3503 Job Costing Corrections Approved-by: Dave Richer	2026-01-31 01:10:20 +00:00
Allan Carr	78770ed54e	IO-3503 Job Costing Corrections Signed-off-by: Allan Carr <allan@imexsystems.ca>	2026-01-30 16:45:25 -08:00
Dave Richer	9e2ae2cc10	Merged in feature/IO-3499-React-19 (pull request #2919 ) feature/IO-3499-React-19 -Checkpoint	2026-01-30 22:32:54 +00:00
Dave	3a0f6101c8	feature/IO-3499-React-19 -Checkpoint	2026-01-30 17:32:12 -05:00
Dave Richer	f0dfa2717f	Merged in feature/IO-3499-React-19 (pull request #2916 ) feature/IO-3499-React-19 -Checkpoint	2026-01-30 17:33:51 +00:00
Dave	1f3be72d9d	feature/IO-3499-React-19 -Checkpoint	2026-01-30 12:33:20 -05:00
Allan Carr	3d9ad799f3	Merged in hotfix/2026-01-29 (pull request #2915 ) IO-3522 Replace Email with Phone1	2026-01-29 21:31:13 +00:00
Allan Carr	6e17ef10bb	Merged in feature/IO-3522-Fortellis-Bug-Fix (pull request #2914 ) IO-3522 Replace Email with Phone1	2026-01-29 21:28:48 +00:00
Allan Carr	fdc06e79a6	IO-3522 Replace Email with Phone1 Signed-off-by: Allan Carr <allan@imexsystems.ca>	2026-01-29 13:29:01 -08:00
Allan Carr	66924367fc	Merged in feature/IO-3522-Fortellis-Bug-Fix (pull request #2913 ) IO-3522 Replace Email with Phone1	2026-01-29 21:28:11 +00:00
Allan Carr	f76165552e	Merged in hotfix/2026-01-29 (pull request #2912 ) IO-3522 Fortellis Null Coalesce for Owner data	2026-01-29 21:06:39 +00:00
Allan Carr	80fbb847d8	Merged in feature/IO-3522-Fortellis-Bug-Fix (pull request #2911 ) IO-3522 Fortellis Null Coalesce for Owner data	2026-01-29 21:02:40 +00:00
Allan Carr	ca1703e724	Merged in feature/IO-3522-Fortellis-Bug-Fix (pull request #2910 ) Feature/IO-3522 Fortellis Bug Fix Approved-by: Patrick Fic	2026-01-29 21:00:45 +00:00
Allan Carr	163819809c	IO-3522 Fortellis Null Coalesce for Owner data Signed-off-by: Allan Carr <allan@imexsystems.ca>	2026-01-29 12:57:14 -08:00
Dave Richer	42fa85e145	Merged in feature/IO-3499-React-19 (pull request #2908 ) feature/IO-3499-React-19 -Checkpoint	2026-01-29 17:37:01 +00:00
Dave	13104f36e3	feature/IO-3499-React-19 -Checkpoint	2026-01-29 12:36:34 -05:00
Dave Richer	0c9f7df9ac	Merged in feature/IO-3499-React-19 (pull request #2907 ) feature/IO-3499-React-19 -Checkpoint	2026-01-29 17:33:26 +00:00
Dave	a9280a83ba	feature/IO-3499-React-19 -Checkpoint	2026-01-29 12:31:04 -05:00
Dave Richer	78d816fa8b	Merged in feature/IO-3499-React-19 (pull request #2905 ) feature/IO-3499-React-19 -Checkpoint	2026-01-28 19:02:42 +00:00
Dave	9f573fc5b4	feature/IO-3499-React-19 -Checkpoint	2026-01-28 14:02:06 -05:00
Dave Richer	4a1b1fe905	Merged in feature/IO-3499-React-19 (pull request #2902 ) Feature/IO-3499 React 19	2026-01-28 02:31:43 +00:00
Dave	5f81ec2099	feature/IO-3499-React-19 -Checkpoint	2026-01-27 21:31:03 -05:00
Dave	147977be58	feature/IO-3499-React-19 -Checkpoint	2026-01-27 20:57:16 -05:00
Dave	4dfda4b371	feature/IO-3499-React-19 -Checkpoint	2026-01-27 20:40:04 -05:00
Dave	02feba2804	feature/IO-3499-React-19 -Checkpoint	2026-01-27 19:54:40 -05:00
Dave Richer	a9fb77189e	Merged in feature/IO-3499-React-19 (pull request #2900 ) Feature/IO-3499 React 19	2026-01-28 00:27:51 +00:00
Dave	3bacad69e3	feature/IO-3499-React-19 -Checkpoint	2026-01-27 19:26:42 -05:00
Patrick Fic	70b6aa63ed	Merged in feature/IO-3517-fortellis-hotfix (pull request #2899 ) IO-3517 Resolve emit on fortellis completion.	2026-01-27 19:32:02 +00:00
Patrick Fic	844a879f1c	IO-3517 Resolve emit on fortellis completion.	2026-01-27 11:31:10 -08:00
Dave	6415b302dc	Merge remote-tracking branch 'origin/release/2026-01-23' into feature/IO-3499-React-19	2026-01-27 10:29:54 -05:00
Allan Carr	d40dd649e2	Merged in feature/IO-3512-Page-Titles (pull request #2896 ) IO-3512 Great Search Fix Approved-by: Dave Richer	2026-01-27 15:28:01 +00:00
Allan Carr	35366eda22	IO-3512 Great Search Fix Signed-off-by: Allan Carr <allan@imexsystems.ca>	2026-01-27 07:27:43 -08:00
Dave	9a53896aa4	feature/IO-3499-React-19 -Add pointer icons to clickable things in the production list view	2026-01-26 15:04:03 -05:00
Dave Richer	278765d019	Merged in feature/IO-3499-React-19 (pull request #2894 ) feature/IO-3499-React-19 -Checkpoint	2026-01-26 19:06:47 +00:00
Dave	6fd5fc8f66	Merge remote-tracking branch 'origin/release/2026-01-23' into feature/IO-3499-React-19	2026-01-26 14:04:10 -05:00
Dave	346a6e69c7	feature/IO-3499-React-19 -Checkpoint	2026-01-26 14:02:31 -05:00
Allan Carr	5d5fa8fead	Merged in feature/IO-3514-Tech-Console-Fixes (pull request #2890 ) IO-3514 Print Center Restrict Financial Group on Tech Station and Fix Drawer Close on Tech Console Approved-by: Dave Richer	2026-01-26 16:32:33 +00:00
Allan Carr	30dae4e365	Merged in feature/IO-3509-Duplicate-Job-Open-Estimate-Date (pull request #2891 ) IO-3509 Duplicate Job Open Estimate Date Approved-by: Dave Richer	2026-01-26 14:56:24 +00:00
Allan Carr	f6899f744b	Merged in feature/IO-3512-Page-Titles (pull request #2889 ) IO-3512 Page Title Approved-by: Dave Richer	2026-01-26 14:54:58 +00:00
Allan Carr	cca23a5b11	IO-3509 Correction for date_estimate to handle tz correctly Signed-off-by: Allan Carr <allan@imexsystems.ca>	2026-01-23 23:07:11 -08:00
Allan Carr	2acddcb9ac	IO-3509 Duplicate Job Open Estimate Date Signed-off-by: Allan Carr <allan@imexsystems.ca>	2026-01-23 22:51:53 -08:00
Allan Carr	ff57592c12	IO-3512 Page Title Fix Search UI to be consistent across product Signed-off-by: Allan Carr <allan@imexsystems.ca>	2026-01-23 20:02:19 -08:00