diff --git a/apps/portal/src/features/orders/components/OrderProgressTimeline.tsx b/apps/portal/src/features/orders/components/OrderProgressTimeline.tsx index 36d22a19..50a8163e 100644 --- a/apps/portal/src/features/orders/components/OrderProgressTimeline.tsx +++ b/apps/portal/src/features/orders/components/OrderProgressTimeline.tsx @@ -53,7 +53,7 @@ function getStepIndex(state: OrderStatusState, serviceCategory: OrderServiceCate case "active": return steps.length - 1; // Always the last step case "review": - return serviceCategory === "internet" ? 1 : 1; // "Under Review" for internet + return 1; // "Under Review" step is always index 1 case "scheduled": return serviceCategory === "internet" ? 2 : 1; case "activating": @@ -122,9 +122,9 @@ export function OrderProgressTimeline({ {!isLast && (
currentStepIndex && "border-t-2 border-dashed border-muted-foreground/30" )} diff --git a/apps/portal/src/features/orders/hooks/useOrdersFilter.ts b/apps/portal/src/features/orders/hooks/useOrdersFilter.ts index ba6111e2..3de8f2aa 100644 --- a/apps/portal/src/features/orders/hooks/useOrdersFilter.ts +++ b/apps/portal/src/features/orders/hooks/useOrdersFilter.ts @@ -60,15 +60,9 @@ function getStatusCategory( return "cancelled"; } - // Processing: Everything else in progress - if ( - activationStatus === "Scheduled" || - activationStatus === "Activating" || - status === "Activated" - ) { - return "processing"; - } - + // Processing: Scheduled, Activating, or any other in-progress state + // Note: status === "Activated" without activationStatus === "Activated" means + // the order is approved but service activation isn't complete yet return "processing"; }