From 3053825a34e68abc2ff2e0dd0ec4ff137a293a29 Mon Sep 17 00:00:00 2001
From: mpblocky <185767042+mpblocky@users.noreply.github.com>
Date: Wed, 26 Feb 2025 15:00:44 +0100
Subject: [PATCH] fix: add token existence check

---
 .../hooks/use-email-verification-token.ts          |  1 -
 .../worker-email-verification-process.page.tsx     | 14 ++++++++++----
 .../human-app/frontend/src/shared/i18n/en.json     |  5 ++++-
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/packages/apps/human-app/frontend/src/modules/worker/email-verification/hooks/use-email-verification-token.ts b/packages/apps/human-app/frontend/src/modules/worker/email-verification/hooks/use-email-verification-token.ts
index a16262145a..1e8cc8aa3b 100644
--- a/packages/apps/human-app/frontend/src/modules/worker/email-verification/hooks/use-email-verification-token.ts
+++ b/packages/apps/human-app/frontend/src/modules/worker/email-verification/hooks/use-email-verification-token.ts
@@ -21,6 +21,5 @@ export function useEmailVerificationToken() {
 
   return {
     token,
-    isLoading: token === undefined,
   };
 }
diff --git a/packages/apps/human-app/frontend/src/modules/worker/email-verification/pages/worker-email-verification-process.page.tsx b/packages/apps/human-app/frontend/src/modules/worker/email-verification/pages/worker-email-verification-process.page.tsx
index 5cb72ba893..3ee0ee1c05 100644
--- a/packages/apps/human-app/frontend/src/modules/worker/email-verification/pages/worker-email-verification-process.page.tsx
+++ b/packages/apps/human-app/frontend/src/modules/worker/email-verification/pages/worker-email-verification-process.page.tsx
@@ -1,12 +1,18 @@
-import { PageCardLoader } from '@/shared/components/ui/page-card';
+import { useTranslation } from 'react-i18next';
+import { PageCardError } from '@/shared/components/ui/page-card';
 import { EmailVerificationProcess } from '../components';
 import { useEmailVerificationToken } from '../hooks';
 
 export function WorkerEmailVerificationProcessPage() {
-  const { token, isLoading } = useEmailVerificationToken();
+  const { t } = useTranslation();
+  const { token } = useEmailVerificationToken();
 
-  if (isLoading || !token) {
-    return <PageCardLoader />;
+  if (!token) {
+    return (
+      <PageCardError
+        errorMessage={t('worker.emailVerification.errors.noToken')}
+      />
+    );
   }
 
   return <EmailVerificationProcess token={token} />;
diff --git a/packages/apps/human-app/frontend/src/shared/i18n/en.json b/packages/apps/human-app/frontend/src/shared/i18n/en.json
index 3ec5cc3083..c494652909 100644
--- a/packages/apps/human-app/frontend/src/shared/i18n/en.json
+++ b/packages/apps/human-app/frontend/src/shared/i18n/en.json
@@ -154,7 +154,10 @@
     "emailVerification": {
       "title": "Email Verified",
       "description": "You are ready to go. Your email has been successfully verified!",
-      "btn": "Sign In"
+      "btn": "Sign In",
+      "errors": {
+        "noToken": "No token provided."
+      }
     },
     "sendResetLinkForm": {
       "fields": {