Merge branch 'develop' of github.com:RocketChat/Rocket.Chat into feat…

…/default-message-parser * 'develop' of github.com:RocketChat/Rocket.Chat: Chore: fix watermark condition (#26095)
RocketChat · Jul 1, 2022 · 95aa4d8 · 95aa4d8
2 parents a53a5aa + 3394c0d
commit 95aa4d8
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/apps/meteor/client/sidebar/footer/SidebarFooterWatermark.tsx b/apps/meteor/client/sidebar/footer/SidebarFooterWatermark.tsx
@@ -7,11 +7,11 @@ import { useQuery } from 'react-query';
 export const SidebarFooterWatermark = (): ReactElement | null => {
 	const t = useTranslation();
 	const isEnterpriseEdition = useEndpoint('GET', '/v1/licenses.isEnterprise');
-	const { data, isSuccess } = useQuery(['licenses'], () => isEnterpriseEdition(), {
+	const result = useQuery(['licenses'], () => isEnterpriseEdition(), {
 		refetchOnWindowFocus: false,
 	});
 
-	if (!isSuccess && !data?.isEnterprise) {
+	if (!result.isSuccess || result.isLoading || result.data.isEnterprise) {
 		return null;
 	}