chore(dashboard): fix conditional hooks

Author: awisniew207

packages/apps/app-dashboard/src/components/user-dashboard/dashboard/RepermitConnectPageWrapper.tsx

@@ -30,11 +30,6 @@ export function RepermitConnectPageWrapper() {
     error: appError,
   } = vincentApiClient.useGetAppQuery({ appId: Number(appId) }, { skip: !appId });
 
-  // Early return if required params are missing
-  if (!appId) {
-    return <GeneralErrorScreen errorDetails="App ID was not provided" />;
-  }
-
   const isUserAuthed = authInfo?.userPKP && sessionSigs;
 
   // Check if we have finished loading but got no data (invalid appId)
@@ -49,12 +44,17 @@ export function RepermitConnectPageWrapper() {
 
   // Redirect if app is already permitted
   useEffect(() => {
-    if (isAllDataLoaded && permittedVersion !== null) {
+    if (isAllDataLoaded && permittedVersion !== null && appId) {
       // App is already permitted, redirect to normal manage page
       navigate(`/user/appId/${appId}`, { replace: true });
     }
   }, [isAllDataLoaded, permittedVersion, appId, navigate]);
 
+  // Early return if required params are missing
+  if (!appId) {
+    return <GeneralErrorScreen errorDetails="App ID was not provided" />;
+  }
+
   // Authentication check - must be done before other business logic
   if (!isProcessing && !isUserAuthed) {
     return (

packages/apps/app-dashboard/src/components/user-dashboard/dashboard/UpdateVersionPageWrapper.tsx

@@ -44,11 +44,6 @@ export function UpdateVersionPageWrapper() {
     authorizedRedirectUris: data?.app?.redirectUris,
   });
 
-  // Early return if required params are missing
-  if (!appId) {
-    return <GeneralErrorScreen errorDetails="App ID was not provided" />;
-  }
-
   // Wait for ALL critical data to load before making routing decisions
   const isUserAuthed = authInfo?.userPKP && sessionSigs;
 
@@ -68,7 +63,8 @@ export function UpdateVersionPageWrapper() {
       isAllDataLoaded &&
       data?.app &&
       permittedVersion !== null &&
-      permittedVersion !== undefined
+      permittedVersion !== undefined &&
+      appId
     ) {
       const activeVersion = data.app.activeVersion?.toString();
       const permitted = permittedVersion.toString();
@@ -80,6 +76,11 @@ export function UpdateVersionPageWrapper() {
     }
   }, [isAllDataLoaded, data, permittedVersion, appId, navigate]);
 
+  // Early return if required params are missing
+  if (!appId) {
+    return <GeneralErrorScreen errorDetails="App ID was not provided" />;
+  }
+
   // Authentication check - must be done before other business logic
   if (!isProcessing && !isUserAuthed) {
     return (