Merge commit '1cd6090e0c1f31981db9bca6342e9f8214a2c24e' into v0.71.0-…

…cn-working
mgilham · Feb 6, 2025 · 58d5cc6 · 58d5cc6
2 parents 4ebd971 + 1cd6090
commit 58d5cc6
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/frontend/src/AppRoutes/index.tsx b/frontend/src/AppRoutes/index.tsx
@@ -227,6 +227,10 @@ function App(): JSX.Element {
 		}
 	}, [user, isFetchingUser, isCloudUserVal, enableAnalytics]);
 
+	const isOss = featureFlags?.some(
+		(flag) => flag.name === FeatureKeys.OSS && flag.active,
+	);
+
 	// if the user is in logged in state
 	if (isLoggedInState) {
 		if (pathname === ROUTES.HOME_PAGE) {
@@ -241,7 +245,7 @@ function App(): JSX.Element {
 		// this needs to be on top of data missing error because if there is an error, data will never be loaded and it will
 		// move to indefinitive loading
 		if (
-			(userFetchError || licensesFetchError) &&
+			(userFetchError || (licensesFetchError && featureFlags && !isOss)) && // oss query service does not have licenses API
 			pathname !== ROUTES.SOMETHING_WENT_WRONG
 		) {
 			history.replace(ROUTES.SOMETHING_WENT_WRONG);