From 1ffb6c21c72ecfcbc6d17c43281e12af01d317b6 Mon Sep 17 00:00:00 2001
From: Luis de Dios <luis.dedios@kaleidos.net>
Date: Thu, 17 Sep 2026 16:23:04 +0200
Subject: [PATCH] :bug: Fix redirect to send email screen after a successful
 registration

---
 frontend/src/app/main/ui/auth/register.cljs |  2 +-
 frontend/src/app/main/ui/static.cljs        | 17 +++++++++++++----
 frontend/src/app/main/ui/viewer/login.cljs  | 14 ++++++++++++--
 3 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/frontend/src/app/main/ui/auth/register.cljs b/frontend/src/app/main/ui/auth/register.cljs
index 5bc58bce28..b8130e8361 100644
--- a/frontend/src/app/main/ui/auth/register.cljs
+++ b/frontend/src/app/main/ui/auth/register.cljs
@@ -125,7 +125,7 @@
          (mf/deps on-success-callback)
          (fn [params]
            (if (fn? on-success-callback)
-             (on-success-callback (:email params))
+             (on-success-callback params)
              (cond
                (some? (:invitation-token params))
                (let [token (:invitation-token params)]
diff --git a/frontend/src/app/main/ui/static.cljs b/frontend/src/app/main/ui/static.cljs
index 543eede969..5bd066f7d5 100644
--- a/frontend/src/app/main/ui/static.cljs
+++ b/frontend/src/app/main/ui/static.cljs
@@ -125,13 +125,22 @@
         success-register
         (mf/use-fn
          (fn [data]
-           (reset! register-token (:token data))
-           (reset! current-section :register-validate)))
+           (cond
+             (:invitation-token data)
+             (st/emit! (rt/nav :auth-verify-token {:token (:invitation-token data)}))
+
+             (:is-active data)
+             (st/emit! (rt/reload true))
+
+             :else
+             (do
+               (reset! user-email (:email data))
+               (reset! current-section :register-email-sent)))))
 
         register-email-sent
         (mf/use-fn
-         (fn [email]
-           (reset! user-email email)
+         (fn [data]
+           (reset! user-email (if (string? data) data (:email data)))
            (reset! current-section :register-email-sent)))
 
         recovery-email-sent
diff --git a/frontend/src/app/main/ui/viewer/login.cljs b/frontend/src/app/main/ui/viewer/login.cljs
index 6ede841b73..a0fc4c6bb5 100644
--- a/frontend/src/app/main/ui/viewer/login.cljs
+++ b/frontend/src/app/main/ui/viewer/login.cljs
@@ -9,6 +9,7 @@
   (:require
    [app.common.logging :as log]
    [app.main.data.modal :as modal]
+   [app.main.router :as rt]
    [app.main.store :as st]
    [app.main.ui.auth.login :refer [login-dialog*]]
    [app.main.ui.auth.recovery-request :refer [recovery-request-page*]]
@@ -68,8 +69,17 @@
 
         success-register
         (fn [data]
-          (reset! register-token (:token data))
-          (set-current-section :register-validate))]
+          (cond
+            (:invitation-token data)
+            (st/emit! (rt/nav :auth-verify-token {:token (:invitation-token data)}))
+
+            (:is-active data)
+            (st/emit! (modal/hide))
+
+            :else
+            (do
+              (reset! user-email (:email data))
+              (set-current-section :email-sent))))]
 
     [:div {:class (stl/css :modal-overlay)}
      [:div {:class (stl/css :modal-container)}