From 10a83af0af9050f9fcccb4fe0bad235a6f8df87f Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Sun, 11 Jun 2023 16:45:40 +1000
Subject: [PATCH] Fixes for landing url after confirmation

---
 app/Http/Controllers/Traits/VerifiesUserEmail.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/Http/Controllers/Traits/VerifiesUserEmail.php b/app/Http/Controllers/Traits/VerifiesUserEmail.php
index 7f94cb351ee1..a161aa7cff9f 100644
--- a/app/Http/Controllers/Traits/VerifiesUserEmail.php
+++ b/app/Http/Controllers/Traits/VerifiesUserEmail.php
@@ -38,7 +38,7 @@ trait VerifiesUserEmail
             return $this->render('auth.confirmed', [
                 'root' => 'themes', 
                 'message' => ctrans('texts.wrong_confirmation'),
-                'redirect_url' => request()->has('react') ? 'https://app.invoicing.co/#/' : url('/')]);
+                'redirect_url' => request()->has('react') ? config('ninja.react_url')."/#/" : url('/')]);
         }
 
         $user->email_verified_at = now();
@@ -49,18 +49,18 @@ trait VerifiesUserEmail
             return $this->render('auth.confirmed', [
                 'root' => 'themes',
                 'message' => ctrans('texts.security_confirmation'),
-                'redirect_url' => request()->has('react') ? 'https://app.invoicing.co/#/' : url('/'),
+                'redirect_url' => request()->has('react') ? config('ninja.react_url')."/#/" : url('/'),
             ]);
         }
 
         if (is_null($user->password) || empty($user->password) || Hash::check('', $user->password)) {
-            return $this->render('auth.confirmation_with_password', ['root' => 'themes', 'user_id' => $user->hashed_id, 'redirect_url' => request()->has('react') ? 'https://app.invoicing.co/#/' : url('/')]);
+            return $this->render('auth.confirmation_with_password', ['root' => 'themes', 'user_id' => $user->hashed_id, 'redirect_url' => request()->has('react') ? config('ninja.react_url')."/#/" : url('/')]);
         }
 
         return $this->render('auth.confirmed', [
             'root' => 'themes',
             'message' => ctrans('texts.security_confirmation'),
-            'redirect_url' => request()->has('react') ? 'https://app.invoicing.co/#/' : url('/'),
+            'redirect_url' => request()->has('react') ? config('ninja.react_url')."/#/" : url('/'),
         ]);
     }
 
@@ -89,7 +89,7 @@ trait VerifiesUserEmail
         return $this->render('auth.confirmed', [
             'root' => 'themes',
             'message' => ctrans('texts.security_confirmation'),
-            'redirect_url' => request()->has('react') ? 'https://app.invoicing.co/#/' : url('/'),
+            'redirect_url' => request()->has('react') ? config('ninja.react_url')."/#/" : url('/'),
         ]);
     }
 }