Merge pull request #521 from trilitech/close-modal-on-insert-batch

Close modal on insert batch
trilitech · Oct 24, 2023 · 672e6a6 · 672e6a6
2 parents 53591c2 + 71930f5
commit 672e6a6
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 11 deletions.
diff --git a/src/components/SendFlow/Delegation/FormPage.tsx b/src/components/SendFlow/Delegation/FormPage.tsx
@@ -6,7 +6,7 @@ import {
   ModalFooter,
   Text,
 } from "@chakra-ui/react";
-import React, { useContext } from "react";
+import React from "react";
 import { FormProvider, useForm } from "react-hook-form";
 import { parsePkh, RawPkh, parseImplicitPkh } from "../../../types/Address";
 import { BakersAutocomplete, OwnedAccountsAutocomplete } from "../../AddressAutocomplete";
@@ -20,7 +20,6 @@ import {
 import { Delegation } from "../../../types/Operation";
 import { FormErrorMessage } from "../../FormErrorMessage";
 import { HeaderWrapper } from "../FormPageHeader";
-import { DynamicModalContext } from "../../DynamicModal";
 
 export type FormValues = {
   sender: RawPkh;
@@ -35,7 +34,6 @@ const toOperation = (formValues: FormValues): Delegation => ({
 
 const FormPage: React.FC<FormPageProps<FormValues>> = props => {
   const baker = props.form?.baker;
-  const { onClose } = useContext(DynamicModalContext);
 
   const openSignPage = useOpenSignPageFormAction({
     SignPage,
@@ -45,7 +43,7 @@ const FormPage: React.FC<FormPageProps<FormValues>> = props => {
     toOperation,
   });
 
-  const addToBatch = useAddToBatchFormAction(toOperation, onClose);
+  const addToBatch = useAddToBatchFormAction(toOperation);
 
   const {
     onFormSubmitActionHandlers: [onSingleSubmit, onBatchSubmit],

diff --git a/src/components/SendFlow/Undelegation/FormPage.tsx b/src/components/SendFlow/Undelegation/FormPage.tsx
@@ -1,5 +1,5 @@
 import { FormControl, FormLabel, ModalBody, ModalContent, ModalFooter } from "@chakra-ui/react";
-import React, { useContext } from "react";
+import React from "react";
 import { FormProvider, useForm } from "react-hook-form";
 import { parsePkh, RawPkh } from "../../../types/Address";
 import { OwnedAccountsAutocomplete } from "../../AddressAutocomplete";
@@ -13,7 +13,6 @@ import {
 import { Undelegation } from "../../../types/Operation";
 import FormPageHeader from "../FormPageHeader";
 import { BakerSmallTile } from "../BakerSmallTile";
-import { DynamicModalContext } from "../../DynamicModal";
 
 export type FormValues = {
   sender: RawPkh;
@@ -37,9 +36,8 @@ const FormPage: React.FC<FormPagePropsWithSender<FormValues>> = props => {
     defaultFormPageProps: { sender },
     toOperation,
   });
-  const { onClose } = useContext(DynamicModalContext);
 
-  const addToBatch = useAddToBatchFormAction(toOperation, onClose);
+  const addToBatch = useAddToBatchFormAction(toOperation);
 
   const {
     onFormSubmitActionHandlers: [onSingleSubmit, onBatchSubmit],

diff --git a/src/components/SendFlow/onSubmitFormActionHooks.tsx b/src/components/SendFlow/onSubmitFormActionHooks.tsx
@@ -71,9 +71,9 @@ export const useOpenSignPageFormAction = <
 };
 
 export const useAddToBatchFormAction = <FormValues extends BaseFormValues>(
-  toOperation: (formValues: FormValues) => Operation,
-  onSuccess?: () => void
+  toOperation: (formValues: FormValues) => Operation
 ): OnSubmitFormAction<FormValues> => {
+  const { onClose } = useContext(DynamicModalContext);
   const network = useSelectedNetwork();
   const makeFormOperations = useMakeFormOperations(toOperation);
   const dispatch = useAppDispatch();
@@ -83,7 +83,7 @@ export const useAddToBatchFormAction = <FormValues extends BaseFormValues>(
     const operations = makeFormOperations(formValues);
     await dispatch(estimateAndUpdateBatch(operations, network));
     toast({ title: "Transaction added to batch!", status: "success" });
-    onSuccess?.();
+    onClose();
   };
 
   return onAddToBatchAction;