diff --git a/app/layout.js b/app/layout.js index 9f04cfe9..c0305b40 100644 --- a/app/layout.js +++ b/app/layout.js @@ -79,7 +79,7 @@ export default async function RootLayout({ children }) { const Notice = dynamic( () => import("@/app/_notice").then((mod) => mod.Notice), { - ssr: false, + ssr: true, }, ); diff --git a/components/SubscribeNewsletter.js b/components/SubscribeNewsletter.js index 89031862..bdc2d403 100644 --- a/components/SubscribeNewsletter.js +++ b/components/SubscribeNewsletter.js @@ -5,14 +5,13 @@ import { Input } from "@/components/local-ui/input"; import { isEmailValid } from "@/lib/utils"; -import { useState, useEffect } from "react"; -import { useFormState } from "react-dom"; +import { useState, useEffect, useActionState } from "react"; import mailbox from "@/public/images/mailbox.svg"; import { subscribeAction } from "@/lib/actions"; import { SubmitBtn } from "./local-ui/SubmitBtn"; export function SubscribeNewsletter({ isSubscribed }) { - const [state, dispatch] = useFormState(subscribeAction); + const [state, dispatch] = useActionState(subscribeAction); const [subscribeNewsletterDom, setSubscribeNewsletterDom] = useState(null); const [height, setHeight] = useState(0); const [error, setError] = useState(); diff --git a/components/pages/login/LoginForm.jsx b/components/pages/login/LoginForm.jsx index 2b881462..bffb8f2f 100644 --- a/components/pages/login/LoginForm.jsx +++ b/components/pages/login/LoginForm.jsx @@ -7,14 +7,14 @@ import { SuccessMessage } from "@/components/local-ui/successMessage"; import { ErrorMessage } from "@/components/local-ui/errorMessage"; import { authenticateAction } from "@/lib/actions"; -import { useFormState, useFormStatus } from "react-dom"; +import { useFormStatus } from "react-dom"; import routes from "@/data/routes.json"; import { cn } from "@/lib/utils"; -import { useState } from "react"; +import { useState, useActionState } from "react"; export function LoginForm({ className }) { const [key, setKey] = useState(0); - const [state, dispatch] = useFormState(authenticateAction, null); + const [state, dispatch] = useActionState(authenticateAction, null); // for resetting the form if (state?.success === true) { setKey((prev) => prev + 1); diff --git a/components/pages/password-reset/passwordResetForm.js b/components/pages/password-reset/passwordResetForm.js index 8ab96079..e01110c7 100644 --- a/components/pages/password-reset/passwordResetForm.js +++ b/components/pages/password-reset/passwordResetForm.js @@ -1,11 +1,11 @@ +import { useActionState } from "react"; "use client"; import { Input } from "@/components/local-ui/input"; import { SubmitBtn } from "@/components/local-ui/SubmitBtn"; import { AuthenticateWith } from "@/components/local-ui/authenticateWith"; import { sendPassResetCodeAction } from "@/lib/actions"; -import { useFormState } from "react-dom"; export function PasswordResetForm() { - const [state, dispatch] = useFormState(sendPassResetCodeAction, undefined); + const [state, dispatch] = useActionState(sendPassResetCodeAction, undefined); return (