From 8e71cf6c8c3b0d452dc0dae59ba30901c3edd8dd Mon Sep 17 00:00:00 2001
From: John Wu <76966357+jwu-fisker@users.noreply.github.com>
Date: Tue, 23 May 2023 12:36:35 -0700
Subject: [PATCH] CEC-4398 Clean up final update status (#341)

* CEC-4398 Clean up final update status

* fix
---
 .../Controls/CarUpdateStatusProgress/Statuses.js      |  1 +
 .../Controls/CarUpdateStatusProgress/index.jsx        | 11 +++++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/components/Controls/CarUpdateStatusProgress/Statuses.js b/src/components/Controls/CarUpdateStatusProgress/Statuses.js
index a60d887..da315da 100644
--- a/src/components/Controls/CarUpdateStatusProgress/Statuses.js
+++ b/src/components/Controls/CarUpdateStatusProgress/Statuses.js
@@ -30,6 +30,7 @@ const Statuses = {
   ManifestRollback: "manifest_rollback",
   ManifestSucceeded: "manifest_succeeded",
   ManifesCanceled: "manifest_canceled",
+  ManifestCancelPending: "manifest_cancel_pending",
   PackageDownloadStarted: "package_download_start",
   PackageDownloadCompleted: "package_download_complete",
   PackageInstallStarted: "package_install_start",
diff --git a/src/components/Controls/CarUpdateStatusProgress/index.jsx b/src/components/Controls/CarUpdateStatusProgress/index.jsx
index 6b9cd1d..ec4161c 100644
--- a/src/components/Controls/CarUpdateStatusProgress/index.jsx
+++ b/src/components/Controls/CarUpdateStatusProgress/index.jsx
@@ -18,9 +18,9 @@ const PHASES = [
   },
   {
     label: "Received",
-    events: [s.ManifestAccepted, s.ManifestReceived, s.ManifestRejected],
+    events: [s.ManifestAccepted, s.ManifestReceived, s.ManifestRejected, s.ManifestError],
     progress: (msg) => {
-      if (msg === s.ManifestRejected) return ErrorStatus;
+      if (msg === s.ManifestRejected || msg === s.ManifestError) return ErrorStatus;
       return CompleteStatus;
     },
   },
@@ -67,8 +67,11 @@ const PHASES = [
   },
   {
     label: "Updated",
-    events: [s.ManifestSucceeded],
-    progress: (_msg, _progress) => CompleteStatus,
+    events: [s.ManifestSucceeded, s.CleanupFailed, s.CleanupSucceeded, s.RollbackSucceeded, s.RollbackFailed],
+    progress: (msg, _progress) => {
+      if (msg === s.ManifestSucceeded) return CompleteStatus;
+      return ErrorStatus;
+    }
   },
 ];