fix(app): ensure firmware takeover modal won't open uneccessarily (#1…

…4387) fix RQA-2236
Opentrons · Feb 2, 2024 · 74e8c82 · 74e8c82
1 parent 8ec9c41
commit 74e8c82
Showing 1 changed file with 26 additions and 4 deletions.
diff --git a/app/src/organisms/FirmwareUpdateModal/FirmwareUpdateTakeover.tsx b/app/src/organisms/FirmwareUpdateModal/FirmwareUpdateTakeover.tsx
@@ -63,7 +63,16 @@ export function FirmwareUpdateTakeover(): JSX.Element {
   )
 
   React.useEffect(() => {
+    // in case instruments are updated elsewhere in the app, clear update needed list
+    // when all instruments are ok but array has elements
     if (
+      instrumentsData?.find(instrument => !instrument.ok) == null &&
+      !showUpdateNeededModal &&
+      instrumentsToUpdate.length > 0
+    ) {
+      setInstrumentsToUpdate([])
+      setIndexToUpdate(0)
+    } else if (
       instrumentsToUpdate.length > indexToUpdate &&
       instrumentsToUpdate[indexToUpdate]?.subsystem != null &&
       maintenanceRunData == null &&
@@ -72,12 +81,23 @@ export function FirmwareUpdateTakeover(): JSX.Element {
     ) {
       setShowUpdateNeededModal(true)
     }
+    // close modal if update is no longer needed
+    else if (
+      instrumentsData?.find(instrument => !instrument.ok) == null &&
+      initiatedSubsystemUpdate == null &&
+      showUpdateNeededModal
+    ) {
+      setShowUpdateNeededModal(false)
+    }
   }, [
-    instrumentsToUpdate,
+    externalSubsystemUpdate,
     indexToUpdate,
-    maintenanceRunData,
+    instrumentsToUpdate,
+    initiatedSubsystemUpdate,
+    instrumentsData,
     isUnboxingFlowOngoing,
-    externalSubsystemUpdate,
+    maintenanceRunData,
+    showUpdateNeededModal,
   ])
 
   return (
@@ -88,10 +108,12 @@ export function FirmwareUpdateTakeover(): JSX.Element {
         <UpdateNeededModal
           subsystem={instrumentsToUpdate[indexToUpdate]?.subsystem}
           onClose={() => {
-            // if no more instruments need updating, close the modal
+            // if no more instruments need updating, close the modal and clear data
             // otherwise start over with next instrument
             if (instrumentsToUpdate.length <= indexToUpdate + 1) {
               setShowUpdateNeededModal(false)
+              setInstrumentsToUpdate([])
+              setIndexToUpdate(0)
             } else {
               setIndexToUpdate(prevIndexToUpdate => prevIndexToUpdate + 1)
             }