fix for rerendering

Author: shivani170

src/App.tsx

@@ -125,35 +125,16 @@ export default function App() {
         }
     }
 
+
     useEffect(() => {
         // If not K8S_CLIENT then validateToken otherwise directly redirect
-        async function validation() {
-            try {
-                await validateToken()
-                defaultRedirection()
-            } catch (err: any) {
-                // push to login without breaking search
-                if (err?.code === 401) {
-                    const loginPath = URLS.LOGIN_SSO
-                    const newSearch = location.pathname.includes(URLS.LOGIN_SSO)
-                        ? location.search
-                        : `?continue=${location.pathname}`
-                    push(`${loginPath}${newSearch}`)
-                } else {
-                    setErrorPage(true)
-                    showError(err)
-                }
-            } finally {
-                setValidating(false)
-            }
-        }
         if (!window._env_.K8S_CLIENT) {
             // Pass validation for direct email approval notification
-            // if (location.pathname && location.pathname.includes('approve')) {
-            //     redirectToDirectApprovalNotification()
-            // } else {
+            if (location.pathname && location.pathname.includes('approve')) {
+                redirectToDirectApprovalNotification()
+            } else {
             validation()
-            // }
+            }
         } else {
             setValidating(false)
             defaultRedirection()
@@ -264,31 +245,27 @@ export default function App() {
                     ) : (
                         <ErrorBoundary>
                             <BreadcrumbStore>
-                                <Switch>
-                                    {/* {location.pathname && location.pathname.includes('approve') ? (
+                                {location.pathname && location.pathname.includes('approve') ? (
+                                    <Switch>
                                         <Route
                                             exact
-                                            path={`/${approvalType?.toLocaleLowerCase()}/approve?token=${approvalToken}`}
+                                            path={`/${approvalType?.toLocaleLowerCase()}/approve`}
                                             render={() =>
                                                 GenericDirectApprovalModal && (
                                                     <GenericDirectApprovalModal approvalType={approvalType} />
                                                 )
                                             }
                                         />
-                                    ) : ( */}
-                                        <>
-                                            {!window._env_.K8S_CLIENT && <Route path={`/login`} component={Login} />}
-                                            <Route path="/" render={() => <NavigationRoutes />} />
-                                            <Redirect
-                                                to={
-                                                    window._env_.K8S_CLIENT
-                                                        ? '/'
-                                                        : `${URLS.LOGIN_SSO}${location.search}`
-                                                }
-                                            />
-                                        </>
-                                    {/* )} */}
-                                </Switch>
+                                    </Switch>
+                                ) : (
+                                    <Switch>
+                                        {!window._env_.K8S_CLIENT && <Route path={`/login`} component={Login} />}
+                                        <Route path="/" render={() => <NavigationRoutes />} />
+                                        <Redirect
+                                            to={window._env_.K8S_CLIENT ? '/' : `${URLS.LOGIN_SSO}${location.search}`}
+                                        />
+                                    </Switch>
+                                )}
                                 <div id="full-screen-modal"></div>
                                 <div id="visible-modal"></div>
                                 <div id="visible-modal-2"></div>