Merge branch 'main' into deploy

davwheat · Feb 13, 2024 · 66f314c · 66f314c
2 parents 8a4ae24 + b8742ce
commit 66f314c
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/api/ProcessServices.ts b/src/api/ProcessServices.ts
@@ -118,10 +118,10 @@ class Service implements IMyTrainService {
   displayedDepartureTime(): string {
     if (this.cancelled) return 'Cancelled';
     if (this.hasDeparted || this.hasArrived) return 'Arrived';
+    if (!this.estimatedDeparture) return 'Delayed';
     if (!this.isDelayed()) return 'On time';
     if (this.estimatedDeparture) return dayjs(this.estimatedDeparture).format('HH:mm');
-    if (this.scheduledDeparture) return dayjs(this.scheduledDeparture).format('HH:mm');
-    return 'Delayed';
+    return dayjs(this.scheduledDeparture).format('HH:mm');
   }
 
   constructor({