Merge pull request #1146 from Open-Earth-Foundation/fix/404-after-login

fix(ui): redirect to /onboarding when inventory is missing
Open-Earth-Foundation · Feb 21, 2025 · dcb294f · dcb294f
2 parents e6a950a + 8793c21
commit dcb294f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/app/src/app/[...not_found]/page.tsx b/app/src/app/[...not_found]/page.tsx
@@ -1,7 +1,6 @@
 "use client";
 import { Button } from "@/components/ui/button";
 import { useTranslation } from "@/i18n/client";
-import { api } from "@/services/api";
 
 import { Text, Box, Icon } from "@chakra-ui/react";
 import Image from "next/image";
@@ -10,8 +9,6 @@ import React from "react";
 import { MdArrowForward } from "react-icons/md";
 
 const NotFound = ({ params: { lng } }: { params: { lng: string } }) => {
-  const { data: userInfo, isLoading: isUserInfoLoading } =
-    api.useGetUserInfoQuery();
   const router = useRouter();
   const { t } = useTranslation(lng, "not-found");
 
@@ -54,12 +51,11 @@ const NotFound = ({ params: { lng } }: { params: { lng: string } }) => {
           {t("not-found-description")}
         </Text>
         <Button
-          onClick={() => router.push(`/${userInfo?.defaultInventoryId}`)}
+          onClick={() => router.push("/")}
           gap="8px"
           h="48px"
           px="24px"
           fontSize="body.md"
-          loading={isUserInfoLoading}
         >
           {t("goto-dashboard")}
           <Icon as={MdArrowForward} />

diff --git a/app/src/components/missing-inventory.tsx b/app/src/components/missing-inventory.tsx
@@ -19,7 +19,7 @@ const MissingInventory = ({ lng }: { lng: string }) => {
   const router = useRouter();
   useEffect(() => {
     if (!isUserInfoLoading && !userInfo?.defaultInventoryId) {
-      router.push("onboarding");
+      router.push("/onboarding");
     }
   }, [isUserInfoLoading, userInfo, router]);
 
@@ -66,7 +66,7 @@ const MissingInventory = ({ lng }: { lng: string }) => {
               className="underline text-nowrap"
               fontWeight="semibold"
               color="content.link"
-              href="mailto:greta@openearth.com, ux@openearth.com"
+              href={"mailto://" + process.env.NEXT_PUBLIC_SUPPORT_EMAILS}
             >
               {t("please_contact_us")}
             </Link>{" "}
@@ -76,7 +76,7 @@ const MissingInventory = ({ lng }: { lng: string }) => {
               router.push(
                 userInfo?.defaultInventoryId
                   ? `/${userInfo?.defaultInventoryId}`
-                  : "onboarding",
+                  : "/onboarding",
               )
             }
             gap="8px"