From 9980cb90dfadde0bc46dea218effd6610336e544 Mon Sep 17 00:00:00 2001
From: Ardeman <are.theman@gmail.com>
Date: Sun, 2 Mar 2025 12:21:18 +0800
Subject: [PATCH] feat: refactor subscription handling in registration form and
 header component

---
 app/layouts/news/form-register.tsx | 3 ++-
 app/layouts/news/header-top.tsx    | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/layouts/news/form-register.tsx b/app/layouts/news/form-register.tsx
index e7f6dde..5f1c01c 100644
--- a/app/layouts/news/form-register.tsx
+++ b/app/layouts/news/form-register.tsx
@@ -31,6 +31,7 @@ export const FormRegister = () => {
   const [disabled, setDisabled] = useState(false)
   const fetcher = useFetcher()
   const loaderData = useRouteLoaderData<typeof loader>('routes/_layout')
+  const subscriptions = loaderData?.subscriptionsData
 
   const formMethods = useRemixForm<TRegisterSchema>({
     mode: 'onSubmit',
@@ -98,7 +99,7 @@ export const FormRegister = () => {
               name="subscribe_plan"
               label="Subscription"
               placeholder="Pilih Subscription"
-              options={loaderData?.subscriptionsData}
+              options={subscriptions}
             />
 
             {error && (
diff --git a/app/layouts/news/header-top.tsx b/app/layouts/news/header-top.tsx
index aac8b4e..a1ba0d2 100644
--- a/app/layouts/news/header-top.tsx
+++ b/app/layouts/news/header-top.tsx
@@ -3,11 +3,12 @@ import { Link, useFetcher, useRouteLoaderData } from 'react-router'
 import { Button } from '~/components/ui/button'
 import { APP } from '~/configs/meta'
 import { useNewsContext } from '~/contexts/news'
-import type { loader } from '~/routes/_layout'
+import { loader } from '~/routes/_layout'
 
 export const HeaderTop = () => {
   const { setIsLoginOpen } = useNewsContext()
   const loaderData = useRouteLoaderData<typeof loader>('routes/_layout')
+  const userToken = loaderData?.userToken
   const fetcher = useFetcher()
 
   return (
@@ -29,7 +30,7 @@ export const HeaderTop = () => {
         <Button className="h-8 w-auto rounded-none px-3 text-xs sm:h-[50px] sm:w-[150px] sm:text-lg">
           About Us
         </Button>
-        {loaderData?.userToken ? (
+        {userToken ? (
           <fetcher.Form
             method="POST"
             action="/actions/logout"