diff --git a/web/app/(shareLayout)/components/authenticated-layout.tsx b/web/app/(shareLayout)/components/authenticated-layout.tsx index 1c222a5957..6e25d55f22 100644 --- a/web/app/(shareLayout)/components/authenticated-layout.tsx +++ b/web/app/(shareLayout)/components/authenticated-layout.tsx @@ -18,9 +18,9 @@ const AuthenticatedLayout = ({ children }: { children: React.ReactNode }) => { const updateWebAppMeta = useWebAppStore(s => s.updateWebAppMeta) const updateUserCanAccessApp = useWebAppStore(s => s.updateUserCanAccessApp) const { data: appParams, error: appParamsError } = useGetWebAppParams() - const { data: appInfo, error: appInfoError, isPending: isPendingAppInfo } = useGetWebAppInfo() + const { data: appInfo, error: appInfoError } = useGetWebAppInfo() const { data: appMeta, error: appMetaError } = useGetWebAppMeta() - const { data: userCanAccessApp, error: useCanAccessAppError, isPending: isPendingUserCanAccessApp } = useGetUserCanAccessApp({ appId: appInfo?.app_id, isInstalledApp: false }) + const { data: userCanAccessApp, error: useCanAccessAppError } = useGetUserCanAccessApp({ appId: appInfo?.app_id, isInstalledApp: false }) useEffect(() => { if (appInfo) @@ -29,8 +29,7 @@ const AuthenticatedLayout = ({ children }: { children: React.ReactNode }) => { updateAppParams(appParams) if (appMeta) updateWebAppMeta(appMeta) - if (userCanAccessApp) - updateUserCanAccessApp(Boolean(userCanAccessApp.result)) + updateUserCanAccessApp(Boolean(userCanAccessApp && userCanAccessApp?.result)) }, [appInfo, appMeta, appParams, updateAppInfo, updateAppParams, updateUserCanAccessApp, updateWebAppMeta, userCanAccessApp]) const router = useRouter() @@ -81,14 +80,11 @@ const AuthenticatedLayout = ({ children }: { children: React.ReactNode }) => { return (
- {t('userProfile.logout', { ns: 'common' })} + {t('userProfile.logout', { ns: 'common' })}
) } - if (isPendingAppInfo || !appInfo?.app_id || isPendingUserCanAccessApp) - return null - return <>{children} }