code refactoring of routing

Author: shivani170

package.json

@@ -4,7 +4,7 @@
     "private": true,
     "homepage": "/dashboard",
     "dependencies": {
-        "@devtron-labs/devtron-fe-common-lib": "0.0.51-beta-3",
+        "@devtron-labs/devtron-fe-common-lib": "0.0.51-beta-3-1",
         "@rjsf/core": "^5.13.3",
         "@rjsf/utils": "^5.13.3",
         "@rjsf/validator-ajv8": "^5.13.3",

src/App.tsx

@@ -245,26 +245,22 @@ export default function App() {
                     ) : (
                         <ErrorBoundary>
                             <BreadcrumbStore>
-                                {isDirectApprovalNotification ? (
-                                    <Switch>
-                                        {GenericDirectApprovalModal && (
-                                            <Route exact path={`/${approvalType?.toLocaleLowerCase()}/approve`}>
-                                                <GenericDirectApprovalModal
-                                                    approvalType={approvalType}
-                                                    approvalToken={approvalToken}
-                                                />
-                                            </Route>
-                                        )}
-                                    </Switch>
-                                ) : (
                                     <Switch>
+                                             {isDirectApprovalNotification && GenericDirectApprovalModal && (
+                                                <Route exact path={`/${approvalType?.toLocaleLowerCase()}/approve`}>
+                                                    <GenericDirectApprovalModal
+                                                        approvalType={approvalType}
+                                                        approvalToken={approvalToken}
+                                                    />
+                                                </Route>
+                                            )}
                                         {!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>