@burdenoff/microfe-movethewheels 2026.929.3 → 2026.930.1

package/src/movethewheels/hooks/useInventory.ts

@@ -1,6 +1,6 @@
 import { useCallback, useEffect, useMemo, useState } from 'react';
 import { useMoveTheWheels } from '../providers/MoveTheWheelsProvider';
-import type { Inventory, InventoryFilter, Product, Warehouse } from '../types';
+import type { Inventory, InventoryFilter, Product, ProductDimensions, Warehouse } from '../types';
 import { executeGraphQL } from '../utils/graphqlClient';
 
 interface UseInventoryOptions {
@@ -13,9 +13,15 @@ interface UseInventoryOptions {
 export interface CreateProductInput {
   name: string;
   sku: string;
-  category?: string;
-  brand?: string;
-  weight?: number;
+  description?: string | null;
+  category?: string | null;
+  brand?: string | null;
+  dimensions?: ProductDimensions | null;
+  weight?: number | null;
+  value?: number | null;
+  hazardous?: boolean;
+  fragile?: boolean;
+  temperatureControlled?: boolean;
 }
 
 export interface CreateWarehouseInput {
@@ -23,14 +29,8 @@ export interface CreateWarehouseInput {
   name: string;
   /** WarehouseType enum value, e.g. `DISTRIBUTION`, `FULFILLMENT`. */
   type: string;
-  address: {
-    street: string;
-    city: string;
-    state: string;
-    postalCode: string;
-    country: string;
-  };
-  /** Free-text on the backend, e.g. "ACTIVE", "INACTIVE". Defaults to ACTIVE. */
+  address: Record<string, string>;
+  /** Free-text on the backend, e.g. "ACTIVE", "INACTIVE". */
   status?: string;
   contactInfo?: { email?: string; phone?: string };
   totalCapacity?: number;
@@ -57,6 +57,7 @@ interface UseInventoryResult {
   createProduct: (input: CreateProductInput) => Promise<Product>;
   createWarehouse: (input: CreateWarehouseInput) => Promise<Warehouse>;
   updateProduct: (id: string, input: CreateProductInput) => Promise<Product>;
+  deleteProduct: (id: string) => Promise<void>;
   updateWarehouse: (id: string, input: CreateWarehouseInput) => Promise<Warehouse>;
   deleteWarehouse: (id: string) => Promise<void>;
 }
@@ -299,6 +300,12 @@ const UPDATE_PRODUCT_MUTATION = `
   }
 `;
 
+const DELETE_PRODUCT_MUTATION = `
+  mutation DeleteCargoItem($id: ID!) {
+    deleteCargoItem(id: $id)
+  }
+`;
+
 const CREATE_WAREHOUSE_MUTATION = `
   mutation CreateWarehouse($input: CreateWarehouseInput!) {
     createWarehouse(input: $input) {
@@ -357,24 +364,61 @@ const ADJUST_INVENTORY_MUTATION = `
     }
   }
 `;
+const TRANSFER_INVENTORY_STOCK_MUTATION = `
+  mutation TransferInventoryStock($input: TransferInventoryStockInput!) {
+    transferInventoryStock(input: $input) {
+      source {
+        id
+        cargoItemId
+        warehouseId
+        onHand
+        available
+        allocated
+        damaged
+        reorderPoint
+        createdAt
+        updatedAt
+      }
+      destination {
+        id
+        cargoItemId
+        warehouseId
+        onHand
+        available
+        allocated
+        damaged
+        reorderPoint
+        createdAt
+        updatedAt
+      }
+    }
+  }
+`;
+
+function mapDimensions(
+  raw: Record<string, unknown> | null | undefined
+): ProductDimensions | undefined {
+  if (!raw) return undefined;
+  const dimensions: ProductDimensions = {};
+  for (const key of ['length', 'width', 'height'] as const) {
+    const value = raw[key];
+    if (typeof value === 'number' && Number.isFinite(value)) dimensions[key] = value;
+  }
+  if (typeof raw.unit === 'string' && raw.unit.trim()) dimensions.unit = raw.unit;
+  return Object.keys(dimensions).length > 0 ? dimensions : undefined;
+}
 
 function mapProduct(product: ApiProduct): Product {
   return {
     id: product.id,
     sku: product.sku,
     name: product.name,
-    description: product.description ?? '',
-    category: product.category ?? 'general',
+    description: product.description ?? undefined,
+    category: product.category ?? undefined,
     brand: product.brand ?? undefined,
-    dimensions: {
-      length: 0,
-      width: 0,
-      height: 0,
-      unit: 'cm',
-      ...(product.dimensions ?? {}),
-    } as Product['dimensions'],
-    weight: product.weight ?? 0,
-    value: product.value ?? 0,
+    dimensions: mapDimensions(product.dimensions),
+    weight: product.weight ?? undefined,
+    value: product.value ?? undefined,
     barcode: undefined,
     images: [],
     attributes: [],
@@ -386,9 +430,21 @@ function mapProduct(product: ApiProduct): Product {
   };
 }
 
+function mapJsonStringRecord(
+  raw: Record<string, unknown> | null | undefined
+): Record<string, string> {
+  if (!raw) return {};
+  return Object.fromEntries(
+    Object.entries(raw).flatMap(([key, value]) =>
+      typeof value === 'string' && value.trim() ? [[key, value]] : []
+    )
+  );
+}
+
 function mapWarehouse(warehouse: ApiWarehouse): Warehouse {
-  const totalSpace = warehouse.totalCapacity ?? 0;
-  const usedSpace = warehouse.usedCapacity ?? 0;
+  const totalSpace =
+    typeof warehouse.totalCapacity === 'number' ? warehouse.totalCapacity : undefined;
+  const usedSpace = typeof warehouse.usedCapacity === 'number' ? warehouse.usedCapacity : undefined;
   const operatingHoursRaw = warehouse.operatingHours ?? {};
   const operatingHours: Warehouse['operatingHours'] = {};
   for (const [day, hours] of Object.entries(operatingHoursRaw)) {
@@ -399,20 +455,17 @@ function mapWarehouse(warehouse: ApiWarehouse): Warehouse {
     }
   }
   const contactInfoRaw = warehouse.contactInfo ?? undefined;
+  const utilization =
+    totalSpace !== undefined && totalSpace > 0 && usedSpace !== undefined
+      ? (usedSpace / totalSpace) * 100
+      : undefined;
   return {
     id: warehouse.id,
     name: warehouse.name,
     code: warehouse.code,
-    address: {
-      street: '',
-      city: '',
-      state: '',
-      postalCode: '',
-      country: '',
-      ...(warehouse.address ?? {}),
-    },
-    type: (warehouse.type?.toLowerCase() ?? 'distribution') as Warehouse['type'],
-    status: warehouse.status ?? 'ACTIVE',
+    address: mapJsonStringRecord(warehouse.address),
+    type: warehouse.type.toLowerCase() as Warehouse['type'],
+    status: warehouse.status,
     capacity: {
       totalSpace,
       usedSpace,
@@ -420,11 +473,11 @@ function mapWarehouse(warehouse: ApiWarehouse): Warehouse {
     operatingHours,
     contactInfo: contactInfoRaw
       ? {
-          email: (contactInfoRaw.email as string | undefined) ?? undefined,
-          phone: (contactInfoRaw.phone as string | undefined) ?? undefined,
+          email: typeof contactInfoRaw.email === 'string' ? contactInfoRaw.email : undefined,
+          phone: typeof contactInfoRaw.phone === 'string' ? contactInfoRaw.phone : undefined,
         }
       : undefined,
-    utilization: totalSpace > 0 ? (usedSpace / totalSpace) * 100 : 0,
+    utilization,
     createdAt: new Date(warehouse.createdAt),
   };
 }
@@ -585,23 +638,41 @@ export function useInventory(options: UseInventoryOptions = {}): UseInventoryRes
       productId: string,
       quantity: number
     ): Promise<void> => {
+      if (!Number.isInteger(quantity) || quantity <= 0) {
+        throw new Error('Transfer quantity must be a positive whole number.');
+      }
+      if (fromWarehouseId === toWarehouseId) {
+        throw new Error('Source and destination warehouses must be different.');
+      }
       const source = inventory.find(
         (item) => item.warehouseId === fromWarehouseId && item.productId === productId
       );
-      if (!source) {
-        throw new Error('Source inventory not found');
-      }
-
-      await updateStock(source.id, -Math.abs(quantity), 'transfer out');
-
+      if (!source) throw new Error('Source inventory not found');
       const destination = inventory.find(
         (item) => item.warehouseId === toWarehouseId && item.productId === productId
       );
-      if (destination) {
-        await updateStock(destination.id, Math.abs(quantity), 'transfer in');
-      }
+      if (!destination) throw new Error('Destination inventory not found');
+
+      const data = await executeGraphQL<{
+        transferInventoryStock: { source: ApiInventoryItem; destination: ApiInventoryItem };
+      }>(graphQLOptions, TRANSFER_INVENTORY_STOCK_MUTATION, {
+        input: {
+          sourceInventoryItemId: source.id,
+          destinationInventoryItemId: destination.id,
+          quantity,
+        },
+      });
+      const updatedSource = mapInventory(data.transferInventoryStock.source);
+      const updatedDestination = mapInventory(data.transferInventoryStock.destination);
+      setInventory((previous) =>
+        previous.map((item) => {
+          if (item.id === updatedSource.id) return updatedSource;
+          if (item.id === updatedDestination.id) return updatedDestination;
+          return item;
+        })
+      );
     },
-    [inventory, updateStock]
+    [graphQLOptions, inventory]
   );
 
   const createProduct = useCallback(
@@ -613,9 +684,15 @@ export function useInventory(options: UseInventoryOptions = {}): UseInventoryRes
           input: {
             name: input.name,
             sku: input.sku,
+            description: input.description,
             category: input.category,
             brand: input.brand,
+            dimensions: input.dimensions,
             weight: input.weight,
+            value: input.value,
+            hazardous: input.hazardous,
+            fragile: input.fragile,
+            temperatureControlled: input.temperatureControlled,
           },
         }
       );
@@ -661,9 +738,15 @@ export function useInventory(options: UseInventoryOptions = {}): UseInventoryRes
           input: {
             name: input.name,
             sku: input.sku,
+            description: input.description,
             category: input.category,
             brand: input.brand,
+            dimensions: input.dimensions,
             weight: input.weight,
+            value: input.value,
+            hazardous: input.hazardous,
+            fragile: input.fragile,
+            temperatureControlled: input.temperatureControlled,
           },
         }
       );
@@ -674,6 +757,16 @@ export function useInventory(options: UseInventoryOptions = {}): UseInventoryRes
     [graphQLOptions]
   );
 
+  const deleteProduct = useCallback(
+    async (id: string): Promise<void> => {
+      await executeGraphQL<{ deleteCargoItem: boolean }>(graphQLOptions, DELETE_PRODUCT_MUTATION, {
+        id,
+      });
+      setProducts((previous) => previous.filter((item) => item.id !== id));
+    },
+    [graphQLOptions]
+  );
+
   const updateWarehouse = useCallback(
     async (id: string, input: CreateWarehouseInput): Promise<Warehouse> => {
       const data = await executeGraphQL<{ updateWarehouse: ApiWarehouse }>(
@@ -725,8 +818,9 @@ export function useInventory(options: UseInventoryOptions = {}): UseInventoryRes
     updateStock,
     transferStock,
     createProduct,
-    createWarehouse,
     updateProduct,
+    deleteProduct,
+    createWarehouse,
     updateWarehouse,
     deleteWarehouse,
   };
@@ -755,6 +849,7 @@ export function useProducts(options: UseProductsOptions = {}) {
   const [totalProducts, setTotalProducts] = useState(0);
   const [hasMore, setHasMore] = useState(false);
   const [isLoading, setIsLoading] = useState(false);
+  const [isLoadingMore, setIsLoadingMore] = useState(false);
   const [error, setError] = useState<Error | null>(null);
 
   const load = useCallback(async () => {
@@ -778,6 +873,45 @@ export function useProducts(options: UseProductsOptions = {}) {
     }
   }, [graphQLOptions, limit, offset, search, category]);
 
+  const loadMore = useCallback(async () => {
+    if (!hasMore || isLoading || isLoadingMore) return;
+    const nextOffset = offset + products.length;
+    setIsLoadingMore(true);
+    setError(null);
+    try {
+      const data = await executeGraphQL<{
+        cargoItems: ApiProduct[];
+        cargoItemsCount: number;
+      }>(graphQLOptions, LIST_PRODUCTS_QUERY, {
+        filter: { search: search || undefined, category: category || undefined },
+        pagination: { limit, offset: nextOffset },
+      });
+      const mapped = data.cargoItems.map(mapProduct);
+      setTotalProducts(data.cargoItemsCount);
+      setHasMore(nextOffset + mapped.length < data.cargoItemsCount);
+      setProducts((previous) => {
+        const existingIds = new Set(previous.map((product) => product.id));
+        return [...previous, ...mapped.filter((product) => !existingIds.has(product.id))];
+      });
+    } catch (fetchError) {
+      setError(
+        fetchError instanceof Error ? fetchError : new Error('Failed to load more products')
+      );
+    } finally {
+      setIsLoadingMore(false);
+    }
+  }, [
+    category,
+    graphQLOptions,
+    hasMore,
+    isLoading,
+    isLoadingMore,
+    limit,
+    offset,
+    products.length,
+    search,
+  ]);
+
   useEffect(() => {
     void load();
   }, [load]);
@@ -787,8 +921,10 @@ export function useProducts(options: UseProductsOptions = {}) {
     totalProducts,
     hasMore,
     isLoading,
+    isLoadingMore,
     error,
     refetch: () => void load(),
+    loadMore,
   };
 }
 

package/src/movethewheels/hooks/useMultiModalShipments.ts

@@ -140,11 +140,11 @@ const SHIPMENT_FIELDS = `
 `;
 
 const MULTI_MODAL_SHIPMENTS_QUERY = `
-  query ListMultiModalShipments($pagination: PaginationInput) {
-    shipments(filter: { isMultiModal: true }, pagination: $pagination) {
+  query ListMultiModalShipments($search: String, $pagination: PaginationInput) {
+    shipments(filter: { isMultiModal: true, search: $search }, pagination: $pagination) {
       ${SHIPMENT_FIELDS}
     }
-    shipmentsCount(filter: { isMultiModal: true })
+    shipmentsCount(filter: { isMultiModal: true, search: $search })
   }
 `;
 
@@ -265,8 +265,10 @@ function useGraphqlOptions() {
   );
 }
 
-export function useMultiModalShipments(options: { limit?: number; offset?: number } = {}) {
-  const { limit = 10, offset = 0 } = options;
+export function useMultiModalShipments(
+  options: { limit?: number; offset?: number; search?: string } = {}
+) {
+  const { limit = 10, offset = 0, search = '' } = options;
   const graphQLOptions = useGraphqlOptions();
   const [shipments, setShipments] = useState<MultiModalShipment[]>([]);
   const [totalShipments, setTotalShipments] = useState(0);
@@ -281,7 +283,7 @@ export function useMultiModalShipments(options: { limit?: number; offset?: numbe
       const data = await executeGraphQL<{ shipments: ApiShipment[]; shipmentsCount: number }>(
         graphQLOptions,
         MULTI_MODAL_SHIPMENTS_QUERY,
-        { pagination: { limit, offset } }
+        { search: search.trim() || undefined, pagination: { limit, offset } }
       );
       setShipments(data.shipments.map(mapShipment));
       setTotalShipments(data.shipmentsCount);
@@ -293,7 +295,7 @@ export function useMultiModalShipments(options: { limit?: number; offset?: numbe
     } finally {
       setIsLoading(false);
     }
-  }, [graphQLOptions, limit, offset]);
+  }, [graphQLOptions, limit, offset, search]);
 
   useEffect(() => {
     void load();

package/src/movethewheels/hooks/useRoutes.ts

@@ -18,10 +18,19 @@ interface UseRoutesResult {
   /** True when the last fetch has another server page. */
   hasMore: boolean;
   isLoading: boolean;
+  /** True while an additional server page is appended. */
+  isLoadingMore: boolean;
   error: Error | null;
   refetch: () => void;
+  loadMore: () => Promise<void>;
   createRoute: (route: Partial<Route>) => Promise<Route>;
-  updateRoute: (id: string, updates: Partial<Route>) => Promise<Route>;
+  updateRoute: (
+    id: string,
+    updates: Omit<Partial<Route>, 'vehicleId' | 'driverId'> & {
+      vehicleId?: string | null;
+      driverId?: string | null;
+    }
+  ) => Promise<Route>;
   deleteRoute: (id: string) => Promise<void>;
   optimizeRoute: (routeId: string) => Promise<Route>;
   updateStopStatus: (
@@ -205,13 +214,19 @@ function mapWaypoints(waypoints: unknown): RouteStop[] {
         state: String(addrObj.state ?? item.state ?? ''),
         postalCode: String(addrObj.postalCode ?? item.postalCode ?? ''),
         country: String(addrObj.country ?? item.country ?? ''),
-        latitude: Number(addrObj.latitude ?? item.latitude ?? item.lat ?? 0),
-        longitude: Number(addrObj.longitude ?? item.longitude ?? item.lng ?? 0),
+        latitude:
+          typeof (addrObj.latitude ?? item.latitude ?? item.lat) === 'number'
+            ? ((addrObj.latitude ?? item.latitude ?? item.lat) as number)
+            : undefined,
+        longitude:
+          typeof (addrObj.longitude ?? item.longitude ?? item.lng) === 'number'
+            ? ((addrObj.longitude ?? item.longitude ?? item.lng) as number)
+            : undefined,
       },
       type: item.type === 'pickup' ? 'pickup' : 'delivery',
-      scheduledTime: item.scheduledTime ? new Date(String(item.scheduledTime)) : new Date(),
+      scheduledTime: item.scheduledTime ? new Date(String(item.scheduledTime)) : undefined,
       actualTime: item.actualTime ? new Date(String(item.actualTime)) : undefined,
-      duration: Number(item.duration ?? 0),
+      duration: typeof item.duration === 'number' ? item.duration : undefined,
       status: (item.status as RouteStop['status']) ?? 'pending',
       notes: item.notes ? String(item.notes) : undefined,
     };
@@ -222,8 +237,8 @@ export function mapRoute(route: ApiRoute): Route {
   return {
     id: route.id,
     name: route.name,
-    driverId: route.driverId ?? '',
-    vehicleId: route.vehicleId ?? '',
+    driverId: route.driverId ?? undefined,
+    vehicleId: route.vehicleId ?? undefined,
     status: mapRouteStatus(route.status),
     stops: mapWaypoints(route.waypoints),
     // Prefer the real post-drive distance once it exists; the backend fetches
@@ -232,12 +247,10 @@ export function mapRoute(route: ApiRoute): Route {
     estimatedDuration: route.estimatedDuration ?? 0,
     fuelCost: route.fuelCost ?? undefined,
     actualDuration: route.actualDuration ?? undefined,
-    // No `optimized` flag exists on the backend — `optimizeRoute` is the only
-    // path that computes a real `estimatedDistance` (create/update never
-    // collect one), so a positive value is a reasonably honest proxy. This
-    // used to be hardcoded `false` and reset on every reload even for a
-    // route that really had been optimized (BOFF-7909 follow-up).
-    optimized: (route.estimatedDistance ?? 0) > 0,
+    // The route object has no optimization marker. `estimatedDistance` is a
+    // measurement, not proof that the optimize mutation ran, so leave this
+    // unknown rather than presenting an inferred Yes/No.
+    optimized: undefined,
     createdAt: new Date(route.createdAt),
   };
 }
@@ -265,6 +278,7 @@ export function useRoutes(options: UseRoutesOptions = {}): UseRoutesResult {
   const [totalRoutes, setTotalRoutes] = useState(0);
   const [hasMore, setHasMore] = useState(false);
   const [isLoading, setIsLoading] = useState(false);
+  const [isLoadingMore, setIsLoadingMore] = useState(false);
   const [error, setError] = useState<Error | null>(null);
 
   const load = useCallback(async () => {
@@ -294,6 +308,51 @@ export function useRoutes(options: UseRoutesOptions = {}): UseRoutesResult {
     }
   }, [driverId, graphQLOptions, search, status, vehicleId, limit, offset]);
 
+  const loadMore = useCallback(async () => {
+    if (!hasMore || isLoading || isLoadingMore) return;
+    const nextOffset = offset + routes.length;
+    setIsLoadingMore(true);
+    setError(null);
+    try {
+      const data = await executeGraphQL<{ routes: ApiRoute[]; routesCount: number }>(
+        graphQLOptions,
+        LIST_ROUTES_QUERY,
+        {
+          filter: {
+            driverId,
+            vehicleId,
+            status: status ? toApiRouteStatus(status) : undefined,
+            search: search || undefined,
+          },
+          pagination: { limit, offset: nextOffset },
+        }
+      );
+      const mapped = data.routes.map(mapRoute);
+      setTotalRoutes(data.routesCount);
+      setHasMore(nextOffset + mapped.length < data.routesCount);
+      setRoutes((previous) => {
+        const existingIds = new Set(previous.map((route) => route.id));
+        return [...previous, ...mapped.filter((route) => !existingIds.has(route.id))];
+      });
+    } catch (fetchError) {
+      setError(fetchError instanceof Error ? fetchError : new Error('Failed to load more routes'));
+    } finally {
+      setIsLoadingMore(false);
+    }
+  }, [
+    driverId,
+    graphQLOptions,
+    hasMore,
+    isLoading,
+    isLoadingMore,
+    limit,
+    offset,
+    routes.length,
+    search,
+    status,
+    vehicleId,
+  ]);
+
   useEffect(() => {
     void load();
   }, [load]);
@@ -334,7 +393,13 @@ export function useRoutes(options: UseRoutesOptions = {}): UseRoutesResult {
   );
 
   const updateRoute = useCallback(
-    async (id: string, updates: Partial<Route>): Promise<Route> => {
+    async (
+      id: string,
+      updates: Omit<Partial<Route>, 'vehicleId' | 'driverId'> & {
+        vehicleId?: string | null;
+        driverId?: string | null;
+      }
+    ): Promise<Route> => {
       const data = await executeGraphQL<{ updateRoute: ApiRoute }>(
         graphQLOptions,
         UPDATE_ROUTE_MUTATION,
@@ -344,8 +409,12 @@ export function useRoutes(options: UseRoutesOptions = {}): UseRoutesResult {
             name: updates.name,
             status: toApiRouteStatus(updates.status),
             shipmentId: undefined,
-            vehicleId: updates.vehicleId,
-            driverId: updates.driverId,
+            vehicleId: Object.prototype.hasOwnProperty.call(updates, 'vehicleId')
+              ? (updates.vehicleId ?? null)
+              : undefined,
+            driverId: Object.prototype.hasOwnProperty.call(updates, 'driverId')
+              ? (updates.driverId ?? null)
+              : undefined,
             waypoints: updates.stops,
             // See createRoute — the edit form doesn't collect a distance
             // either, and `distance` must never masquerade as `actualDistance`.
@@ -416,8 +485,10 @@ export function useRoutes(options: UseRoutesOptions = {}): UseRoutesResult {
     totalRoutes,
     hasMore,
     isLoading,
+    isLoadingMore,
     error,
     refetch,
+    loadMore,
     createRoute,
     updateRoute,
     deleteRoute,

package/src/movethewheels/hooks/useTracking.ts

@@ -209,11 +209,23 @@ const TRACKING_ALERTS_QUERY = `
   }
 `;
 
-function mapTrackingEventToLocation(event: ApiTrackingEvent): Location {
+function mapTrackingEventToLocation(event: ApiTrackingEvent): Location | null {
+  const raw = event.location;
+  if (!raw) return null;
+  const latitude = raw.latitude ?? raw.lat;
+  const longitude = raw.longitude ?? raw.lng;
+  if (
+    typeof latitude !== 'number' ||
+    !Number.isFinite(latitude) ||
+    typeof longitude !== 'number' ||
+    !Number.isFinite(longitude)
+  ) {
+    return null;
+  }
   return {
-    latitude: Number((event.location?.latitude as number | undefined) ?? 0),
-    longitude: Number((event.location?.longitude as number | undefined) ?? 0),
-    address: (event.location?.address as string | undefined) ?? undefined,
+    latitude,
+    longitude,
+    address: typeof raw.address === 'string' ? raw.address : undefined,
     timestamp: new Date(event.timestamp),
   };
 }
@@ -225,9 +237,10 @@ function mapTrackingEventsToTracking(
   const latest = events[0];
   if (!latest) return null;
 
-  const locationHistory = events.map(mapTrackingEventToLocation);
+  const locationHistory = events
+    .map(mapTrackingEventToLocation)
+    .filter((location): location is Location => location !== null);
   const currentLocation = locationHistory[0];
-  if (!currentLocation) return null;
 
   return {
     id: latest.id,
@@ -307,11 +320,7 @@ export function useTracking(options: UseTrackingOptions = {}): UseTrackingResult
         id: shipment.id,
         entityId: entityId ?? shipment.deliveryJobId ?? shipment.id,
         entityType: entityType ?? 'order',
-        currentLocation: {
-          latitude: 0,
-          longitude: 0,
-          timestamp: new Date(),
-        },
+        currentLocation: undefined,
         locationHistory: [],
         status: shipment.status.toLowerCase(),
         estimatedArrival: shipment.estimatedDelivery
@@ -319,7 +328,7 @@ export function useTracking(options: UseTrackingOptions = {}): UseTrackingResult
           : undefined,
         nextCheckpoint: shipment.shipmentNumber,
         alerts: [],
-        lastUpdated: new Date(),
+        lastUpdated: undefined,
       }));
 
       setTracking(mapped);
@@ -518,7 +527,7 @@ export function useVehicleTracking(vehicleId: string | undefined) {
       currentLocation: vehicle.currentLocation,
       locationHistory: [vehicle.currentLocation],
       status: vehicle.status,
-      lastUpdated: vehicle.currentLocation.timestamp ?? new Date(),
+      lastUpdated: vehicle.currentLocation.timestamp,
       alerts: [],
     };
   }, [vehicle]);
@@ -538,7 +547,7 @@ export function useDriverTracking(driverId: string | undefined) {
       currentLocation: driver.currentLocation,
       locationHistory: [driver.currentLocation],
       status: driver.status,
-      lastUpdated: driver.currentLocation.timestamp ?? new Date(),
+      lastUpdated: driver.currentLocation.timestamp,
       alerts: [],
     };
   }, [driver]);
@@ -622,7 +631,6 @@ export function useTrackingAlerts() {
           type: 'delay',
           severity: 'medium',
           message: `${alert.shipmentNumber}: ${alert.message}`,
-          timestamp: new Date(),
           acknowledged: false,
         }))
       );