Merge pull request #273 from middlewarehq/GROW-1452

chore: Update useRedirectWithSession logic in useRoute.ts

Author: shivam-bit

web-server/src/constants/useRoute.ts

@@ -28,22 +28,27 @@ export const useRedirectWithSession = () => {
     org?.integrations?.bitbucket;
 
   useEffect(() => {
-    if (!orgId) return;
+    if (!orgId || !router.isReady) return;
     if (!isOrgWelcomed) {
       depFn(router.replace, ROUTES.WELCOME.PATH);
       return;
     }
-    if (!isOneCodeProviderIntegrated || !anyTeamEverExisted) {
+    if (!isOneCodeProviderIntegrated) {
       depFn(router.replace, ROUTES.INTEGRATIONS.PATH);
       return;
     }
+    if (!anyTeamEverExisted) {
+      depFn(router.replace, ROUTES.TEAMS.PATH);
+      return;
+    }
     depFn(router.replace, defaultRoute.PATH);
   }, [
     anyTeamEverExisted,
     defaultRoute.PATH,
     isOneCodeProviderIntegrated,
     isOrgWelcomed,
     orgId,
+    router.isReady,
     router.replace
   ]);
 };