Merge branch 'master' of ssh://github.com/reacherhq/webapp into am/la…

…nding
reacherhq · Dec 21, 2023 · d292364 · d292364
2 parents 3ae13cd + c1d3151
commit d292364
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 9 deletions.
diff --git a/src/components/Dashboard.tsx b/src/components/Dashboard.tsx
@@ -3,7 +3,7 @@ import React from "react";
 
 import { StripeMananageButton } from "../components/StripeManageButton";
 import {
-	GetStartedFreeTrial,
+	GetStartedNoPlan,
 	GetStartedLicense,
 	GetStartedSaas,
 } from "../components/GetStarted";
@@ -104,6 +104,6 @@ function showContent(
 				</>
 			);
 		default:
-			return <GetStartedFreeTrial />;
+			return <GetStartedNoPlan />;
 	}
 }
diff --git a/...onents/GetStarted/GetStartedFreeTrial.tsx → ...omponents/GetStarted/GetStartedNoPlan.tsx b/...onents/GetStarted/GetStartedFreeTrial.tsx → ...omponents/GetStarted/GetStartedNoPlan.tsx
@@ -2,7 +2,7 @@ import { Card, Text } from "@geist-ui/react";
 import Link from "next/link";
 import React from "react";
 
-export function GetStartedFreeTrial(): React.ReactElement {
+export function GetStartedNoPlan(): React.ReactElement {
 	return (
 		<Card>
 			<Text h4>Select a Plan</Text>

diff --git a/src/components/GetStarted/index.ts b/src/components/GetStarted/index.ts
@@ -1,3 +1,3 @@
 export * from "./GetStartedLicense";
 export * from "./GetStartedSaas";
-export * from "./GetStartedFreeTrial";
+export * from "./GetStartedNoPlan";
diff --git a/src/pages/index.tsx b/src/pages/index.tsx
@@ -26,6 +26,7 @@ export default function Index(): React.ReactElement {
 	const [emailSent, setEmailSent] = useState(false); // Set if we sent an email upon confirmation. Only do it once.
 
 	useEffect(() => {
+		console.log("userFinishedLoading", userFinishedLoading);
 		if (isRedirecting) {
 			return;
 		}
@@ -70,11 +71,7 @@ export default function Index(): React.ReactElement {
 			router.replace("/login").catch(sentryException);
 		} else if (userFinishedLoading && user) {
 			setIsRedirecting(true);
-			if (subscription) {
-				router.replace("/dashboard").catch(sentryException);
-			} else {
-				router.replace("/pricing").catch(sentryException);
-			}
+			router.replace("/dashboard").catch(sentryException);
 		}
 	}, [
 		isRedirecting,