Merge pull request #43 from lidofinance/feature/settings-tx-chain

Add cancel submit main form

Author: ev-d

features/adjustment/mint/hooks/use-mint.ts

@@ -12,7 +12,7 @@ import { dashboardAbi } from 'abi/dashboard-abi';
 import { useDappStatus } from 'modules/web3/hooks/use-dapp-status';
 import { useVaultInfo } from 'features/overview/contexts';
 import {
-  SubmitStep,
+  SubmitPayload,
   SubmitStepEnum,
 } from 'shared/components/submit-modal/types';
 import invariant from 'tiny-invariant';
@@ -36,7 +36,7 @@ export const useMint = (onMutate = () => {}) => {
       recipient: Address,
       amount: bigint,
       token: string,
-      setModalState: (submitStep: { step: SubmitStep; tx?: Address }) => void,
+      setModalState: (submitStep: SubmitPayload) => void,
     ) => {
       invariant(publicClient, '[useMintDashboard] publicClient is undefined');
 

features/adjustment/mint/mint-form-context/mint-form-provider.tsx

@@ -22,6 +22,7 @@ import {
 import { MintFormSchema } from 'features/adjustment/mint/types';
 import { SubmitModal } from 'shared/components';
 import {
+  SubmitPayload,
   SubmitStep,
   SubmitStepEnum,
 } from 'shared/components/submit-modal/types';
@@ -71,20 +72,17 @@ export const MintFormProvider: FC<{ children: ReactNode }> = ({ children }) => {
   }, [activeVault]);
 
   const { retryEvent, retryFire } = useFormControllerRetry();
-  const setModalState = useCallback(
-    (submitStep: { step: SubmitStep; tx?: Address }) => {
-      setSubmitStep(submitStep);
-    },
-    [],
-  );
+  const setModalState = useCallback((submitStep: SubmitPayload) => {
+    setSubmitStep(submitStep);
+  }, []);
 
   const onSubmit = useCallback(
     async ({ recipient, amount, token }: MintFormSchema) => {
       if (amount && recipient) {
         try {
           setModalState({ step: SubmitStepEnum.initiate });
           const tx = await callMint(recipient, amount, token, setModalState);
-          setModalState({ step: SubmitStepEnum.success, tx });
+          setModalState({ step: SubmitStepEnum.overview, tx });
           return true;
         } catch (err) {
           if (

features/adjustment/repay/hooks/use-burn.ts

@@ -7,13 +7,13 @@ import {
   useEstimateGas,
   useAccount,
 } from 'wagmi';
-import { Address, encodeFunctionData, maxUint256 } from 'viem';
+import { encodeFunctionData, maxUint256 } from 'viem';
 
 import { dashboardAbi } from 'abi/dashboard-abi';
 import { useDappStatus } from 'modules/web3/hooks/use-dapp-status';
 import { useVaultInfo } from 'features/overview/contexts';
 import {
-  SubmitStep,
+  SubmitPayload,
   SubmitStepEnum,
 } from 'shared/components/submit-modal/types';
 import invariant from 'tiny-invariant';
@@ -23,7 +23,7 @@ import { useLidoSDK } from 'modules/web3';
 type BurnArgs = {
   token: string;
   amount: bigint;
-  setModalState: (submitStep: { step: SubmitStep; tx?: Address }) => void;
+  setModalState: (submitStep: SubmitPayload) => void;
 };
 
 export const useBurn = (onMutate = () => {}) => {

features/adjustment/repay/repay-form-context/repay-form-provider.tsx

@@ -21,7 +21,11 @@ import {
 
 import { RepayFormSchema } from 'features/adjustment/repay/types';
 import { SubmitModal } from 'shared/components';
-import { SubmitStep, SubmitStepEnum } from 'shared/components/submit-modal';
+import {
+  SubmitPayload,
+  SubmitStep,
+  SubmitStepEnum,
+} from 'shared/components/submit-modal';
 import { Address } from 'viem';
 
 type RepayDataContextValue = {
@@ -100,20 +104,17 @@ export const RepayFormProvider = ({ children }: { children: ReactNode }) => {
   );
 
   const { retryEvent, retryFire } = useFormControllerRetry();
-  const setModalState = useCallback(
-    (submitStep: { step: SubmitStep; tx?: Address }) => {
-      setSubmitStep(submitStep);
-    },
-    [],
-  );
+  const setModalState = useCallback((submitStep: SubmitPayload) => {
+    setSubmitStep(submitStep);
+  }, []);
 
   const onSubmit = useCallback(
     async ({ amount, token }: RepayFormSchema) => {
       try {
         if (amount) {
           setModalState({ step: SubmitStepEnum.initiate });
           const tx = await callBurn({ amount, token, setModalState });
-          setModalState({ step: SubmitStepEnum.success, tx });
+          setModalState({ step: SubmitStepEnum.overview, tx });
           return true;
         }
 

features/claim/claim-form/claim-form-context/claim-form-provider.tsx

@@ -7,7 +7,7 @@ import {
   useContext,
   useState,
 } from 'react';
-import { Address, isAddress, ReadContractErrorType } from 'viem';
+import { isAddress, ReadContractErrorType } from 'viem';
 import { useReadContract } from 'wagmi';
 import { FormProvider, useForm } from 'react-hook-form';
 
@@ -25,10 +25,10 @@ import { dashboardAbi } from 'abi/dashboard-abi';
 import { ClaimFormSchema } from 'features/claim/claim-form/types';
 import invariant from 'tiny-invariant';
 import {
-  SubmitStep,
+  SubmitPayload,
   SubmitStepEnum,
 } from 'shared/components/submit-modal/types';
-import { SubmitModal } from '../submit-modal';
+import { SubmitModal } from 'shared/components';
 
 type ClaimDataContextValue = {
   availableToClaim: bigint | undefined;
@@ -53,10 +53,9 @@ export const useClaimFormData = () => {
 export const ClaimFormProvider: FC<{ children: ReactNode }> = ({
   children,
 }) => {
-  const [submitStep, setSubmitStep] = useState<{
-    step: SubmitStep;
-    tx?: Address;
-  }>(() => ({ step: SubmitStepEnum.edit }));
+  const [submitStep, setSubmitStep] = useState<SubmitPayload>(() => ({
+    step: SubmitStepEnum.edit,
+  }));
   const { activeVault } = useVaultInfo();
 
   const {
@@ -93,20 +92,17 @@ export const ClaimFormProvider: FC<{ children: ReactNode }> = ({
   const { callClaim } = useClaim();
 
   const { retryEvent, retryFire } = useFormControllerRetry();
-  const setModalState = useCallback(
-    (submitStep: { step: SubmitStep; tx?: Address }) => {
-      setSubmitStep(submitStep);
-    },
-    [],
-  );
+  const setModalState = useCallback((submitStep: SubmitPayload) => {
+    setSubmitStep(submitStep);
+  }, []);
 
   const onSubmit = useCallback(
     async ({ recipient }: ClaimFormSchema) => {
       if (recipient && isAddress(recipient)) {
         try {
           setModalState({ step: SubmitStepEnum.initiate });
           const tx = await callClaim(recipient, setModalState);
-          setModalState({ step: SubmitStepEnum.success, tx });
+          setModalState({ step: SubmitStepEnum.overview, tx });
           return true;
         } catch (err) {
           if (

features/claim/claim-form/hooks/use-claim.ts

@@ -13,7 +13,7 @@ import { useDappStatus } from 'modules/web3/hooks/use-dapp-status';
 import { useVaultInfo } from 'features/overview/contexts';
 import invariant from 'tiny-invariant';
 import {
-  SubmitStep,
+  SubmitPayload,
   SubmitStepEnum,
 } from 'shared/components/submit-modal/types';
 import { useVaultPermissions } from 'modules/vaults/hooks/use-vault-permissions';
@@ -36,7 +36,7 @@ export const useClaim = (onMutate = () => {}) => {
   const callClaim = useCallback(
     async (
       recipient: Address,
-      setModalState: (submitStep: { step: SubmitStep; tx?: Address }) => void,
+      setModalState: (submitStep: SubmitPayload) => void,
     ) => {
       invariant(owner, '[useClaimDashboard] owner is not available');
       invariant(

features/claim/claim-form/submit-modal/index.ts

@@ -1,4 +1,3 @@
 export { MainSettingsAction } from './main-settings-action';
-export { SubmitMainModal } from './submit-main-modal';
 export { NodeOperator } from './node-operator';
 export * from './controllers';