Fix for info modals not closing when the X button is clicked

sunrise-stake · May 11, 2023 · 517dc3b · 517dc3b
1 parent 127d864
commit 517dc3b
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 6 deletions.
diff --git a/packages/app/src/common/components/Button.tsx b/packages/app/src/common/components/Button.tsx
@@ -86,8 +86,7 @@ const Button: React.FC<ButtonProps> = ({
       <InfoModal
         title={disabledTitle}
         message={disabledMessage}
-        ok={infoModal.onModalOK}
-        show={infoModal.modalShown}
+        modalControl={infoModal}
       />
       {children}
     </button>

diff --git a/packages/app/src/common/components/modals/InfoModal.tsx b/packages/app/src/common/components/modals/InfoModal.tsx
@@ -2,13 +2,23 @@ import { Dialog } from "@headlessui/react";
 import { ExclamationTriangleIcon } from "@heroicons/react/24/solid";
 import React, { type FC, type PropsWithChildren } from "react";
 
-import { BaseModal, type ModalProps } from "./";
+import { BaseModal } from "./";
+import { type ModalControl } from "../../hooks";
 
-type InfoModalProps = { title: string; message?: string } & PropsWithChildren &
-  Omit<ModalProps, "cancel">;
+type InfoModalProps = {
+  title: string;
+  message?: string;
+  modalControl: ModalControl;
+} & PropsWithChildren;
 const InfoModal: FC<InfoModalProps> = (props) => {
   return (
-    <BaseModal cancelVisible={false} {...props} cancel={() => {}}>
+    <BaseModal
+      cancelVisible={false}
+      {...props}
+      ok={props.modalControl.onModalOK}
+      cancel={props.modalControl.onModalClose}
+      show={props.modalControl.modalShown}
+    >
       <div className="mx-auto flex h-12 w-12 items-center justify-center rounded-full">
         <ExclamationTriangleIcon
           className="w-8"