From e9fae3a61ae2b3f84b29a673a957dd15e58e6a06 Mon Sep 17 00:00:00 2001
From: lukaw3d <lukajeran@oasislabs.com>
Date: Tue, 18 Apr 2023 04:32:27 +0200
Subject: [PATCH] Move ModalContainer into its own file

---
 src/app/components/Modal/ModalContainer.tsx | 55 ++++++++++++++++++
 src/app/components/Modal/index.tsx          | 62 ++-------------------
 2 files changed, 59 insertions(+), 58 deletions(-)
 create mode 100644 src/app/components/Modal/ModalContainer.tsx

diff --git a/src/app/components/Modal/ModalContainer.tsx b/src/app/components/Modal/ModalContainer.tsx
new file mode 100644
index 0000000000..595ab48960
--- /dev/null
+++ b/src/app/components/Modal/ModalContainer.tsx
@@ -0,0 +1,55 @@
+import { useCallback } from 'react'
+import { Box } from 'grommet/es6/components/Box'
+import { Button } from 'grommet/es6/components/Button'
+import { Layer } from 'grommet/es6/components/Layer'
+import { Paragraph } from 'grommet/es6/components/Paragraph'
+import { useTranslation } from 'react-i18next'
+import { Alert } from 'grommet-icons/es6/icons/Alert'
+import { Checkmark } from 'grommet-icons/es6/icons/Checkmark'
+import { Close } from 'grommet-icons/es6/icons/Close'
+import { ModalHeader } from 'app/components/Header'
+
+export interface Modal {
+  title: string
+  description: string
+  handleConfirm: () => void
+  isDangerous: boolean
+}
+
+interface ModalContainerProps {
+  modal: Modal
+  closeModal: () => void
+}
+
+export const ModalContainer = ({ modal, closeModal }: ModalContainerProps) => {
+  const { t } = useTranslation()
+  const confirm = useCallback(() => {
+    modal.handleConfirm()
+    closeModal()
+  }, [closeModal, modal])
+
+  return (
+    <Layer modal onEsc={closeModal} onClickOutside={closeModal} background="background-front">
+      <Box margin="medium">
+        <ModalHeader>{modal.title}</ModalHeader>
+        <Paragraph fill>{modal.description}</Paragraph>
+        <Box direction="row" gap="small" justify="between" pad={{ top: 'large' }}>
+          <Button
+            label={t('common.cancel', 'Cancel')}
+            onClick={closeModal}
+            secondary
+            icon={<Close size="18px" />}
+          />
+          <Button
+            label={t('common.confirm', 'Confirm')}
+            onClick={confirm}
+            disabled={modal.isDangerous}
+            primary={modal.isDangerous}
+            color={modal.isDangerous ? 'status-error' : ''}
+            icon={modal.isDangerous ? <Alert size="18px" /> : <Checkmark size="18px" />}
+          />
+        </Box>
+      </Box>
+    </Layer>
+  )
+}
diff --git a/src/app/components/Modal/index.tsx b/src/app/components/Modal/index.tsx
index 94f7b8b83b..981f5cde66 100644
--- a/src/app/components/Modal/index.tsx
+++ b/src/app/components/Modal/index.tsx
@@ -1,25 +1,5 @@
 import { createContext, useCallback, useContext, useState } from 'react'
-import { Box } from 'grommet/es6/components/Box'
-import { Button } from 'grommet/es6/components/Button'
-import { Layer } from 'grommet/es6/components/Layer'
-import { Paragraph } from 'grommet/es6/components/Paragraph'
-import { useTranslation } from 'react-i18next'
-import { Alert } from 'grommet-icons/es6/icons/Alert'
-import { Checkmark } from 'grommet-icons/es6/icons/Checkmark'
-import { Close } from 'grommet-icons/es6/icons/Close'
-import { ModalHeader } from 'app/components/Header'
-
-interface Modal {
-  title: string
-  description: string
-  handleConfirm: () => void
-  isDangerous: boolean
-}
-
-interface ModalContainerProps {
-  modal: Modal
-  closeModal: () => void
-}
+import { Modal, ModalContainer } from './ModalContainer'
 
 interface ModalContextProps {
   launchModal: (modal: Modal) => void
@@ -32,40 +12,7 @@ interface ModalProviderProps {
 
 const ModalContext = createContext<ModalContextProps>({} as ModalContextProps)
 
-const ModalContainer = ({ modal, closeModal }: ModalContainerProps) => {
-  const { t } = useTranslation()
-  const confirm = useCallback(() => {
-    modal.handleConfirm()
-    closeModal()
-  }, [closeModal, modal])
-
-  return (
-    <Layer modal onEsc={closeModal} onClickOutside={closeModal} background="background-front">
-      <Box margin="medium">
-        <ModalHeader>{modal.title}</ModalHeader>
-        <Paragraph fill>{modal.description}</Paragraph>
-        <Box direction="row" gap="small" justify="between" pad={{ top: 'large' }}>
-          <Button
-            label={t('common.cancel', 'Cancel')}
-            onClick={closeModal}
-            secondary
-            icon={<Close size="18px" />}
-          />
-          <Button
-            label={t('common.confirm', 'Confirm')}
-            onClick={confirm}
-            disabled={modal.isDangerous}
-            primary={modal.isDangerous}
-            color={modal.isDangerous ? 'status-error' : ''}
-            icon={modal.isDangerous ? <Alert size="18px" /> : <Checkmark size="18px" />}
-          />
-        </Box>
-      </Box>
-    </Layer>
-  )
-}
-
-const ModalProvider = (props: ModalProviderProps) => {
+export const ModalProvider = (props: ModalProviderProps) => {
   const [modal, setModal] = useState<Modal | null>(null)
   const closeModal = useCallback(() => {
     setModal(null)
@@ -79,7 +26,8 @@ const ModalProvider = (props: ModalProviderProps) => {
   )
 }
 
-const useModal = () => {
+// eslint-disable-next-line react-refresh/only-export-components
+export const useModal = () => {
   const context = useContext(ModalContext)
   if (context === undefined) {
     throw new Error('useModal must be used within a ModalProvider')
@@ -87,5 +35,3 @@ const useModal = () => {
 
   return context
 }
-
-export { ModalProvider, useModal }