diff --git a/apps/gacha/src/app/_components/form/modal-form-register.tsx b/apps/gacha/src/app/_components/form/modal-form-register.tsx
index 37269ac..6116bc1 100644
--- a/apps/gacha/src/app/_components/form/modal-form-register.tsx
+++ b/apps/gacha/src/app/_components/form/modal-form-register.tsx
@@ -3,6 +3,8 @@ import { InputField, Modal } from '@imphnen-frontend-service/ui/molecules';
 import { useQueryState } from '@imphnen-frontend-service/utils';
 import { useRegister } from '../../_hooks/use-register';
 import { ControlledInputField } from '@imphnen-frontend-service/ui/organisms';
+import { UseFormReturn } from 'react-hook-form';
+import { TRegisterRequest } from '@imphnen-frontend-service/service';
 
 interface IModalFormRegisterProps {
   isOpen: boolean;
@@ -46,9 +48,7 @@ const ModalFormRegister = ({ isOpen, onClose }: IModalFormRegisterProps) => {
           {currentStep === 1 && (
             <StepOne form={form} nextStep={nextStep} onClose={onClose} />
           )}
-          {currentStep === 2 && (
-            <StepTwo form={form} nextStep={nextStep} prevStep={prevStep} />
-          )}
+          {currentStep === 2 && <StepTwo form={form} prevStep={prevStep} />}
         </form>
       </Modal.Content>
     </Modal>
@@ -56,7 +56,7 @@ const ModalFormRegister = ({ isOpen, onClose }: IModalFormRegisterProps) => {
 };
 
 interface IStepOneProps {
-  form: any;
+  form: UseFormReturn<TRegisterRequest, any, TRegisterRequest>;
   nextStep: () => void;
   onClose: () => void;
 }
@@ -106,12 +106,11 @@ const StepOne = ({ form, nextStep, onClose }: IStepOneProps) => (
 );
 
 interface IStepTwoProps {
-  form: any;
-  nextStep: () => void;
+  form: UseFormReturn<TRegisterRequest, any, TRegisterRequest>;
   prevStep: () => void;
 }
 
-const StepTwo = ({ form, nextStep, prevStep }: IStepTwoProps) => (
+const StepTwo = ({ form, prevStep }: IStepTwoProps) => (
   <>
     <ControlledInputField
       control={form.control}
@@ -153,7 +152,7 @@ const StepTwo = ({ form, nextStep, prevStep }: IStepTwoProps) => (
       <Button size="md" variant="text" className="w-[40%]" onClick={prevStep}>
         Kembali
       </Button>
-      <Button size="md" className="w-full" type='submit'>
+      <Button size="md" className="w-full" type="submit">
         Gacha Sekarang
       </Button>
     </div>
diff --git a/libs/ui/src/molecules/input-field/input-field.tsx b/libs/ui/src/molecules/input-field/input-field.tsx
index 72c6910..d7b4901 100644
--- a/libs/ui/src/molecules/input-field/input-field.tsx
+++ b/libs/ui/src/molecules/input-field/input-field.tsx
@@ -75,7 +75,7 @@ export const InputField: FC<TInputFieldProps> = ({
         {...rest}
       />
       {error ? (
-        <p className="text-danger-500 text-label2 text-left">{error}</p>
+        <p className="text-danger-500 text-label1 text-left">{error}</p>
       ) : (
         helperText && (
           <p