fix: redirection handler

Author: fredshema

src/pages/Organization/UserRegister.tsx

@@ -1,21 +1,21 @@
 /* eslint-disable */
-import { useApolloClient, useLazyQuery, useMutation } from '@apollo/client';
-import React, { useContext, useState, useEffect } from 'react';
+import { useLazyQuery, useMutation } from '@apollo/client';
+import React, { useContext, useEffect, useState } from 'react';
 import { useForm } from 'react-hook-form';
 
+import jwt_decode from 'jwt-decode';
 import { useTranslation } from 'react-i18next';
-import { FaGoogle, FaRegEnvelope, FaRegEye } from 'react-icons/fa';
+import { FaRegEnvelope, FaRegEye } from 'react-icons/fa';
 import { FiEyeOff } from 'react-icons/fi';
 import { MdLockOutline } from 'react-icons/md';
 import { Link, useLocation, useNavigate } from 'react-router-dom';
 import { toast } from 'react-toastify';
 import ButtonLoading from '../../components/ButtonLoading';
 import Button from '../../components/Buttons';
+import ControlledSelect from '../../components/ControlledSelect';
 import { UserContext } from '../../hook/useAuth';
 import useDocumentTitle from '../../hook/useDocumentTitle';
-import { SIGN_UP_MUTATION, GET_SIGNUP_ORGANIZATION } from './Mutations';
-import ControlledSelect from '../../components/ControlledSelect';
-import jwt_decode from 'jwt-decode';
+import { GET_SIGNUP_ORGANIZATION, SIGN_UP_MUTATION } from './Mutations';
 
 const Signup = () => {
   const token: any = window.location.href.substring(

src/pages/RedirectHandler.tsx

@@ -3,6 +3,8 @@ import React, { useEffect } from 'react';
 const APP_ID = 'com.atlp.pulseapp';
 
 export default function RedirectHandler() {
+  const [redirectUrl, setRedirectUrl] = React.useState('');
+
   const buildQueryString = (params: URLSearchParams) => {
     let queryParams = '?';
     const ignoredKeys = ['path', 'dest', 'fallback'];
@@ -25,32 +27,39 @@ export default function RedirectHandler() {
     const path = params.get('path');
     const destnation = params.get('dest');
     const fallback = params.get('fallback');
+    setRedirectUrl(fallback ?? '/');
+    console.log(fallback);
 
     if (path != null) {
       if (destnation === 'web') {
         return window.location.replace(path + queryParams);
       }
 
       if (destnation === 'app') {
-        setTimeout(
-          () => window.location.replace(`${APP_ID}://${path}${queryParams}`),
-          500,
-        );
-        window.location.replace(fallback ? fallback + queryParams : '/');
+        setTimeout(() => {
+          window.location.replace(`${APP_ID}://${path}${queryParams}`);
+        }, 500);
+        window.location.replace(redirectUrl);
       }
 
-      window.location.replace(fallback ? fallback + queryParams : '/');
+      window.location.replace(redirectUrl);
     } else {
       // eslint-disable-next-line no-console
       console.error('Invalid redirect data');
     }
 
     return () => {};
-  }, []);
+  }, [redirectUrl]);
 
   return (
     <div className=" dark:bg-dark-frame-bg flex flex-col py-8 px-5  items-center justify-center grow h-full w-full">
       <p>Redirecting...</p>
+      <p>
+        If you are not redirected in a few seconds, please click{' '}
+        <a className="underline" href={redirectUrl}>
+          here
+        </a>
+      </p>
     </div>
   );
 }