undo commit

pages/subscribe.tsx

@@ -9,8 +9,6 @@ import getServerSideProps from "@/lib/client/getServerSideProps";
 import { Trans, useTranslation } from "next-i18next";
 import { useUser } from "@/hooks/store/user";
 
-const stripeEnabled = process.env.NEXT_PUBLIC_STRIPE === "true";
-
 export default function Subscribe() {
   const { t } = useTranslation();
   const [submitLoader, setSubmitLoader] = useState(false);
@@ -23,13 +21,14 @@ export default function Subscribe() {
   const { data: user = {} } = useUser();
 
   useEffect(() => {
-    const hasInactiveSubscription =
-      user.id && !user.subscription?.active && stripeEnabled;
-
-    if (session.status === "authenticated" && !hasInactiveSubscription) {
+    console.log("user", user);
+    if (
+      session.status === "authenticated" &&
+      user.id &&
+      (user?.subscription?.active || user.parentSubscription?.active)
+    )
       router.push("/dashboard");
-    }
-  }, [session.status]);
+  }, [session.status, user]);
 
   async function submit() {
     setSubmitLoader(true);
@@ -40,6 +39,8 @@ export default function Subscribe() {
     const data = await res.json();
 
     router.push(data.response);
+
+    toast.dismiss(redirectionToast);
   }
 
   return (