fix(app): e-stop modal button state issue (#14217)

* fix(app): fix estop modal button state issue
Opentrons · Dec 15, 2023 · ef937ee · ef937ee
1 parent 9842207
commit ef937ee
Showing 1 changed file with 5 additions and 12 deletions.
diff --git a/app/src/organisms/EmergencyStop/EstopPressedModal.tsx b/app/src/organisms/EmergencyStop/EstopPressedModal.tsx
@@ -26,7 +26,6 @@ import { StyledText } from '../../atoms/text'
 import { LegacyModal } from '../../molecules/LegacyModal'
 import { Modal } from '../../molecules/Modal'
 import { getIsOnDevice } from '../../redux/config'
-import { DISENGAGED } from './constants'
 
 import type {
   ModalHeaderBaseProps,
@@ -133,10 +132,7 @@ function DesktopModal({
 }: EstopPressedModalProps): JSX.Element {
   const { t } = useTranslation('device_settings')
   const [isResuming, setIsResuming] = React.useState<boolean>(false)
-  const {
-    acknowledgeEstopDisengage,
-    data,
-  } = useAcknowledgeEstopDisengageMutation()
+  const { acknowledgeEstopDisengage } = useAcknowledgeEstopDisengageMutation()
 
   const handleCloseModal = (): void => {
     if (setIsDismissedModal != null) {
@@ -155,21 +151,18 @@ function DesktopModal({
   }
 
   const handleClick: React.MouseEventHandler<HTMLButtonElement> = (e): void => {
+    e.preventDefault()
     setIsResuming(true)
     acknowledgeEstopDisengage({
-      onSuccess: () => {},
+      onSuccess: () => {
+        closeModal()
+      },
       onError: () => {
         setIsResuming(false)
       },
     })
   }
 
-  React.useEffect(() => {
-    if (data?.data.status === DISENGAGED) {
-      closeModal()
-    }
-  }, [data?.data.status, closeModal])
-
   return (
     <LegacyModal {...modalProps}>
       <Flex flexDirection={DIRECTION_COLUMN} gridGap={SPACING.spacing24}>