refactor(confirmModal): use explicit export

raspiblitz · Oct 1, 2024 · 21163cf · 21163cf
1 parent c4335ac
commit 21163cf
Show file tree

Hide file tree

Showing 19 changed files with 36 additions and 28 deletions.
diff --git a/src/components/ConfirmModal.tsx b/src/components/ConfirmModal.tsx
@@ -27,7 +27,11 @@ type ConfirmModalComponent = {
   Footer: typeof ModalFooter;
 };
 
-const ConfirmModal: ConfirmModalComponent = ({
+export const ConfirmModalHeader = ModalHeader;
+export const ConfirmModalBody = ModalBody;
+export const ConfirmModalFooter = ModalFooter;
+
+export const ConfirmModal: ConfirmModalComponent = ({
   disclosure,
   headline,
   children,
@@ -47,11 +51,11 @@ const ConfirmModal: ConfirmModalComponent = ({
 
     return (
       <>
-        {headline && <ModalHeader>{headline}</ModalHeader>}
+        {headline && <ConfirmModalHeader>{headline}</ConfirmModalHeader>}
 
-        <ModalBody>{children || props.body}</ModalBody>
+        <ConfirmModalBody>{children || props.body}</ConfirmModalBody>
 
-        <ModalFooter>
+        <ConfirmModalFooter>
           <Button onClick={onClose} disabled={isLoading}>
             {cancelText || t("settings.cancel")}
           </Button>
@@ -63,7 +67,7 @@ const ConfirmModal: ConfirmModalComponent = ({
           >
             {confirmText || t("settings.confirm")}
           </Button>
-        </ModalFooter>
+        </ConfirmModalFooter>
       </>
     );
   };
@@ -75,8 +79,6 @@ const ConfirmModal: ConfirmModalComponent = ({
   );
 };
 
-ConfirmModal.Header = ModalHeader;
-ConfirmModal.Body = ModalBody;
-ConfirmModal.Footer = ModalFooter;
-
-export default ConfirmModal;
+ConfirmModal.Header = ConfirmModalHeader;
+ConfirmModal.Body = ConfirmModalBody;
+ConfirmModal.Footer = ConfirmModalFooter;
diff --git a/src/pages/Home/ListChannelModal/ListChannelModal.tsx b/src/pages/Home/ListChannelModal/ListChannelModal.tsx
@@ -1,6 +1,7 @@
 import ChannelList from "./ChannelList";
 import { Alert } from "@/components/Alert";
-import ConfirmModal, {
+import {
+  ConfirmModal,
   type Props as ConfirmModalProps,
 } from "@/components/ConfirmModal";
 import Message from "@/components/Message";

diff --git a/src/pages/Home/OpenChannelModal.tsx b/src/pages/Home/OpenChannelModal.tsx
@@ -2,7 +2,8 @@ import { Alert } from "@/components/Alert";
 import AmountInput from "@/components/AmountInput";
 import AvailableBalance from "@/components/AvailableBalance";
 import { Button } from "@/components/Button";
-import ConfirmModal, {
+import {
+  ConfirmModal,
   type Props as ConfirmModalProps,
 } from "@/components/ConfirmModal";
 import InputField from "@/components/InputField";

diff --git a/src/pages/Home/ReceiveModal/ReceiveLN.tsx b/src/pages/Home/ReceiveModal/ReceiveLN.tsx
@@ -1,7 +1,7 @@
 import { Alert } from "@/components/Alert";
 import AmountInput from "@/components/AmountInput";
 import { Button } from "@/components/Button";
-import ConfirmModal from "@/components/ConfirmModal";
+import { ConfirmModal } from "@/components/ConfirmModal";
 import InputField from "@/components/InputField";
 import { stringToNumber } from "@/utils/format";
 import type { ChangeEvent, FC } from "react";

diff --git a/src/pages/Home/ReceiveModal/ReceiveModal.tsx b/src/pages/Home/ReceiveModal/ReceiveModal.tsx
@@ -2,7 +2,8 @@ import { TxType } from "../SwitchTxType";
 import QRCode from "./QRCode";
 import ReceiveLN, { type IFormInputs } from "./ReceiveLN";
 import { Alert } from "@/components/Alert";
-import ConfirmModal, {
+import {
+  ConfirmModal,
   type Props as ConfirmModalProps,
 } from "@/components/ConfirmModal";
 import { AppContext, Unit } from "@/context/app-context";

diff --git a/src/pages/Home/SendModal/ConfirmSend.tsx b/src/pages/Home/SendModal/ConfirmSend.tsx
@@ -4,7 +4,7 @@ import { SendOnChainForm } from "./SendOnChain";
 import { Alert } from "@/components/Alert";
 import AmountInput from "@/components/AmountInput";
 import { Button } from "@/components/Button";
-import ConfirmModal from "@/components/ConfirmModal";
+import { ConfirmModal } from "@/components/ConfirmModal";
 import { AppContext, Unit } from "@/context/app-context";
 import { checkError } from "@/utils/checkError";
 import {

diff --git a/src/pages/Home/SendModal/SendLN.tsx b/src/pages/Home/SendModal/SendLN.tsx
@@ -4,7 +4,7 @@ import { SendOnChainForm } from "./SendOnChain";
 import { Alert } from "@/components/Alert";
 import AvailableBalance from "@/components/AvailableBalance";
 import { Button } from "@/components/Button";
-import ConfirmModal from "@/components/ConfirmModal";
+import { ConfirmModal } from "@/components/ConfirmModal";
 import InputField from "@/components/InputField";
 import { convertMSatToSat } from "@/utils/format";
 import { FC, useState } from "react";

diff --git a/src/pages/Home/SendModal/SendModal.tsx b/src/pages/Home/SendModal/SendModal.tsx
@@ -2,7 +2,8 @@ import { TxType } from "../SwitchTxType";
 import ConfirmSend from "./ConfirmSend";
 import SendLn, { LnInvoiceForm } from "./SendLN";
 import SendOnChain, { SendOnChainForm } from "./SendOnChain";
-import ConfirmModal, {
+import {
+  ConfirmModal,
   type Props as ConfirmModalProps,
 } from "@/components/ConfirmModal";
 import { DecodePayRequest } from "@/models/decode-pay-req";

diff --git a/src/pages/Home/SendModal/SendOnChain.tsx b/src/pages/Home/SendModal/SendOnChain.tsx
@@ -3,7 +3,7 @@ import { SendLnForm } from "./SendModal";
 import AmountInput from "@/components/AmountInput";
 import AvailableBalance from "@/components/AvailableBalance";
 import { Button } from "@/components/Button";
-import ConfirmModal from "@/components/ConfirmModal";
+import { ConfirmModal } from "@/components/ConfirmModal";
 import InputField from "@/components/InputField";
 import { stringToNumber } from "@/utils/format";
 import { ChangeEvent, FC, useState } from "react";

diff --git a/src/pages/Home/SendModal/__tests__/ConfirmSend.test.tsx b/src/pages/Home/SendModal/__tests__/ConfirmSend.test.tsx
@@ -3,7 +3,7 @@ import type { Props } from "../ConfirmSend";
 import ConfirmSend from "../ConfirmSend";
 import { SendLnForm } from "../SendModal";
 import type { SendOnChainForm } from "../SendOnChain";
-import ConfirmModal from "@/components/ConfirmModal";
+import { ConfirmModal } from "@/components/ConfirmModal";
 import { http, server, HttpResponse } from "@/testServer";
 import userEvent from "@testing-library/user-event";
 import { render, screen, waitFor, mockedDisclosure } from "test-utils";

diff --git a/src/pages/Home/TransactionCard/TransactionDetailModal/TransactionDetailModal.tsx b/src/pages/Home/TransactionCard/TransactionDetailModal/TransactionDetailModal.tsx
@@ -1,6 +1,7 @@
 import LNDetails from "./LNDetails";
 import OnchainDetails from "./OnchainDetails";
-import ConfirmModal, {
+import {
+  ConfirmModal,
   type Props as ConfirmModalProps,
 } from "@/components/ConfirmModal";
 import { Transaction } from "@/models/transaction.model";

diff --git a/src/pages/Home/UnlockModal.tsx b/src/pages/Home/UnlockModal.tsx
@@ -1,7 +1,8 @@
 import { Alert } from "@/components/Alert";
 import { Button } from "@/components/Button";
 import CapsLockWarning from "@/components/CapsLockWarning";
-import ConfirmModal, {
+import {
+  ConfirmModal,
   type Props as ConfirmModalProps,
 } from "@/components/ConfirmModal";
 import InputField from "@/components/InputField";

diff --git a/src/pages/Settings/ChangePwModal.tsx b/src/pages/Settings/ChangePwModal.tsx
@@ -1,7 +1,7 @@
 import ActionBox from "./ActionBox";
 import { Button } from "@/components/Button";
 import CapsLockWarning from "@/components/CapsLockWarning";
-import ConfirmModal from "@/components/ConfirmModal";
+import { ConfirmModal } from "@/components/ConfirmModal";
 import useCapsLock from "@/hooks/use-caps-lock";
 import { checkError } from "@/utils/checkError";
 import { instance } from "@/utils/interceptor";

diff --git a/src/pages/Settings/RebootModal.tsx b/src/pages/Settings/RebootModal.tsx
@@ -1,5 +1,5 @@
 import ActionBox from "./ActionBox";
-import ConfirmModal from "@/components/ConfirmModal";
+import { ConfirmModal } from "@/components/ConfirmModal";
 import { AppContext } from "@/context/app-context";
 import { instance } from "@/utils/interceptor";
 import { useDisclosure } from "@nextui-org/react";

diff --git a/src/pages/Settings/ShutdownModal.tsx b/src/pages/Settings/ShutdownModal.tsx
@@ -1,5 +1,5 @@
 import ActionBox from "./ActionBox";
-import ConfirmModal from "@/components/ConfirmModal";
+import { ConfirmModal } from "@/components/ConfirmModal";
 import { AppContext } from "@/context/app-context";
 import { instance } from "@/utils/interceptor";
 import { useDisclosure } from "@nextui-org/react";

diff --git a/src/pages/Setup/FormatDialog.tsx b/src/pages/Setup/FormatDialog.tsx
@@ -1,6 +1,6 @@
 import { Alert } from "@/components/Alert";
 import { Button } from "@/components/Button";
-import ConfirmModal from "@/components/ConfirmModal";
+import { ConfirmModal } from "@/components/ConfirmModal";
 import { Headline } from "@/components/Headline";
 import SetupContainer from "@/layouts/SetupContainer";
 import { Checkbox, useDisclosure } from "@nextui-org/react";

diff --git a/src/pages/Setup/InputPassword.tsx b/src/pages/Setup/InputPassword.tsx
@@ -1,5 +1,5 @@
 import { Button } from "@/components/Button";
-import ConfirmModal from "@/components/ConfirmModal";
+import { ConfirmModal } from "@/components/ConfirmModal";
 import { Headline } from "@/components/Headline";
 import SetupContainer from "@/layouts/SetupContainer";
 import { Input, useDisclosure } from "@nextui-org/react";

diff --git a/src/pages/Setup/MigrationDialog.tsx b/src/pages/Setup/MigrationDialog.tsx
@@ -1,6 +1,6 @@
 import { Alert } from "@/components/Alert";
 import { Button } from "@/components/Button";
-import ConfirmModal from "@/components/ConfirmModal";
+import { ConfirmModal } from "@/components/ConfirmModal";
 import { Headline } from "@/components/Headline";
 import SetupContainer from "@/layouts/SetupContainer";
 import { SetupMigrationMode, SetupMigrationOS } from "@/models/setup.model";

diff --git a/src/pages/Setup/StartDoneDialog.tsx b/src/pages/Setup/StartDoneDialog.tsx
@@ -1,5 +1,5 @@
 import { Button } from "@/components/Button";
-import ConfirmModal from "@/components/ConfirmModal";
+import { ConfirmModal } from "@/components/ConfirmModal";
 import { Headline } from "@/components/Headline";
 import SetupContainer from "@/layouts/SetupContainer";
 import { SetupPhase } from "@/models/setup.model";