chore(packages): simplify

Author: necipsagiro

services/simple-staking/src/ui/baby/widgets/StakingForm/index.tsx

@@ -1,5 +1,6 @@
 import { Form } from "@babylonlabs-io/core-ui";
 import { useMemo } from "react";
+import { DeepPartial } from 'react-hook-form';
 
 import { AmountField } from "@/ui/baby/components/AmountField";
 import { FeeField } from "@/ui/baby/components/FeeField";
@@ -60,20 +61,22 @@ export default function StakingForm({
     });
   };
 
+  const handleChange = (data: DeepPartial<StakingFormFields>) => {
+    setBabyStakeDraft({
+      ...data,
+      validatorAddresses: data.validatorAddresses?.filter(
+        (i) => i !== undefined,
+      ),
+    })
+  };
+
   return (
     <Form
       schema={formSchema}
       className="flex h-[500px] flex-col gap-2"
       onSubmit={handlePreview}
       defaultValues={defaultValues}
-      onChange={(data) =>
-        setBabyStakeDraft({
-          ...data,
-          validatorAddresses: data.validatorAddresses?.filter(
-            (i) => i !== undefined,
-          ),
-        })
-      }
+      onChange={handleChange}
     >
       <AmountField balance={availableBalance} price={babyPrice} />
       <ValidatorField />

services/simple-staking/src/ui/common/components/Multistaking/MultistakingForm/MultistakingForm.tsx

@@ -1,5 +1,6 @@
 import { Form } from "@babylonlabs-io/core-ui";
 import { useCallback, useMemo } from "react";
+import { DeepPartial } from "react-hook-form";
 
 import { useFormPersistenceState } from "@/ui/common/state/FormPersistenceState";
 import {
@@ -20,11 +21,7 @@ export function MultistakingForm() {
       finalityProviders: btcStakeDraft?.finalityProviders,
       amount: btcStakeDraft?.amount,
       term: btcStakeDraft?.term ?? stakingInfo?.defaultStakingTimeBlocks,
-      feeRate:
-        btcStakeDraft?.feeRate ??
-        (stakingInfo?.defaultFeeRate !== undefined
-          ? stakingInfo.defaultFeeRate
-          : 0),
+      feeRate: btcStakeDraft?.feeRate ?? stakingInfo?.defaultFeeRate ?? 0,
       feeAmount: btcStakeDraft?.feeAmount,
     }),
     [
@@ -49,6 +46,21 @@ export function MultistakingForm() {
     [setFormData, goToStep],
   );
 
+  const handleChange = (data: DeepPartial<MultistakingFormFields>) => {
+    const sanitizedFinalityProviders: Record<string, string> = {};
+
+    Object.entries(data.finalityProviders ?? {}).forEach(([key, value]) => {
+      if (typeof value === "string") {
+        sanitizedFinalityProviders[key] = value;
+      }
+    });
+
+    setBtcStakeDraft({
+      ...data,
+      finalityProviders: sanitizedFinalityProviders,
+    });
+  }
+
   if (!stakingInfo) {
     return null;
   }
@@ -59,20 +71,7 @@ export function MultistakingForm() {
       mode="onChange"
       reValidateMode="onChange"
       defaultValues={defaultValues}
-      onChange={(data) => {
-        const sanitizedFinalityProviders: Record<string, string> = {};
-
-        Object.entries(data.finalityProviders ?? {}).forEach(([key, value]) => {
-          if (typeof value === "string") {
-            sanitizedFinalityProviders[key] = value;
-          }
-        });
-
-        setBtcStakeDraft({
-          ...data,
-          finalityProviders: sanitizedFinalityProviders,
-        });
-      }}
+      onChange={handleChange}
       onSubmit={handlePreview}
     >
       <MultistakingFormContent />